linux-kernel - Re: linux-next: manual merge of the staging tree with the net 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: <4E96AA91.9010407@broadcom.com>
Date:	Thu, 13 Oct 2011 11:08:33 +0200
From:	"Arend van Spriel" <arend@...adcom.com>
To:	"Stephen Rothwell" <sfr@...b.auug.org.au>
cc:	"Greg KH" <greg@...ah.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"David Miller" <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"Jiri Pirko" <jpirko@...hat.com>,
	"Eliad Peller" <eliad@...ery.com>,
	"John W. Linville" <linville@...driver.com>
Subject: Re: linux-next: manual merge of the staging tree with the net
 tree

On 10/13/2011 07:43 AM, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
> 
> The latter removed the files, so I did that

Great. The move to drivers/net/wireless has completed. Thanks for this.

Gr. AvS

Download attachment "0xB5E1A116.asc" of type "application/pgp-keys" (3114 bytes)

Download attachment "signature.asc" of type "application/pgp-signature" (901 bytes)