linux-kernel - linux-next: manual merge of the drivers-x86 tree with the driver-core.current 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20130102133946.e384e5c4bfd7e2d529ed0937@canb.auug.org.au>
Date:	Wed, 2 Jan 2013 13:39:46 +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,
	Greg KH <greg@...ah.com>, Bill Pemberton <wfp5p@...ginia.edu>
Subject: linux-next: manual merge of the drivers-x86 tree with the
 driver-core.current tree

Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got conflicts in
drivers/platform/x86/apple-gmux.c, drivers/platform/x86/compal-laptop.c,
drivers/platform/x86/fujitsu-tablet.c,
drivers/platform/x86/ideapad-laptop.c,
drivers/platform/x86/intel_oaktrail.c and
drivers/platform/x86/toshiba_acpi.c between commit 7264eabec580
("Drivers: platform: x86: remove __dev* attributes") from the
driver-core.current tree and various commits from the drivers-x86 tree.

I fixed it up (using the driver-core.current tree versions) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped