linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20150817160302.GA6311@kroah.com>
Date:	Mon, 17 Aug 2015 09:03:02 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Doug Ledford <dledford@...hat.com>, 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: Re: linux-next: manual merge of the staging tree with the rdma tree

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