linux-next: manual merge of the char-misc tree with the ia64 tree

Stephen Rothwell
2014-07-15T06:43:58Z

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

Hi all,

Today's linux-next merge of the char-misc tree got conflicts in
drivers/Kconfig and drivers/Makefile between commit 76ac8275f296
("trace, RAS: Add basic RAS trace event") from the ia64 tree and commit
16603153666d ("thunderbolt: Add initial cactus ridge NHI support") from
the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/Kconfig
index 4e6e66c3c8d6,9b2dcc2ea663..000000000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -176,6 -176,6 +176,8 @@@ source "drivers/powercap/Kconfig

source "drivers/mcb/Kconfig"

+source "drivers/ras/Kconfig"
+
+ source "drivers/thunderbolt/Kconfig"
+
endmenu
diff --cc drivers/Makefile
index 8a72e1cc2afa,37b9ed4cd2d6..000000000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -159,4 -158,4 +159,5 @@@ obj-$(CONFIG_NTB) += ntb
obj-$(CONFIG_FMC) += fmc/
obj-$(CONFIG_POWERCAP) += powercap/
obj-$(CONFIG_MCB) += mcb/
+obj-$(CONFIG_RAS) += ras/
+ obj-$(CONFIG_THUNDERBOLT) += thunderbolt/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]