* linux-next: manual merge of the drivers-x86 tree with the tree
@ 2013-03-12 2:34 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-03-12 2:34 UTC (permalink / raw)
To: Matthew Garrett; +Cc: linux-next, linux-kernel, Benson Leung, Linus
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi Matthew,
Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/chromeos_laptop.c between a series of patches from
Linus' tree and the same series of patches from the drivers-x86 tree.
There was an extra patch merged into Linus tree affecting this file, so I
used that version.
Please, when you rebase/rewrite stuff before sending it to Linus, also
update your -next included tree (or just *don't do that* :-().
--
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-03-12 2:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-12 2:34 linux-next: manual merge of the drivers-x86 tree with the 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).