From: "Arend van Spriel" <arend@broadcom.com>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Greg KH" <greg@kroah.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Eliad Peller" <eliad@wizery.com>,
"John W. Linville" <linville@tuxdriver.com>,
"David Miller" <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the net tree
Date: Thu, 6 Oct 2011 10:59:10 +0200 [thread overview]
Message-ID: <4E8D6DDE.9050102@broadcom.com> (raw)
In-Reply-To: <20111006155810.14a6b5c199edc388bbf11437@canb.auug.org.au>
On 10/06/2011 06:58 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commit
> 37a41b4affa3 ("mac80211: add ieee80211_vif param to tsf functions") from
> the net tree and commit 3956b4a2ddb0 ("staging: brcm80211: remove locking
> macro definitions") from the staging tree.
>
> I fixed it up (which essentially means I used the staging tree version
> with one small change to the brcms_ops_conf_tx prototype) and can carry
> the fixes as necessary.
Thanks, Stephen
I had to make the mac80211 conf_tx callback change for the mainline
patch as well.
Acked.
Gr. AvS
next prev parent reply other threads:[~2011-10-06 8:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 4:58 linux-next: manual merge of the staging tree with the net tree Stephen Rothwell
2011-10-06 8:59 ` Arend van Spriel [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 5:43 Stephen Rothwell
2011-10-13 6:12 ` Greg KH
2011-10-13 9:08 ` Arend van Spriel
2011-10-06 5:04 Stephen Rothwell
2011-10-06 5:56 ` David Miller
2011-10-06 6:16 ` Stephen Rothwell
2011-08-26 3:47 Stephen Rothwell
2011-08-26 4:33 ` Greg KH
2011-08-26 5:35 ` Larry Finger
2011-07-22 5:42 Stephen Rothwell
2011-07-07 5:28 Stephen Rothwell
2011-07-07 13:43 ` 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=4E8D6DDE.9050102@broadcom.com \
--to=arend@broadcom.com \
--cc=davem@davemloft.net \
--cc=eliad@wizery.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).