Messages in this thread | | | Date | Fri, 9 Dec 2011 16:45:37 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the tegra tree with the tree |
| |
Hi Stephen,
On Thu, 08 Dec 2011 21:37:19 -0700 Stephen Warren <swarren@nvidia.com> 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |