linux-kernel - linux-next: manual merge of the moduleh tree with the staging 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]

Date:	Thu, 6 Oct 2011 16:31:20 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonathan Cameron <jic23@....ac.uk>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the moduleh tree with the staging tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/adc/ad7314.c between commit 48a2c3799b71
("staging:iio:adc:ad7314 removal. Supported via hwmon") from the staging
tree and commit 09ff337cbb48 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.

The former removes this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped