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

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

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
work inside spin_lock_irqsave") from the wireless-current tree and commit
727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
3945") from the net tree.

I removed iwl{3945,}_set_mode() from and applied the following patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 5393fb3..967343a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2437,13 +2437,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
 	if (!iwl_is_ready_rf(priv))
 		return -EAGAIN;
 
-	cancel_delayed_work(&priv->scan_check);
-	if (iwl_scan_cancel_timeout(priv, 100)) {
-		IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
-		IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
-		return -EAGAIN;
-	}
-
 	iwlcore_commit_rxon(priv);
 
 	return 0;

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 May 2009 14:06:10 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-agn.c
> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> work inside spin_lock_irqsave") from the wireless-current tree and commit
> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> 3945") from the net tree.
> 
> I removed iwl{3945,}_set_mode() from and applied the following patch.

I'll sort this out right now, thanks Stephen.

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

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 May 2009 14:06:10 +1000
> 
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/net/wireless/iwlwifi/iwl-agn.c
>> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
>> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
>> work inside spin_lock_irqsave") from the wireless-current tree and commit
>> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
>> 3945") from the net tree.
>> 
>> I removed iwl{3945,}_set_mode() from and applied the following patch.
> 
> I'll sort this out right now, thanks Stephen.

Sorry, I misread this.  The conflict is created by the
wireless-current tree so it seems something John has to
sort out unless I've pulled that work into net-next-2.6 already.

John which is it?

Thanks.

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

[John W. Linville]

On Thu, May 21, 2009 at 03:25:11PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 May 2009 14:06:10 +1000
> 
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-agn.c
> > drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> > fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> > work inside spin_lock_irqsave") from the wireless-current tree and commit
> > 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> > 3945") from the net tree.
> > 
> > I removed iwl{3945,}_set_mode() from and applied the following patch.
> 
> I'll sort this out right now, thanks Stephen.

wireless-next-2.6 has a merge-test branch for reference.

Hth!

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

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

[John W. Linville]

On Thu, May 21, 2009 at 03:29:10PM -0700, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 21 May 2009 15:25:11 -0700 (PDT)
> 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 21 May 2009 14:06:10 +1000
> > 
> >> Today's linux-next merge of the net tree got a conflict in
> >> drivers/net/wireless/iwlwifi/iwl-agn.c
> >> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
> >> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed
> >> work inside spin_lock_irqsave") from the wireless-current tree and commit
> >> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in
> >> 3945") from the net tree.
> >> 
> >> I removed iwl{3945,}_set_mode() from and applied the following patch.
> > 
> > I'll sort this out right now, thanks Stephen.
> 
> Sorry, I misread this.  The conflict is created by the
> wireless-current tree so it seems something John has to
> sort out unless I've pulled that work into net-next-2.6 already.
> 
> John which is it?

I think what Stephen has done is good for now.  I'll probably post
a pull request for wireless-next-2.6 tommorrow.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

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

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 21 May 2009 20:35:47 -0400

> I think what Stephen has done is good for now.  I'll probably post
> a pull request for wireless-next-2.6 tommorrow.

Ok.

Once I pull that in I'll pull net-2.6 into net-next-2.6 to resolve
all of the merge issues fully.

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

[Stephen Rothwell]

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

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/orinoco/main.c between commit
240c102d9c54fee7fdc87a4ef2fabc7eb539e00a ("netdev: restore MAC address
set and validate operations") from the net-current tree and
commit5381956b780e82805247c2ec8e32c4c665309394 ("orinoco: move netdev
interface creation to main driver") from the net tree.

Just overlapping removals.  I fixed it up and can carry the fix as
necessary.
-- 
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 with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/ieee1394/eth1394.c between commit
66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
1394 driver stack") from the  tree and commit
01414802054c382072b6cb9a1bdc6e243c74b2d5 ("ethtool: Provide a default
implementation of ethtool_ops::get_drvinfo") from the net tree.

The former removes the file.  I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi all,

On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/ieee1394/eth1394.c between commit
> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
> 1394 driver stack") from the  tree and commit
                               ^
I meant to say "the ieee1394 tree".

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

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

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

[Stefan Richter]

Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 12 Oct 2010 11:17:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the net tree got a conflict in
>> drivers/ieee1394/eth1394.c between commit
>> 66fa12c571d35e3cd62574c65f1785a460105397 ("ieee1394: remove the old IEEE
>> 1394 driver stack") from the  tree and commit
>                                ^
> I meant to say "the ieee1394 tree".

(I should have put the ieee1394 removal into -next much earlier.  OTOH the
conflicting commit is from August 17 already...)

Would it be useful if I rebase this small ieee1394 removal branch of mine onto
net?
-- 
Stefan Richter
-=====-==-=- =-=- -==--
http://arcgraph.de/sr/

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/sky2.c between
commit1d3c16a818e992c199844954d95c17fd7ce6cbba  ("PCI: make
pci_restore_state return void") from the  tree and commit
0f333d10e3f689640b229c8cf00b16ea51ce4951 ("sky2: Do not use legacy PCI
power management") from the net tree.

The latter removes the code that the former modifies.  I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.

The former commit removes the file, so I just did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Niklaus Giger]

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> arch/powerpc/configs/40x/hcu4_defconfig between commit 9fcd768d0cc8
> ("powerpc/40x: Remove obsolete HCU4 board") from the 4xx tree and commit
> 3b3bceef26f8 ("net: fix IBM EMAC driver after rename") from the net tree.
> 
> The former commit removes the file, so I just did that.
Thanks!

Best regards