From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139Ab1JMJIv (ORCPT ); Thu, 13 Oct 2011 05:08:51 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:1615 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752295Ab1JMJIt (ORCPT ); Thu, 13 Oct 2011 05:08:49 -0400 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Message-ID: <4E96AA91.9010407@broadcom.com> Date: Thu, 13 Oct 2011 11:08:33 +0200 From: "Arend van Spriel" User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110922 Thunderbird/3.1.15 MIME-Version: 1.0 To: "Stephen Rothwell" cc: "Greg KH" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "David Miller" , "netdev@vger.kernel.org" , "Jiri Pirko" , "Eliad Peller" , "John W. Linville" Subject: Re: linux-next: manual merge of the staging tree with the net tree References: <20111013164353.09c495e1b63d23e380cca1f7@canb.auug.org.au> In-Reply-To: <20111013164353.09c495e1b63d23e380cca1f7@canb.auug.org.au> X-Enigmail-Version: 1.1.2 OpenPGP: id=B5E1A116 X-WSS-ID: 6288739A0EG210677-01-01 Content-Type: multipart/signed; boundary=------------enig4107587A6989667FDC9D3FE0; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --------------enig4107587A6989667FDC9D3FE0 Content-Type: multipart/mixed; boundary="------------070001060503040605060209" This is a multi-part message in MIME format. --------------070001060503040605060209 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 10/13/2011 07:43 AM, Stephen Rothwell wrote: > Hi Greg, >=20 > 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 t= he > net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove > brcm80211 driver from the staging tree") from the staging tree. >=20 > The latter removed the files, so I did that Great. The move to drivers/net/wireless has completed. Thanks for this. Gr. AvS --------------070001060503040605060209 Content-Type: application/pgp-keys; name="0xB5E1A116.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0xB5E1A116.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.11 (GNU/Linux) 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 NWhoWw=3D=3D =3DVXPt -----END PGP PUBLIC KEY BLOCK----- --------------070001060503040605060209-- --------------enig4107587A6989667FDC9D3FE0 Content-Type: application/pgp-signature; name=signature.asc Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename=signature.asc Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJOlqqRAAoJELcEx/G14aEWhh4P/A82cBVk13OtQuqNfFU63BcW 4R8RFs7pmHK4cC6lGhQaXocL7HKcglKvGkUvl1XDvCvD6vJB/A7AgBrW6W/oPx3i JuQE5je4p9pESyW7G3PSqbnwMv3w43UgtqUspHEVWkOXr0XS81svZs7Qc4y6CWsR WeCEGM4kZxLmLO5OTaw2vU07JqA4QXgI2A293VpLRzc14LWDncsgBX/ZVV/EKM3e I2RcUwUWlIxDFmQKq1EqldwOqeQxvyA6zGgHqb8J/pQnknJsBWXn55DGOE4E32bk fXCd+58On3KBMnE37qZqXMWm9DUSpHub7wAFcJ/VKhavPtMolUln9s5w/K1gu1KE 686bJLG5Kl/iKGwHMHTRie+wyrHXSlM6RWbiHDkHuiB7KcpTaj7OvNGqV2F4uBzt Ll++tnaN+G8DEkqEIYszmD1zPgGd6eVFaR+TDh0zPZ06NK5L70k0FNCj/Ex6+aCf /IUgvzjTQPnGGMpb+oHPX68tYRwbAF9SKE39nrkBsMJRb+xWdUk4830M4gbX88Ur f44GY7MV4qmF0hIdyW9p1obcpW27e7x4nBCiIEI/lQeJn+rY363EyDfjfEhm3xwL bnAMsTMx+/2WlSh9wc704LUqxGPTI+8HK/wIaQjMfUcTFrGW7csgOenlhU7fJTEI 04UjPJff5kf0Rip3D9GQ =96hM -----END PGP SIGNATURE----- --------------enig4107587A6989667FDC9D3FE0--