public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: James Hogan <james.hogan@imgtec.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
	Rusty Russell <rusty@rustcorp.com.au>,
	Mike Frysinger <vapier@gentoo.org>,
	uclinux-dist-devel@blackfin.uclinux.org
Subject: Re: [PATCH] linkage.h: fix build breakage due to symbol prefix handling
Date: Thu, 2 May 2013 04:42:26 +0100	[thread overview]
Message-ID: <20130502034226.GA27379@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20130501214335.GB11630@ZenIV.linux.org.uk>

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)

  parent reply	other threads:[~2013-05-02  3:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-01 21:04 [PATCH] linkage.h: fix build breakage due to symbol prefix handling James Hogan
2013-05-01 21:43 ` Al Viro
2013-05-01 22:12   ` James Hogan
2013-05-02  3:42   ` Al Viro [this message]
2013-05-02  0:28 ` Rusty Russell
2013-05-02  3:37   ` Stephen Rothwell
2013-05-02  5:30     ` Stephen Rothwell
2013-05-06  5:29       ` Rusty Russell
2013-05-08  1:10         ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130502034226.GA27379@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=james.hogan@imgtec.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    --cc=torvalds@linux-foundation.org \
    --cc=uclinux-dist-devel@blackfin.uclinux.org \
    --cc=vapier@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox