linux-next: wireless/wireless-current merge conflict

linux-next: wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: wireless/wireless-current merge conflict

[John W. Linville]

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

Re: linux-next: wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- 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 --]

linux-next: pending wireless/wireless-current merge conflict

[John W. Linville]

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

Re: linux-next: pending wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- 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 --]

linux-next: pending wireless/wireless-current merge conflict

[John W. Linville]

I just sent a pull request for Dave that will result in some conflict
around 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

Just a heads-up... :-)

John
-- 
John W. Linville
linville@tuxdriver.com

Re: linux-next: pending wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

Hi John,

On Fri, 13 Jun 2008 17:56:01 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I just sent a pull request for Dave that will result in some conflict
> around 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
> 
> Just a heads-up... :-)

OK, Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: pending wireless/wireless-current merge conflict

[John W. Linville]

I just sent a pull request for Dave that will result in nasty-looking
conflict in iwl4965-base.c.  I have a sample merge available here:

	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test

The overview of the resolution is to ignore any changes in
iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
the URL above.

Just a heads-up... :-)

John

P.S.  Hopefully the iwlwifi guys will double check the accuracy of
my fix-up...
-- 
John W. Linville
linville@tuxdriver.com

Re: linux-next: pending wireless/wireless-current merge conflict

[Zhu Yi]

On Wed, 2008-06-25 at 14:04 -0400, John W. Linville wrote:
> I just sent a pull request for Dave that will result in nasty-looking
> conflict in iwl4965-base.c.  I have a sample merge available here:
> 
>         git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
> 
> The overview of the resolution is to ignore any changes in
> iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
> the URL above.
> 
> Just a heads-up... :-)
> 
> John
> 
> P.S.  Hopefully the iwlwifi guys will double check the accuracy of
> my fix-up...

I checked the patch on the tip of wireless-testing is good. I think
wireless-next-2.6:merge-test should also be OK.

Thanks,
-yi

Re: linux-next: pending wireless/wireless-current merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

Hi John,

On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I just sent a pull request for Dave that will result in nasty-looking
> conflict in iwl4965-base.c.  I have a sample merge available here:
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
> 
> The overview of the resolution is to ignore any changes in
> iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
> the URL above.
> 
> Just a heads-up... :-)

Thanks, I will check it out.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: pending wireless/wireless-current merge conflict

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 25 Jun 2008 14:04:30 -0400

> I just sent a pull request for Dave that will result in nasty-looking
> conflict in iwl4965-base.c.  I have a sample merge available here:
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
> 
> The overview of the resolution is to ignore any changes in
> iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
> the URL above.

I've just merged net-2.6 into net-next-2.6 and done my best to
resolve that merge.

Thanks for the heads up!