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

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

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi John, Dave,

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.

I have done as instructed.  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 --]

Re: linux-next: manual merge of the net tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Jun 2008 15:40:20 +1000

> Hi John, Dave,
> 
> 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.
> 
> I have done as instructed.  Thanks.

Well, I didn't pull from John's tree yet, so you shouldn't
have needed to do this :-)

Re: linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

On Wed, 25 Jun 2008 22:54:39 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Well, I didn't pull from John's tree yet, so you shouldn't
> have needed to do this :-)

I have John's trees in linux-next separately ...

-- 
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: manual merge of the net tree

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Jun 2008 16:58:52 +1000

> On Wed, 25 Jun 2008 22:54:39 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> >
> > Well, I didn't pull from John's tree yet, so you shouldn't
> > have needed to do this :-)
> 
> I have John's trees in linux-next separately ...

Oh that's right, you told me this before.
Thanks for clarifying.

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!