From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jouni Malinen <jouni.malinen@atheros.com>,
Sukesh Srikakula <sukeshs@broadcom.com>,
Arend van Spriel <arend@broadcom.com>
Subject: Re: linux-next: manual merge of the staging tree with the wireless tree
Date: Tue, 17 May 2011 22:09:13 -0700 [thread overview]
Message-ID: <20110518050913.GA25333@kroah.com> (raw)
In-Reply-To: <20110518125633.0164cb32.sfr@canb.auug.org.au>
On Wed, May 18, 2011 at 12:56:33PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c between commit
> 5a083c0aba95 ("cfg80211: Use consistent BSS matching between scan and
> sme") from the wireless tree and commit e494632efcd9 ("staging:
> brcm80211: Fixed bss (re)connect/disconnect issues in brcmfmac driver")
> from the staging tree.
>
> I fixed it up (see below) anc can carry the fix as necessary.
Looks great to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2011-05-18 5:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 2:56 linux-next: manual merge of the staging tree with the wireless tree Stephen Rothwell
2011-05-18 5:09 ` Greg KH [this message]
2011-05-18 18:53 ` Sukesh Srikakula
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 6:27 Stephen Rothwell
2011-03-02 14:26 ` Greg KH
2011-03-02 15:39 ` Arend van Spriel
2010-02-22 5:31 Stephen Rothwell
2010-02-24 2:14 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110518050913.GA25333@kroah.com \
--to=greg@kroah.com \
--cc=arend@broadcom.com \
--cc=jouni.malinen@atheros.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sukeshs@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.