From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
"Chen, Gong" <gong.chen@linux.intel.com>,
Tony Luck <tony.luck@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andreas Noever <andreas.noever@gmail.com>
Subject: linux-next: manual merge of the char-misc tree with the ia64 tree
Date: Tue, 15 Jul 2014 16:43:49 +1000 [thread overview]
Message-ID: <20140715164349.5807b892@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-07-15 6:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 6:43 Stephen Rothwell [this message]
2014-07-15 13:44 ` linux-next: manual merge of the char-misc tree with the ia64 tree Greg KH
2014-07-15 13:49 ` Greg KH
2014-07-15 15:22 ` Luck, Tony
2014-07-15 15:36 ` Borislav Petkov
2014-07-15 15:57 ` Luck, Tony
2014-07-15 16:18 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140715164349.5807b892@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andreas.noever@gmail.com \
--cc=arnd@arndb.de \
--cc=gong.chen@linux.intel.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox