Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1208461 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-17 10:20 +0200 |
| Last post | 2015-08-17 18:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the rdma tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 10:20 +0200
Re: linux-next: manual merge of the staging tree with the rdma tree Greg KH <greg@kroah.com> - 2015-08-17 18:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-17 10:20 +0200 |
| Subject | linux-next: manual merge of the staging tree with the rdma tree |
| Message-ID | <pYnO9-1DA-9@gated-at.bofh.it> |
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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2015-08-17 18:10 +0200 |
| Message-ID | <pYv90-3OC-27@gated-at.bofh.it> |
| In reply to | #1208461 |
On Mon, Aug 17, 2015 at 06:13:12PM +1000, Stephen Rothwell wrote:
> 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).
Looks good, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web