linux-kernel - linux-next: manual merge of the staging tree with the rdma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150817181312.4be1a554@canb.auug.org.au>
Date:	Mon, 17 Aug 2015 18:13:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Doug Ledford <dledford@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christian Gromm <christian.gromm@...rochip.com>,
	Steve Wise <swise@...ngridcomputing.com>,
	Dennis Dalessandro <dennis.dalessandro@...el.com>
Subject: linux-next: manual merge of the staging tree with the rdma tree

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@...b.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/