linux-kernel - linux-next: manual merge of the drivers-x86 tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130312133402.7a3e5edfbbfa423fd91575a2@canb.auug.org.au>
Date:	Tue, 12 Mar 2013 13:34:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Matthew Garrett <mjg59@...f.ucam.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Benson Leung <bleung@...omium.org>,
	Linus <torvalds@...ux-foundation.org>
Subject: linux-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@...b.auug.org.au

Content of type "application/pgp-signature" skipped