Hi Stephen, On Thu, 08 Dec 2011 21:37:19 -0700 Stephen Warren <swarren@xxxxxxxxxx> wrote: > > I'm not very familiar with git diff for merge conflicts, so I might be > wrong here, but I did reproduce this conflict to investigate, and I > think your fixup isn't quite correct. > > I think you're left with two separate copies of the macro > arch_ret_to_user, and your conflict resolution diff should be more like > that below: Good catch! I have fixed it up for next time. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpy9QGlgbGyu.pgp
Description: PGP signature
