linux-kernel - linux-next: manual merge of the staging 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111128152222.e6aeb95e31d45f44d8adf615@canb.auug.org.au>
Date:	Mon, 28 Nov 2011 15:22:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Lars-Peter Clausen" <lars@...afoo.de>
Subject: linux-next: manual merge of the staging tree with the driver-core
 tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
("staging:iio: Use module_i2c_driver to register I2C drivers") from the
tree and commit 55e4390cb04e ("staging:iio: Add missing
MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.

Just context differences.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f88,5bedb19..0000000
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -944,6 +935,3 @@@ module_i2c_driver(ad799x_driver)
  MODULE_AUTHOR("Michael Hennerich <hennerich@...ckfin.uclinux.org>");
  MODULE_DESCRIPTION("Analog Devices AD799x ADC");
  MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
 -
 -module_init(ad799x_init);
 -module_exit(ad799x_exit);

Content of type "application/pgp-signature" skipped