From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Doug Ledford <dledford@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christian Gromm <christian.gromm@microchip•com>,
Steve Wise <swise@opengridcomputing•com>,
Dennis Dalessandro <dennis.dalessandro@intel•com>
Subject: linux-next: manual merge of the staging tree with the rdma tree
Date: Mon, 17 Aug 2015 18:13:12 +1000 [thread overview]
Message-ID: <20150817181312.4be1a554@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/Kconfig
drivers/staging/Makefile
between commit:
c2347d1b409d ("RDMA/amso1100: deprecate the amso1100 provider")
17465e48756f ("IB/ipath: Move ipath driver to staging.")
97748be1d6d0 ("Move hfi1 to staging")
from the rdma tree and commit:
57562a72414c ("Staging: most: add MOST driver's core module")
from the staging 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/staging/Kconfig
index 3f9f058f9ba7,e29293c0c71e..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -112,10 -108,6 +108,12 @@@ source "drivers/staging/fsl-mc/Kconfig
source "drivers/staging/wilc1000/Kconfig"
+source "drivers/staging/amso1100/Kconfig"
+
+source "drivers/staging/ipath/Kconfig"
+
+source "drivers/staging/hfi1/Kconfig"
+
+ source "drivers/staging/most/Kconfig"
+
endif # STAGING
diff --cc drivers/staging/Makefile
index 20f827632349,50824dde2c09..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -48,6 -46,4 +46,7 @@@ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) +
obj-$(CONFIG_FB_TFT) += fbtft/
obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
obj-$(CONFIG_WILC1000) += wilc1000/
+obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/
+obj-$(CONFIG_INFINIBAND_IPATH) += ipath/
+obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
+ obj-$(CONFIG_MOST) += most/
next reply other threads:[~2015-08-17 8:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 8:13 Stephen Rothwell [this message]
2015-08-17 16:03 ` linux-next: manual merge of the staging tree with the rdma tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-11-01 13:48 Stephen Rothwell
2015-06-15 8:12 Michael Ellerman
2015-06-16 4:48 ` Greg KH
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=20150817181312.4be1a554@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian.gromm@microchip$(echo .)com \
--cc=dennis.dalessandro@intel$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=swise@opengridcomputing$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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