| 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
| ||
|
Message-Id: <20110221144300.9509d241.sfr@canb.auug.org.au>
Date: Mon, 21 Feb 2011 14:43:00 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Harry Wei <jiaweiwei.xiyou@...il.com>,
Jean Delvare <khali@...ux-fr.org>
Subject: linux-next: manual merge of the trivial tree with the
jdelvare-hwmon tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
MAINTAINERS between commit d8f00f1b531b25ac96a39385617ff1718bc8474b
("Move lis3lv02d drivers to drivers/misc") from the jdelvare-hwmon tree
and commit a23ce6da9677d245aa0aadc99f4197030350ab54 ("MAINTAINERS: fix
sorting") from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc MAINTAINERS
index af304df,b6d6d51..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3887,6 -3881,12 +3888,12 @@@ L: linux-security-module@...r.kernel.or
T: git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
S: Supported
+ LIS3LV02D ACCELEROMETER DRIVER
+ M: Eric Piel <eric.piel@...mplin-utc.net>
+ S: Maintained
-F: Documentation/hwmon/lis3lv02d
-F: drivers/hwmon/lis3lv02d.*
++F: Documentation/misc-devices/lis3lv02d
++F: drivers/misc/lis3lv02d/
+
LLC (802.2)
M: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
S: Maintained
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists