linux-kernel - linux-next: manual merge of the akpm tree with the driver-core 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: <20120503155316.ac90cdfa900e1d19461f42ef@canb.auug.org.au>
Date:	Thu, 3 May 2012 15:53:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Randy Dunlap <rdunlap@...otime.net>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the akpm tree with the driver-core tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/w1/slaves/Kconfig between commit c0a6720977f8 ("Revert "w1: Add
1-wire slave device driver for DS28E04-100"") from the driver-core tree
and commit "w1: fix ds28e04 build, select CRC16" from the akpm tree.

The former removes the text that the latter is fixing, so I just dropped
this patch from the akpm tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped