linux-kernel - Re: linux-next: manual merge of the driver-core tree with the 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130215052421.GA3789@kroah.com>
Date:	Thu, 14 Feb 2013 21:24:21 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kees Cook <keescook@...omium.org>,
	Larry Finger <Larry.Finger@...inger.net>,
	"John W. Linville" <linville@...driver.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the  tree

On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
> ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
> 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
> CONFIG_EXPERIMENTAL") from the driver-core tree.
> 
> I fixed it up (the former is a superset of the latter, so I used that)
> and can carry the fix as necessary (no action is required).

That sounds fine, 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/