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@xxxxxxxxxxxxxxxx
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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
