linux-next: pending wireless/wireless-current merge conflict
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
Signature · 2 lines
John W. Linville [email protected]
Hi John,
Quoted 7 lines · On Fri, 13 Jun 2008 17:56:01 -0400 "John W. Linville" <[email protected]>…
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.6merge-testJust a heads-up... :-)
OK, Thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
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...
Signature · 2 lines
John W. Linville [email protected]
Quoted 9 lines · 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.6merge-testThe overview of the resolution is to ignore any changes in
iwl4965-base.cand takedrivers/net/wireless/iwlwifi/iwl-scan.cfrom the URL above.
Quoted 6 lines
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
Hi John,
Quoted 11 lines · On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <[email protected]>…
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.6merge-testThe overview of the resolution is to ignore any changes in
iwl4965-base.cand takedrivers/net/wireless/iwlwifi/iwl-scan.cfrom the URL above.Just a heads-up... :-)
Thanks, I will check it out.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
linux-next: manual merge of the net tree
In reply to John W. LinvilleHi John, Dave,
Quoted 9 lines · On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <[email protected]>…
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.6merge-testThe overview of the resolution is to ignore any changes in
iwl4965-base.cand takedrivers/net/wireless/iwlwifi/iwl-scan.cfrom the URL above.
I have done as instructed. Thanks.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: linux-next: manual merge of the net tree
From: Stephen Rothwell <[email protected]>
Date: Thu, 26 Jun 2008 15:40:20 +1000
Quoted 7 lines
Hi John, Dave,
Quoted 4 lines · On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <[email protected]>…
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:
Quoted 7 lines
Quoted 5 lines
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6merge-testThe overview of the resolution is to ignore any changes in
iwl4965-base.cand takedrivers/net/wireless/iwlwifi/iwl-scan.cfrom 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
Hi Dave,
Quoted 3 lines · On Wed, 25 Jun 2008 22:54:39 -0700 (PDT) David Miller <[email protected]>…
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 ...
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: linux-next: manual merge of the net tree
From: Stephen Rothwell <[email protected]>
Date: Thu, 26 Jun 2008 16:58:52 +1000
Quoted 6 lines · On Wed, 25 Jun 2008 22:54:39 -0700 (PDT) David Miller <[email protected]>…
Quoted 3 lines
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.
From: "John W. Linville" <[email protected]>
Date: Wed, 25 Jun 2008 14:04:30 -0400
Quoted 8 lines
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.6merge-testThe overview of the resolution is to ignore any changes in
iwl4965-base.cand takedrivers/net/wireless/iwlwifi/iwl-scan.cfrom 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!