Messages in this thread | | | Date | Thu, 2 May 2013 04:42:26 +0100 | From | Al Viro <> | Subject | Re: [PATCH] linkage.h: fix build breakage due to symbol prefix handling |
| |
On Wed, May 01, 2013 at 10:43:35PM +0100, Al Viro wrote:
> Oh, hell... Guys, my deep apologies - what happened is that this thing > has been caught in -next, rebase done here (on top of Rusty's commit) > and *not* pushed to linux-next.
Curiouser and curiouser... FWIW, what I have is $ cat .git/refs/heads/linkage-fixed 898429c05290b8c05d035199f65a3bb034b34bb7 $ cat .git/refs/heads/remotes/next 898429c05290b8c05d035199f65a3bb034b34bb7 both being the aforementioned rebase; I really wonder WTF had I been doing that could've produced that... How does git deal with that sort of ambiguities? $ git log remotes/next | head -3 commit 898429c05290b8c05d035199f65a3bb034b34bb7 Author: Al Viro <viro@zeniv.linux.org.uk> Date: Tue Mar 19 14:25:51 2013 -0400 $ git log remotes/next/master | head -3 commit d7c35d45ce991ae01b6008abef120173fc9c3814 Author: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue Apr 30 16:26:41 2013 +1000 (the latter, of course, coming from remote for linux-next mirror)
| |