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