* linux-next: strange commits in the drivers-x86 tree
@ 2012-05-04 0:14 Stephen Rothwell
2012-05-04 0:28 ` Matthew Garrett
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-05-04 0:14 UTC (permalink / raw)
To: Matthew Garrett; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: strange commits in the drivers-x86 tree
2012-05-04 0:14 linux-next: strange commits in the drivers-x86 tree Stephen Rothwell
@ 2012-05-04 0:28 ` Matthew Garrett
0 siblings, 0 replies; 2+ messages in thread
From: Matthew Garrett @ 2012-05-04 0:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-04 0:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-04 0:14 linux-next: strange commits in the drivers-x86 tree Stephen Rothwell
2012-05-04 0:28 ` Matthew Garrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox