* linux-next: bad commits in the drivers-x86 tree
@ 2013-09-05 7:32 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-09-05 7:32 UTC (permalink / raw)
To: Matthew Garrett; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi Matthew,
Unfortunately, it looks like you cherry-picked (or somehow) managed to
get copies of quite a few commits from Linus' tree into your tree. Maybe
a failed rebase? This has been causing conflicts in linux-next for the
past couple of days and I am sure that Linus will not want to pull your
tree in its current state.
I suggest that you reset it to the state it was in the day before
yesterday (commit 41c8bd1c75ef8e85) and try again.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-09-05 7:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-05 7:32 linux-next: bad commits in the drivers-x86 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).