Hi Eric, On Fri, 6 Jan 2012 22:38:57 -0600 Eric Van Hensbergen <ericvh@xxxxxxxxx> wrote: > > What's typically the right process for me to prep the merge for Linus? > Should I pull Al's patchset and then apply mine on top of it so I can > merge your merge fix or just have my for-linus tree based on his > current working merge (which I assume has Al's by now). Just a bit > confused because rebasing was discouraged last merge window -- but not > sure how to deal with the conflict without a rebase.... Just warn Linus that there will be a conflict with Al's stuff. You could supply him with the patch I gave you just for good measure, but he is good (better then me) at fixing merge conflicts and will ping you if he has doubts. i.e. don't rebase or even bother doing the merge yourself. Just ask him to pull what was in linux-next. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgplTyIkh5njw.pgp
Description: PGP signature
