Messages in this thread | | | Date | Thu, 5 Sep 2013 17:32:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: bad commits in the drivers-x86 tree |
| |
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 [unhandled content-type:application/pgp-signature] | |