Re: [PATCH] fix adbhid mismerge

2007-10-17 Thread Björn Steinbrink
On 2007.10.17 18:18:21 +0200, Björn Steinbrink wrote: > On 2007.10.16 19:21:53 -0700, Linus Torvalds wrote: > > > > > > On Tue, 16 Oct 2007, Linus Torvalds wrote: > > > > > > I don't think you did anything wrong. You used both --full-history > > > (implicitly: git-whatchanged) and you made sure

Re: [PATCH] fix adbhid mismerge

2007-10-17 Thread Björn Steinbrink
On 2007.10.16 19:21:53 -0700, Linus Torvalds wrote: > > > On Tue, 16 Oct 2007, Linus Torvalds wrote: > > > > I don't think you did anything wrong. You used both --full-history > > (implicitly: git-whatchanged) and you made sure to see the diffs for both > > sides of any merge (-m), and that me

Re: [PATCH] fix adbhid mismerge

2007-10-16 Thread Linus Torvalds
On Tue, 16 Oct 2007, Linus Torvalds wrote: > > I don't think you did anything wrong. You used both --full-history > (implicitly: git-whatchanged) and you made sure to see the diffs for both > sides of any merge (-m), and that means that you should see every single > diff involved. Btw, if an

Re: [PATCH] fix adbhid mismerge

2007-10-16 Thread Linus Torvalds
On Wed, 17 Oct 2007, Al Viro wrote: > > Something really odd has happened: the last couple of changesets > have > - int up_flag; > + int keycode, up_flag; > and > - int up_flag; > + int up_flag, key; > in another, both in adb_input_keycode(). Even with -m passed to

[PATCH] fix adbhid mismerge

2007-10-16 Thread Al Viro
Something really odd has happened: the last couple of changesets have - int up_flag; + int keycode, up_flag; and - int up_flag; + int up_flag, key; in another, both in adb_input_keycode(). Even with -m passed to git-whatchanged there's no sign of anything in that ar