From: Matthew Garrett <mjg59@srcf.ucam.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: strange commits in the drivers-x86 tree
Date: Fri, 4 May 2012 01:28:30 +0100 [thread overview]
Message-ID: <20120504002830.GA2283@srcf.ucam.org> (raw)
In-Reply-To: <20120504101439.edb8133fe986fc4cca94b969@canb.auug.org.au>
On Fri, May 04, 2012 at 10:14:39AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> I have no idea what you have done to your tree, but it now contains scsi,
> nfs and arm commits (at least) that don't appear to be at all relevant to
> x86 drivers ... it looks like you may have rebased part of Linus' tree
> onto yours.
>
> I will use the drivers-x86 tree from next-20120503 for today.
Well that's somewhat bizarre - I did a rebase onto master, git am on a
maildir, then a rebase -i to drop a conflicting commit. I think we're
equally confused here.
--
Matthew Garrett | mjg59@srcf.ucam.org
prev parent reply other threads:[~2012-05-04 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-04 0:14 linux-next: strange commits in the drivers-x86 tree Stephen Rothwell
2012-05-04 0:28 ` Matthew Garrett [this message]
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=20120504002830.GA2283@srcf.ucam.org \
--to=mjg59@srcf.ucam.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.