lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the drivers-x86 tree with the tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-03-12 04:01    [W:0.051 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site