* linux-next: wireless/wireless-current merge conflict
@ 2008-05-22 3:20 Stephen Rothwell
2008-05-22 13:41 ` John W. Linville
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-22 3:20 UTC (permalink / raw)
To: John W. Linville, David Miller; +Cc: Johannes Berg, linux-next, Helmut Schaa
[-- Attachment #1: Type: text/plain, Size: 697 bytes --]
Hi John, Dave,
Today's linux-next merge of the net tree got a (trivial) conflict in
net/mac80211/mlme.c between commit
0d580a774b3682b8b2b5c89ab9b813d149ef28e7 ("mac80211: fix NULL pointer
dereference in ieee80211_compatible_rates") from the wireless-current
tree and commit 988c0f723d0b1abb399e6e71d8bf3f8bf1949a70 ("mac80211: a
few code cleanups") from the wireless tree.
The conflict is just contextual with the latter patch removing braces
around some code very near the insertion in the former patch. I did the
obvious fixup. You may want to check (around line 724).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: wireless/wireless-current merge conflict
2008-05-22 3:20 linux-next: wireless/wireless-current merge conflict Stephen Rothwell
@ 2008-05-22 13:41 ` John W. Linville
2008-05-22 23:34 ` Stephen Rothwell
2008-05-29 0:42 ` linux-next: pending " John W. Linville
0 siblings, 2 replies; 6+ messages in thread
From: John W. Linville @ 2008-05-22 13:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, Johannes Berg, linux-next, Helmut Schaa
On Thu, May 22, 2008 at 01:20:31PM +1000, Stephen Rothwell wrote:
> Hi John, Dave,
>
> Today's linux-next merge of the net tree got a (trivial) conflict in
> net/mac80211/mlme.c between commit
> 0d580a774b3682b8b2b5c89ab9b813d149ef28e7 ("mac80211: fix NULL pointer
> dereference in ieee80211_compatible_rates") from the wireless-current
> tree and commit 988c0f723d0b1abb399e6e71d8bf3f8bf1949a70 ("mac80211: a
> few code cleanups") from the wireless tree.
>
> The conflict is just contextual with the latter patch removing braces
> around some code very near the insertion in the former patch. I did the
> obvious fixup. You may want to check (around line 724).
It sounds like you did the right fix. Did you hit one under
drivers/net/wireless/libertas as well?
I have just pushed a 'merge-test' branch here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
You may wish to refer to it for the libertas conflict tomorrow.
John
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: wireless/wireless-current merge conflict
2008-05-22 13:41 ` John W. Linville
@ 2008-05-22 23:34 ` Stephen Rothwell
2008-05-23 3:37 ` Stephen Rothwell
2008-05-29 0:42 ` linux-next: pending " John W. Linville
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-22 23:34 UTC (permalink / raw)
To: John W. Linville; +Cc: David Miller, Johannes Berg, linux-next, Helmut Schaa
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi John,
On Thu, 22 May 2008 09:41:05 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> It sounds like you did the right fix. Did you hit one under
Good.
> drivers/net/wireless/libertas as well?
No.
> I have just pushed a 'merge-test' branch here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
>
> You may wish to refer to it for the libertas conflict tomorrow.
Thanks, I will have a look.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: wireless/wireless-current merge conflict
2008-05-22 23:34 ` Stephen Rothwell
@ 2008-05-23 3:37 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-23 3:37 UTC (permalink / raw)
To: John W. Linville; +Cc: David Miller, Johannes Berg, linux-next, Helmut Schaa
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
Hi John,
On Fri, 23 May 2008 09:34:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 22 May 2008 09:41:05 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
> >
> > I have just pushed a 'merge-test' branch here:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
> >
> > You may wish to refer to it for the libertas conflict tomorrow.
>
> Thanks, I will have a look.
I got the conflict and fixed it up to match your test merge. Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: pending wireless/wireless-current merge conflict
2008-05-22 13:41 ` John W. Linville
2008-05-22 23:34 ` Stephen Rothwell
@ 2008-05-29 0:42 ` John W. Linville
2008-05-29 1:44 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: John W. Linville @ 2008-05-29 0:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next
I just sent a pull request for Dave that will result in a conflict
in the rt2x00 driver. I have a sample merge available here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test-2
Please note the 'merge-test-2' -- I still have the old merge-test
there since Dave hadn't (at my last check anyway) yet pulled the
previous wireless-next-2.6 request into net-next-2.6.
Just a heads-up... :-)
John
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: pending wireless/wireless-current merge conflict
2008-05-29 0:42 ` linux-next: pending " John W. Linville
@ 2008-05-29 1:44 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-05-29 1:44 UTC (permalink / raw)
To: John W. Linville; +Cc: David Miller, linux-next
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
Hi John,
On Wed, 28 May 2008 20:42:51 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I just sent a pull request for Dave that will result in a conflict
> in the rt2x00 driver. I have a sample merge available here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test-2
>
> Please note the 'merge-test-2' -- I still have the old merge-test
> there since Dave hadn't (at my last check anyway) yet pulled the
> previous wireless-next-2.6 request into net-next-2.6.
>
> Just a heads-up... :-)
Thanks, I will keep a lookout.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-29 1:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-22 3:20 linux-next: wireless/wireless-current merge conflict Stephen Rothwell
2008-05-22 13:41 ` John W. Linville
2008-05-22 23:34 ` Stephen Rothwell
2008-05-23 3:37 ` Stephen Rothwell
2008-05-29 0:42 ` linux-next: pending " John W. Linville
2008-05-29 1:44 ` Stephen Rothwell
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).