Francois,

Here's what to do. Assume the coreboot.org repository name is 'upstream' (mine is. yours might be different):

$ git fetch upstream 
remote: Counting objects: 25377, done
remote: Finding sources: 100% (160/160)
remote: Total 160 (delta 75), reused 160 (delta 75)
Receiving objects: 100% (160/160), 57.15 KiB | 6.35 MiB/s, done.
Resolving deltas: 100% (75/75), completed with 43 local objects.
From ssh://review.coreboot.org:29418/coreboot
   06e33226b3..540a664045  master     -> upstream/master
$ git submodule update --init --checkout
$ git rebase upstream/master
$ git submodule update --init --checkout

You might need to amend your latest patch after that to include the latest submodule update.

View Change

To view, visit change 31235. To unsubscribe, or for help writing mail filters, visit settings.