linux-next: manual merge of the net tree

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-3945.c between commit
0ff1cca0e272045b9c11a2ff94bd3e6893c9308c
("drivers/net/wireless/iwlwifi/iwl-3945.c Fix type issue on 64bit") from
the wireless-current tree and commit
fd7c8a40b2a63863f749e4d17f0d94d2e5ab1331 ("mac80211: add helpers for
frame control testing") from the net tree.

I applied the former change to the latter's code and can carry the fixup
while 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 --]

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

[John W. Linville]

On Tue, Jul 08, 2008 at 02:16:07PM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-3945.c between commit
> 0ff1cca0e272045b9c11a2ff94bd3e6893c9308c
> ("drivers/net/wireless/iwlwifi/iwl-3945.c Fix type issue on 64bit") from
> the wireless-current tree and commit
> fd7c8a40b2a63863f749e4d17f0d94d2e5ab1331 ("mac80211: add helpers for
> frame control testing") from the net tree.
> 
> I applied the former change to the latter's code and can carry the fixup
> while necessary.

Yes, that sounds like the right fix.  I'm sorry I didn't get you a
merge-test in advance this time!

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

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

[Stephen Rothwell]

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

Hi John,

On Tue, 8 Jul 2008 08:22:27 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> Yes, that sounds like the right fix.  I'm sorry I didn't get you a
> merge-test in advance this time!

It was a simple fix.

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

[Stephen Rothwell]

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

Hi Dave,

On Sun, 28 Dec 2008 20:00:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I'll take care of this as I prepare the sparc-next-2.6 tree for
> merging.

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: Mon, 29 Dec 2008 14:53:00 +1100

> Hi Dave,
> 
> On Sun, 07 Dec 2008 23:26:58 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 8 Dec 2008 14:48:51 +1100
> > 
> > > Today's linux-next merge of the net tree got a conflict in
> > > arch/sparc64/kernel/idprom.c between commit
> > > a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
> > > from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
> > > ("net: convert more to %pM") from the net tree.
> > 
> > Thanks for reporting this.
> > 
> > > The former renamed the file while the latter modified it.  I just deleted
> > > the renamed file for now, the %pM conversion can be done later.
> > 
> > Yes it's probably the best way to handle this for now.
> 
> This conflict is now between the sparc tree and Linus' tree ...

I'll take care of this as I prepare the sparc-next-2.6 tree for
merging.

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

[Stephen Rothwell]

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

Hi Dave,

On Sun, 07 Dec 2008 23:26:58 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Dec 2008 14:48:51 +1100
> 
> > Today's linux-next merge of the net tree got a conflict in
> > arch/sparc64/kernel/idprom.c between commit
> > a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
> > from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
> > ("net: convert more to %pM") from the net tree.
> 
> Thanks for reporting this.
> 
> > The former renamed the file while the latter modified it.  I just deleted
> > the renamed file for now, the %pM conversion can be done later.
> 
> Yes it's probably the best way to handle this for now.

This conflict is now between the sparc tree and Linus' tree ...

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

[Cyrill Gorcunov]

[Stephen Rothwell - Wed, Dec 24, 2008 at 10:19:34AM +1100]
| Hi Dave,
| 
| Today's linux-next merge of the net tree got a conflict in
| drivers/net/ppp_generic.c between commit
| 739840d529eb7505d3cbfe9d468bf1440c9a8e27 ("ppp: fix segfaults introduced
| by netdev_priv changes") from the net-current tree and commit
| 7a95d267fb62cd6b80ef73be0592bbbe1dbd5df7 ("net: ppp_generic - use idr
| technique instead of cardmaps") from the net tree.
| 
| I fixed it up (see below) and can carry the fix as necessary.
| -- 
| Cheers,
| Stephen Rothwell                    sfr@canb.auug.org.au
| http://www.canb.auug.org.au/~sfr/
|

Thanks a lot, Stephen!

		- Cyrill -

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 24 Dec 2008 10:15:13 +1100

> Today's linux-next merge of the net tree got a conflict in
> Documentation/DocBook/networking.tmpl between commit
> 66aa675719ab82a03a66b75210fd40be6541f8fb ("wimax: Makefile, Kconfig and
> docbook linkage for the stack") from the usb tree and commit
> 72364706c3b7c09a658e356218a918c5f92dcad0 ("WAN: syncppp.c is no longer
> used by any kernel code. Remove it") from the net tree.
> 
> Juts an overlapping add/remove. I fixed it up (see below) and can carry
> the fix as necessary.

Thanks Stephen.  You'll need to carry this one.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 24 Dec 2008 10:19:34 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ppp_generic.c between commit
> 739840d529eb7505d3cbfe9d468bf1440c9a8e27 ("ppp: fix segfaults introduced
> by netdev_priv changes") from the net-current tree and commit
> 7a95d267fb62cd6b80ef73be0592bbbe1dbd5df7 ("net: ppp_generic - use idr
> technique instead of cardmaps") from the net tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks Stephen.

Since Linus just pulled my net-2.6 tree into his today,
I merged net-2.6 into net-next-2.6 which will resolve
this.

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ppp_generic.c between commit
739840d529eb7505d3cbfe9d468bf1440c9a8e27 ("ppp: fix segfaults introduced
by netdev_priv changes") from the net-current tree and commit
7a95d267fb62cd6b80ef73be0592bbbe1dbd5df7 ("net: ppp_generic - use idr
technique instead of cardmaps") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/ppp_generic.c
index 714a230,c832d60..0000000
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@@ -2498,17 -2484,19 +2484,17 @@@ init_ppp_file(struct ppp_file *pf, int 
   */
  static void ppp_shutdown_interface(struct ppp *ppp)
  {
 -	struct net_device *dev;
 -
  	mutex_lock(&all_ppp_mutex);
 -	ppp_lock(ppp);
 -	dev = ppp->dev;
 -	ppp->dev = NULL;
 -	ppp_unlock(ppp);
  	/* This will call dev_close() for us. */
 -	if (dev) {
 -		unregister_netdev(dev);
 -		free_netdev(dev);
 -	}
 +	ppp_lock(ppp);
 +	if (!ppp->closing) {
 +		ppp->closing = 1;
 +		ppp_unlock(ppp);
 +		unregister_netdev(ppp->dev);
 +	} else
 +		ppp_unlock(ppp);
 +
- 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
+ 	unit_put(&ppp_units_idr, ppp->file.index);
  	ppp->file.dead = 1;
  	ppp->owner = NULL;
  	wake_up_interruptible(&ppp->file.rwait);

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
Documentation/DocBook/networking.tmpl between commit
66aa675719ab82a03a66b75210fd40be6541f8fb ("wimax: Makefile, Kconfig and
docbook linkage for the stack") from the usb tree and commit
72364706c3b7c09a658e356218a918c5f92dcad0 ("WAN: syncppp.c is no longer
used by any kernel code. Remove it") from the net tree.

Juts an overlapping add/remove. I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/DocBook/networking.tmpl
index 7053c1c,627707a..0000000
--- a/Documentation/DocBook/networking.tmpl
+++ b/Documentation/DocBook/networking.tmpl
@@@ -98,17 -98,6 +98,14 @@@
  X!Enet/core/wireless.c
       </sect1>
  -->
-      <sect1><title>Synchronous PPP</title>
- !Edrivers/net/wan/syncppp.c
-      </sect1>
 +     <sect1><title>WiMAX</title>
 +!Enet/wimax/op-msg.c
 +!Enet/wimax/op-reset.c
 +!Enet/wimax/op-rfkill.c
 +!Enet/wimax/stack.c
 +!Iinclude/net/wimax.h
 +!Iinclude/linux/wimax.h
 +     </sect1>
    </chapter>
  
  </book>

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 15 Dec 2008 14:44:05 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e1000e/ich8lan.c between commit
> 30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
> mutex") from the net-current tree and commit
> 0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
> debug message") from the net tree.
> 
> Trivial context overlap.  I fixed it up (see below) and will carry as
> necessary.

Thanks Stephen.

This will be cleared up next time I merge.

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/ich8lan.c between commit
30bb0e0dce78427f3e5cb728d6b5ea73acbefffa ("e1000e: fix double release of
mutex") from the net-current tree and commit
0285c8dcaeaa73ddadc4f38383e5bbc03c394a29 ("e1000e: cosmetic newline in
debug message") from the net tree.

Trivial context overlap.  I fixed it up (see below) and will carry as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/e1000e/ich8lan.c
index d115a6d,92f2ace..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1893,8 -1939,7 +1939,8 @@@ static s32 e1000_reset_hw_ich8lan(struc
  		ctrl |= E1000_CTRL_PHY_RST;
  	}
  	ret_val = e1000_acquire_swflag_ich8lan(hw);
 +	/* Whether or not the swflag was acquired, we need to reset the part */
- 	hw_dbg(hw, "Issuing a global reset to ich8lan");
+ 	hw_dbg(hw, "Issuing a global reset to ich8lan\n");
  	ew32(CTRL, (ctrl | E1000_CTRL_RST));
  	msleep(20);
  

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

[Stephen Rothwell]

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

Hi Bruce,

On Tue, 9 Dec 2008 17:17:08 -0500 "J. Bruce Fields" <bfields@fieldses.org> wrote:
>
> I could rebase nfsd onto net in this case if that'd simplify your life.
> Assuming net never rebases that wouldn't cause additional conflicts for
> you.
> 
> And that's more-or-less what we'll end up doing come the merge window
> anyway.
> 
> (Or we could pull one of net or nfsd into the other.)

The net tree never rebases, so pulling it into your tree is fine and a
good solution.  That would move the conflict resolution from my tree to
yours (which is always better since you know your code better than I do).

The only thing to remember is that the net tree should be merged into
Linus' before the nfsd tree during the merge window.  (It doesn't really
matter, but is good form as then Dave will get blamed for any problems
introduced by his tree rather than you :-))

The only other downside is that if Dave's tree has a bug (in the part you
have merged) that causes me to drop it then I will have to drop your tree
as well.  However, that doesn't happen very often (right, Dave?  :-)).

The alternative of Dave merging your tree into his only works if you can
guarantee that you will never rebase your tree.
-- 
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: "J. Bruce Fields" <bfields@fieldses.org>
Date: Tue, 9 Dec 2008 17:17:08 -0500

> I could rebase nfsd onto net in this case if that'd simplify your life.
> Assuming net never rebases that wouldn't cause additional conflicts for
> you.

It never rebases, promise :-)

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

[J. Bruce Fields]

On Tue, Dec 09, 2008 at 01:21:36PM +1100, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> fs/lockd/host.c between commit 3105d87fe1d311e80fd4781e82fa519fd5e2ffe2
> ("NLM: Support IPv6 scope IDs in nlm_display_address()") from the nfsd
> tree and various commits that replace the NIP* macros from the net tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks!

I could rebase nfsd onto net in this case if that'd simplify your life.
Assuming net never rebases that wouldn't cause additional conflicts for
you.

And that's more-or-less what we'll end up doing come the merge window
anyway.

(Or we could pull one of net or nfsd into the other.)

--b.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> diff --cc fs/lockd/host.c
> index 472aac1,c48c263..0000000
> --- a/fs/lockd/host.c
> +++ b/fs/lockd/host.c
> @@@ -105,37 -104,25 +105,37 @@@ static void nlm_clear_port(struct socka
>   	}
>   }
>   
>  -static void nlm_display_address(const struct sockaddr *sap,
>  -				char *buf, const size_t len)
>  +static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
>  +				     const size_t len)
>   {
>   	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
> - 	snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
> ++	snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
>  +}
>  +
>  +static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
>  +				     const size_t len)
>  +{
>   	const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
>   
>  +	if (ipv6_addr_v4mapped(&sin6->sin6_addr))
> - 		snprintf(buf, len, NIPQUAD_FMT,
> - 				NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
> ++		snprintf(buf, len, "%pI4",
> ++				&sin6->sin6_addr.s6_addr32[3]);
>  +	else if (sin6->sin6_scope_id != 0)
> - 		snprintf(buf, len, NIP6_FMT "%%%u", NIP6(sin6->sin6_addr),
> ++		snprintf(buf, len, "%pI6%%%u", &sin6->sin6_addr,
>  +				sin6->sin6_scope_id);
>  +	else
> - 		snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
> ++		snprintf(buf, len, "%pI6", &sin6->sin6_addr);
>  +}
>  +
>  +static void nlm_display_address(const struct sockaddr *sap,
>  +				char *buf, const size_t len)
>  +{
>   	switch (sap->sa_family) {
>  -	case AF_UNSPEC:
>  -		snprintf(buf, len, "unspecified");
>  -		break;
>   	case AF_INET:
>  -		snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
>  +		nlm_display_ipv4_address(sap, buf, len);
>   		break;
>   	case AF_INET6:
>  -		if (ipv6_addr_v4mapped(&sin6->sin6_addr))
>  -			snprintf(buf, len, "%pI4",
>  -				 &sin6->sin6_addr.s6_addr32[3]);
>  -		else
>  -			snprintf(buf, len, "%pI6", &sin6->sin6_addr);
>  +		nlm_display_ipv6_address(sap, buf, len);
>   		break;
>   	default:
>   		snprintf(buf, len, "unsupported address family");

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
fs/lockd/host.c between commit 3105d87fe1d311e80fd4781e82fa519fd5e2ffe2
("NLM: Support IPv6 scope IDs in nlm_display_address()") from the nfsd
tree and various commits that replace the NIP* macros from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc fs/lockd/host.c
index 472aac1,c48c263..0000000
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@@ -105,37 -104,25 +105,37 @@@ static void nlm_clear_port(struct socka
  	}
  }
  
 -static void nlm_display_address(const struct sockaddr *sap,
 -				char *buf, const size_t len)
 +static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
 +				     const size_t len)
  {
  	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
- 	snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
++	snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
 +}
 +
 +static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
 +				     const size_t len)
 +{
  	const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
  
 +	if (ipv6_addr_v4mapped(&sin6->sin6_addr))
- 		snprintf(buf, len, NIPQUAD_FMT,
- 				NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
++		snprintf(buf, len, "%pI4",
++				&sin6->sin6_addr.s6_addr32[3]);
 +	else if (sin6->sin6_scope_id != 0)
- 		snprintf(buf, len, NIP6_FMT "%%%u", NIP6(sin6->sin6_addr),
++		snprintf(buf, len, "%pI6%%%u", &sin6->sin6_addr,
 +				sin6->sin6_scope_id);
 +	else
- 		snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
++		snprintf(buf, len, "%pI6", &sin6->sin6_addr);
 +}
 +
 +static void nlm_display_address(const struct sockaddr *sap,
 +				char *buf, const size_t len)
 +{
  	switch (sap->sa_family) {
 -	case AF_UNSPEC:
 -		snprintf(buf, len, "unspecified");
 -		break;
  	case AF_INET:
 -		snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
 +		nlm_display_ipv4_address(sap, buf, len);
  		break;
  	case AF_INET6:
 -		if (ipv6_addr_v4mapped(&sin6->sin6_addr))
 -			snprintf(buf, len, "%pI4",
 -				 &sin6->sin6_addr.s6_addr32[3]);
 -		else
 -			snprintf(buf, len, "%pI6", &sin6->sin6_addr);
 +		nlm_display_ipv6_address(sap, buf, len);
  		break;
  	default:
  		snprintf(buf, len, "unsupported address family");

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in fs/lockd/mon.c
between commit 9e414471988c5558df3674b94e145d8f926a683f ("NSM: Support
IPv6 version of mon_name") from the nfsd tree and commit
be859405487324ed548f1ba11dc949b8230ab991 ("fs: replace NIPQUAD()") from
the net tree.

The former removed the code that the latter modified.  However, the nfsd
tree has added some more usages of the NIP macros ...
-- 
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: Mon, 8 Dec 2008 14:48:51 +1100

> Today's linux-next merge of the net tree got a conflict in
> arch/sparc64/kernel/idprom.c between commit
> a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
> from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
> ("net: convert more to %pM") from the net tree.

Thanks for reporting this.

> The former renamed the file while the latter modified it.  I just deleted
> the renamed file for now, the %pM conversion can be done later.

Yes it's probably the best way to handle this for now.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
arch/sparc64/kernel/idprom.c between commit
a88b5ba8bd8ac18aad65ee6c6a254e2e74876db3 (sparc,sparc64: unify kernel/"")
from the sparc tree and commit 7c510e4b730a92cecf94ada45c989d8be0200d47
("net: convert more to %pM") from the net tree.

The former renamed the file while the latter modified it.  I just deleted
the renamed file for now, the %pM conversion can be done later.
-- 
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

[Mike Frysinger]

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

On Sunday 30 November 2008 22:26:23 Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/smc91x.c between commit
> f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
> smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
> __init markings to smc_drv_probe()") from the net tree.
>
> The former changed smc_drv_probe() to __devinit while the latter to
> __init.  I used the latter and it can be fixed up in your tree.
>
> I do wonder why the former change didn't go through Jeff's tree ...

__devinit is correct ... it's a probe function
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 835 bytes --]

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Dec 2008 14:26:23 +1100

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/smc91x.c between commit
> f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
> smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
> __init markings to smc_drv_probe()") from the net tree.
> 
> The former changed smc_drv_probe() to __devinit while the latter to
> __init.  I used the latter and it can be fixed up in your tree.
> 
> I do wonder why the former change didn't go through Jeff's tree ...

Linus applied a lot of things from Al today he shouldn't have.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/smc91x.c between commit
f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
__init markings to smc_drv_probe()") from the net tree.

The former changed smc_drv_probe() to __devinit while the latter to
__init.  I used the latter and it can be fixed up in your tree.

I do wonder why the former change didn't go through Jeff's tree ...
-- 
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: 639 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in drivers/net/ixgbe/ixgbe_main.c between commit 43ced651d1272ced02ed5f1c2abc79e3354187f6 ("ixgbe section fixes") from Linus' tree and commit ixgbe_init_interrupt_scheme ("ixgbe: this patch adds support for DCB to the kernel and ixgbe driver") from the net tree.

I used the latter version (ixgbe_init_interrupt_scheme() is now not
static and both patches removed the __devinit annotation).  This could be
fixed up by merging Linus' tree into the net tree.

-- 
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, 27 Nov 2008 14:40:43 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/hp-plus.c between commit
> 1d71da164d7fb40fac72c0406a4a531265916fc8 ("net: hp-plus uses eip_poll")
> from the net-current tree and commit
> d4a97d425c2f59849ebdcc94281ecf108818efbf ("hp-plus: convert to
> net_device_ops") from the net tree.
> 
> The fixed it up (see below) but assume it will be fixed soon in the net
> tree.

Thanks Stephen.

I just merged net-2.6 into net-next-2.6 to clear up all of these
merge and build hassles.

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/hp-plus.c between commit
1d71da164d7fb40fac72c0406a4a531265916fc8 ("net: hp-plus uses eip_poll")
from the net-current tree and commit
d4a97d425c2f59849ebdcc94281ecf108818efbf ("hp-plus: convert to
net_device_ops") from the net tree.

The fixed it up (see below) but assume it will be fixed soon in the net
tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/hp-plus.c
index c01e290,c34411c..0000000
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@@ -158,6 -158,21 +158,21 @@@ out
  }
  #endif
  
+ static const struct net_device_ops hpp_netdev_ops = {
+ 	.ndo_open		= hpp_open,
+ 	.ndo_stop		= hpp_close,
+ 	.ndo_start_xmit		= ei_start_xmit,
+ 	.ndo_tx_timeout		= ei_tx_timeout,
+ 	.ndo_get_stats		= ei_get_stats,
+ 	.ndo_set_multicast_list = ei_set_multicast_list,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ 	.ndo_change_mtu		= eth_change_mtu,
+ #ifdef CONFIG_NET_POLL_CONTROLLER
 -	.ndo_poll_controller	= ei_poll,
++	.ndo_poll_controller	= eip_poll,
+ #endif
+ };
+ 
+ 
  /* Do the interesting part of the probe at a single address. */
  static int __init hpp_probe1(struct net_device *dev, int ioaddr)
  {

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/wireless/reg.c between commit
020cf6ba7a91ccc5db359f91e9abba175fd3a0aa ("net/wireless/reg.c: fix bad
WARN_ON in if statement") from the net-current tree and commit
2083c4997b95fffe8d4f71741bef2298810805a3 ("wireless: clean up regulatory
ignore_request function") from the net tree.

The latter removed the code that the former fixed.  I assume that this
conflict will be fixed in the net tree soon.

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/ath5k/base.c between commit
02969b38e6f7cef80e71d673d1e512e029a7009f ("ath5k: disable beacon filter
when station is not associated") from the net-current tree and commits da966bcae70e4012b7d999820b728dd6502047e0 ("Ath5k: add AP mode") and 296bf2aefdf7b4b1bf093a7b42a86ee21b46d07f ("ath5k: allow APs to receive
beacons") from the net tree.

I fixed it up (see below) and assume it will be fixed in the net tree
soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/wireless/ath5k/base.c
index 2d14255,34cd1a4..0000000
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@@ -238,12 -240,7 +240,11 @@@ static int ath5k_get_tx_stats(struct ie
  		struct ieee80211_tx_queue_stats *stats);
  static u64 ath5k_get_tsf(struct ieee80211_hw *hw);
  static void ath5k_reset_tsf(struct ieee80211_hw *hw);
- static int ath5k_beacon_update(struct ieee80211_hw *hw,
- 		struct sk_buff *skb);
+ static int ath5k_beacon_update(struct ath5k_softc *sc, struct sk_buff *skb);
 +static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
 +		struct ieee80211_vif *vif,
 +		struct ieee80211_bss_conf *bss_conf,
 +		u32 changes);
  
  static struct ieee80211_ops ath5k_hw_ops = {
  	.tx 		= ath5k_tx,
@@@ -2947,13 -2952,16 +2957,16 @@@ static void ath5k_configure_filter(stru
  		sc->opmode != NL80211_IFTYPE_MESH_POINT &&
  		test_bit(ATH_STAT_PROMISC, sc->status))
  		rfilt |= AR5K_RX_FILTER_PROM;
 -	if (sc->opmode == NL80211_IFTYPE_STATION ||
 +	if ((sc->opmode == NL80211_IFTYPE_STATION && sc->assoc) ||
- 		sc->opmode == NL80211_IFTYPE_ADHOC) {
+ 		sc->opmode == NL80211_IFTYPE_ADHOC ||
+ 		sc->opmode == NL80211_IFTYPE_AP)
  		rfilt |= AR5K_RX_FILTER_BEACON;
- 	}
+ 	if (sc->opmode == NL80211_IFTYPE_MESH_POINT)
+ 		rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
+ 			AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
  
  	/* Set filters */
- 	ath5k_hw_set_rx_filter(ah,rfilt);
+ 	ath5k_hw_set_rx_filter(ah, rfilt);
  
  	/* Set multicast bits */
  	ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);
@@@ -3085,35 -3090,6 +3095,34 @@@ ath5k_beacon_update(struct ath5k_softc 
  		mmiowb();
  	}
  
- end:
  	return ret;
  }
 +static void
 +set_beacon_filter(struct ieee80211_hw *hw, bool enable)
 +{
 +	struct ath5k_softc *sc = hw->priv;
 +	struct ath5k_hw *ah = sc->ah;
 +	u32 rfilt;
 +	rfilt = ath5k_hw_get_rx_filter(ah);
 +	if (enable)
 +		rfilt |= AR5K_RX_FILTER_BEACON;
 +	else
 +		rfilt &= ~AR5K_RX_FILTER_BEACON;
 +	ath5k_hw_set_rx_filter(ah, rfilt);
 +	sc->filter_flags = rfilt;
 +}
  
 +static void ath5k_bss_info_changed(struct ieee80211_hw *hw,
 +				    struct ieee80211_vif *vif,
 +				    struct ieee80211_bss_conf *bss_conf,
 +				    u32 changes)
 +{
 +	struct ath5k_softc *sc = hw->priv;
 +	if (changes & BSS_CHANGED_ASSOC) {
 +		mutex_lock(&sc->lock);
 +		sc->assoc = bss_conf->assoc;
 +		if (sc->opmode == NL80211_IFTYPE_STATION)
 +			set_beacon_filter(hw, sc->assoc);
 +		mutex_unlock(&sc->lock);
 +	}
 +}

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

[Stephen Rothwell]

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

Hi Dave,

On Thu, 20 Nov 2008 20:11:02 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> If you would have pulled 20 minutes later you would have gotten
> my tree after sorting out these merge hassles :)

I will start sleeping in :-)

-- 
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: Fri, 21 Nov 2008 13:29:41 +1100

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ixgbe/ixgbe_main.c between commit
> 79aefa45b20940cbb9104464548ff74f80f2395e ("ixgbe: fix compilation with
> gcc-3.4") from the net-current tree and commit
> 0befdb3e0a26a8949063915274e1bec8873c526b ("ixgbe: add device support for
> 82598AT (copper 10GbE) adapters") from the net tree.
> 
> I fixed it up (see below) and assume you will do something similar.

If you would have pulled 20 minutes later you would have gotten
my tree after sorting out these merge hassles :)

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/phonet/af_phonet.c between commit
566521d63720ab47576afb85147e5652993bf1e6 ("phonet: fix compilation with
gcc-3.4") from the net-current tree and commit
5c7f0333584128c745fbda845abbe3a32c22d467 ("phonet: sparse annotations of
protocol, remove forward declaration") from the net tree.

I fixed it up (by adding the extra bits from the net-current change) and
assume you will do something similar.
-- 
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]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ixgbe/ixgbe_main.c between commit
79aefa45b20940cbb9104464548ff74f80f2395e ("ixgbe: fix compilation with
gcc-3.4") from the net-current tree and commit
0befdb3e0a26a8949063915274e1bec8873c526b ("ixgbe: add device support for
82598AT (copper 10GbE) adapters") from the net tree.

I fixed it up (see below) and assume you will do something similar.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/ixgbe/ixgbe_main.c
index 36f2bb6,6fb8738..0000000
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@@ -1287,34 -1301,7 +1301,36 @@@ static void ixgbe_set_itr(struct ixgbe_
  	return;
  }
  
 -static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter);
 +/**
 + * ixgbe_irq_disable - Mask off interrupt generation on the NIC
 + * @adapter: board private structure
 + **/
 +static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
 +{
 +	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
 +	IXGBE_WRITE_FLUSH(&adapter->hw);
 +	if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
 +		int i;
 +		for (i = 0; i < adapter->num_msix_vectors; i++)
 +			synchronize_irq(adapter->msix_entries[i].vector);
 +	} else {
 +		synchronize_irq(adapter->pdev->irq);
 +	}
 +}
 +
 +/**
 + * ixgbe_irq_enable - Enable default interrupt generation settings
 + * @adapter: board private structure
 + **/
 +static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)
 +{
 +	u32 mask;
 +	mask = IXGBE_EIMS_ENABLE_MASK;
++	if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
++		mask |= IXGBE_EIMS_GPI_SDP1;
 +	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
 +	IXGBE_WRITE_FLUSH(&adapter->hw);
 +}
  
  /**
   * ixgbe_intr - legacy mode Interrupt Handler

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
include/net/mac80211.h between commit
8e3bad65a59915f2ddc40f62a180ad81695d8440 ("mac80211: remove
ieee80211_notify_mac") from the wireless-current tree and commit
ae5eb02641233a4e9d1b92d22090f1b1afa14466 ("mac80211: rewrite HT
handling") from the net tree.

I fixed it up (see below) but assume it will be fixed soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc include/net/mac80211.h
index 73d81bc,5385600..0000000
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@@ -74,22 -74,14 +74,6 @@@
   */
  
  /**
-  * struct ieee80211_ht_bss_info - describing BSS's HT characteristics
-  *
-  * This structure describes most essential parameters needed
-  * to describe 802.11n HT characteristics in a BSS.
-  *
-  * @primary_channel: channel number of primery channel
-  * @bss_cap: 802.11n's general BSS capabilities (e.g. channel width)
-  * @bss_op_mode: 802.11n's BSS operation modes (e.g. HT protection)
-  */
- struct ieee80211_ht_bss_info {
- 	u8 primary_channel;
- 	u8 bss_cap;  /* use IEEE80211_HT_IE_CHA_ */
- 	u8 bss_op_mode; /* use IEEE80211_HT_IE_ */
- };
- 
- /**
 - * enum ieee80211_notification_type - Low level driver notification
 - * @IEEE80211_NOTIFY_RE_ASSOC: start the re-association sequence
 - */
 -enum ieee80211_notification_types {
 -	IEEE80211_NOTIFY_RE_ASSOC,
 -};
 -
 -/**
   * enum ieee80211_max_queues - maximum number of queues
   *
   * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/isdn/i4l/isdn_net.c between commit
584c650b4e6fa16f9ab45d382f86ad6d9c625227 ("isdn: remove extra byteswap in
isdn_net_ciscohdlck_slarp_send_reply") from the net-current tree and
commit 00bcd522ea0a62f5e2a9c6ad4924cbbd8d05b026 ("isdn: use %pI4, remove
get_{u8/u16/u32} and put_{u8/u16/u32} inlines") from the net tree.

I fixed it up by using the version from the net tree.  I assume that this
will be fixed in that tree shortly.
-- 
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

[John W. Linville]

On Wed, Nov 12, 2008 at 01:59:34PM +1100, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> net/mac80211/debugfs_sta.c between commit
> 013cd397532e5803a1625954a884d021653da720 ("mac80211: fix a buffer overrun
> in station debug code") from Linus' tree and commit
> 804feeb826f8a32c8c71a09101fae31804b40ad1 ("mac80211: remove aggregation
> status write support from debugfs") from the wireless/net tree.
> 
> The latter change just removes the code that the former change was
> modifying.  I used the latter and assume that this will be fixed in your
> tree soon.

I have a patch in wireless-next-2.6 that addresses the same issue as
a one-liner Dave merged already.  FWIW, I like mine better -- so it
should go to Dave with the next batch of -next stuff in a day or two.

Thanks,

John
-- 
John W. Linville		Linux should be at the core
linville@tuxdriver.com			of your literate lifestyle.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/mac80211/debugfs_sta.c between commit
013cd397532e5803a1625954a884d021653da720 ("mac80211: fix a buffer overrun
in station debug code") from Linus' tree and commit
804feeb826f8a32c8c71a09101fae31804b40ad1 ("mac80211: remove aggregation
status write support from debugfs") from the wireless/net tree.

The latter change just removes the code that the former change was
modifying.  I used the latter and assume that this will be fixed in your
tree soon.

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

[Stephen Rothwell]

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

Hi Dave,

On Tue, 11 Nov 2008 01:21:31 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> What usually happens is I wait for Linus to take net-2.6 into
> his tree (in case he doesn't like what I have pending and
> I thus have to respin to eliminate the offending commits).

That make sense.

-- 
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: Tue, 11 Nov 2008 19:24:53 +1100

> Hi David,
> 
> On Mon, 10 Nov 2008 23:00:49 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > Thanks for the heads up.  There will be even more conflicts,
> > between net-2.6 and net-next-2.6, that will need resolving
> > as well.
> 
> Is there some reason that you can't merge net-next-2.6 into net-2.6 when
> these conflicts arise?

What usually happens is I wait for Linus to take net-2.6 into
his tree (in case he doesn't like what I have pending and
I thus have to respin to eliminate the offending commits).

Once that happens I pull Linus's tree into net-2.6 and then
I pull net-2.6 into net-next-2.6

This resolves all the conflicts and at the same time avoids
the situation where my entire set of trees are ruined because
something inappropriate propagated into net-2.6 and this
poisons net-next-2.6 too if I just pull it in there before
Linus does decide to take it.

So when Linus takes my current pull request, I'll fix up the
conflicts.

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

[Stephen Rothwell]

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

Hi David,

On Mon, 10 Nov 2008 23:00:49 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Thanks for the heads up.  There will be even more conflicts,
> between net-2.6 and net-next-2.6, that will need resolving
> as well.

Is there some reason that you can't merge net-next-2.6 into net-2.6 when
these conflicts arise?

-- 
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: Mon, 10 Nov 2008 14:02:53 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/message/fusion/mptlan.c between commit
> 54e7ff9d6249ba88e393d7fbc8008da9279723be ("trivial: MPT fusion - remove
> long dead code") from Linus' tree and commit
> 7c510e4b730a92cecf94ada45c989d8be0200d47 ("net: convert more to %pM")
> from the net tree.
> 
> The former just removed some of the code that the latter modified.  I
> have removed the code and expect the ocnflict will be fixed in your tree
> soon.

Thanks for the heads up.  There will be even more conflicts,
between net-2.6 and net-next-2.6, that will need resolving
as well.

I hope to have this resolved within the next day.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/message/fusion/mptlan.c between commit
54e7ff9d6249ba88e393d7fbc8008da9279723be ("trivial: MPT fusion - remove
long dead code") from Linus' tree and commit
7c510e4b730a92cecf94ada45c989d8be0200d47 ("net: convert more to %pM")
from the net tree.

The former just removed some of the code that the latter modified.  I
have removed the code and expect the ocnflict will be fixed in your tree
soon.
-- 
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: Fri, 7 Nov 2008 15:24:24 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/ath5k/base.c between commit
> 934f6c3f8e7f5d6a6d07ae2df283fd02393019dd ("Revert "ath5k: honor
> FIF_BCN_PRBRESP_PROMISC in STA mode"") from the net-current tree and
> commit b706e65b40417e03c2451bb3f92488f3736843fa ("ath5k: fix mesh point
> operation") from the net tree.
> 
> Just a context change.  I fixed it up (see below) and assume it will be
> fixed in your tree soon.

Thanks a lot Stephen, I'll do a merge to fix this up!

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/8021q/vlan_core.c between commit
9b22ea560957de1484e6b3e8538f7eef202e3596 ("net: fix packet socket
delivery in rx irq handler") from the net-current tree and commit
d2ad3ca88da02baeccd5216780f1fe983c6953ba ("net/: Kill now superfluous
->last_rx stores") from the net tree.

The former moved the code around that the latter was removing.  It seems
that the net-current change supercedes the net one (I may be wrong).  I
assume that this will be fixed in your tree soon.

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/ath5k/base.c between commit
934f6c3f8e7f5d6a6d07ae2df283fd02393019dd ("Revert "ath5k: honor
FIF_BCN_PRBRESP_PROMISC in STA mode"") from the net-current tree and
commit b706e65b40417e03c2451bb3f92488f3736843fa ("ath5k: fix mesh point
operation") from the net tree.

Just a context change.  I fixed it up (see below) and assume it will be
fixed in your tree soon.

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

diff --cc drivers/net/wireless/ath5k/base.c
index cfd4d05,7ac5f28..0000000
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@@ -2942,13 -2949,14 +2949,16 @@@ static void ath5k_configure_filter(stru
  		sc->opmode != NL80211_IFTYPE_MESH_POINT &&
  		test_bit(ATH_STAT_PROMISC, sc->status))
  		rfilt |= AR5K_RX_FILTER_PROM;
 -	if (sc->opmode == NL80211_IFTYPE_ADHOC)
 +	if (sc->opmode == NL80211_IFTYPE_STATION ||
 +		sc->opmode == NL80211_IFTYPE_ADHOC) {
  		rfilt |= AR5K_RX_FILTER_BEACON;
 +	}
+ 	if (sc->opmode == NL80211_IFTYPE_MESH_POINT)
+ 		rfilt |= AR5K_RX_FILTER_CONTROL | AR5K_RX_FILTER_BEACON |
+ 			AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
  
  	/* Set filters */
- 	ath5k_hw_set_rx_filter(ah,rfilt);
+ 	ath5k_hw_set_rx_filter(ah, rfilt);
  
  	/* Set multicast bits */
  	ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);

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

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 29 Oct 2008 08:34:41 -0400

> On Tue, Oct 28, 2008 at 09:53:09PM -0700, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 29 Oct 2008 14:11:23 +1100
> > 
> > > Today's linux-next merge of the net tree got a conflict in
> > > drivers/net/wireless/p54/p54common.c between commit
> > > f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
> > > the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
> > > ("net: convert print_mac to %pM") from the net tree.
> > > 
> > > Just context changes.  I fixed it up (see below) and can carry the fix
> > > (hopefully only until net-current is merged into Linus' tree).
> > 
> > Yep, I'll merge after the next time net-current goes to Linus's tree.
> 
> BTW, any idea when that will be?  I have stuff that could go to -next
> but that will conflict with what has been sent for 2.6.28.

I just sent a pull request out to Linus, when he grabs that I'll
merge everything into net-next-2.6 and send a note to netdev.

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

[John W. Linville]

On Tue, Oct 28, 2008 at 09:53:09PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 29 Oct 2008 14:11:23 +1100
> 
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/wireless/p54/p54common.c between commit
> > f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
> > the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
> > ("net: convert print_mac to %pM") from the net tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix
> > (hopefully only until net-current is merged into Linus' tree).
> 
> Yep, I'll merge after the next time net-current goes to Linus's tree.

BTW, any idea when that will be?  I have stuff that could go to -next
but that will conflict with what has been sent for 2.6.28.

John
-- 
John W. Linville		Linux should be at the core
linville@tuxdriver.com			of your literate lifestyle.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 29 Oct 2008 14:11:23 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/p54/p54common.c between commit
> f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
> the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
> ("net: convert print_mac to %pM") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> (hopefully only until net-current is merged into Linus' tree).

Yep, I'll merge after the next time net-current goes to Linus's tree.

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/p54/p54common.c between commit
f2c2e25554991f9c17bcd24028db5e1c50ecb0ad ("p54: fix build warnings") from
the net-current tree and commit e174961ca1a0b28f7abf0be47973ad57cb74e5f0
("net: convert print_mac to %pM") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
(hopefully only until net-current is merged into Linus' tree).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/wireless/p54/p54common.c
index 827ca03,72859de..0000000
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@@ -319,8 -319,7 +319,7 @@@ static int p54_parse_eeprom(struct ieee
  	void *tmp;
  	int err;
  	u8 *end = (u8 *)eeprom + len;
 -	u16 synth;
 +	u16 synth = 0;
- 	DECLARE_MAC_BUF(mac);
  
  	wrap = (struct eeprom_pda_wrap *) eeprom;
  	entry = (void *)wrap->data + le16_to_cpu(wrap->len);

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Aug 2008 13:55:14 +1000

> Today's linux-next merge of the net tree got a conflict in
> net/mac80211/mlme.c between commit
> 087d833e5a9f67ba933cb32eaf5a2279c1a5b47c ("mac80211: Use IWEVASSOCREQIE
> instead of IWEVCUSTOM") from the net-current tree and commit
> f698d856f65c3fea091cc303a135967965c5b880 ("replace net_device arguments
> with ieee80211_{local,sub_if_data} as appropriate") from the net tree.
> 
> The former moved some code that the latter modified.  I fixed it up
> (see below) and can carry the fix.

Thanks, please carry it until I merge net-2.6 into net-next-2.6,
which I'll do right after Linus pulls in the current batch.

linux-next: manual merge of the net tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/mac80211/mlme.c between commit
087d833e5a9f67ba933cb32eaf5a2279c1a5b47c ("mac80211: Use IWEVASSOCREQIE
instead of IWEVCUSTOM") from the net-current tree and commit
f698d856f65c3fea091cc303a135967965c5b880 ("replace net_device arguments
with ieee80211_{local,sub_if_data} as appropriate") from the net tree.

The former moved some code that the latter modified.  I fixed it up
(see below) and can carry the fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc net/mac80211/mlme.c
index 9bb68c6,8499979..0000000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -475,24 -474,54 +474,24 @@@ int ieee80211_ht_addt_info_ie_to_ht_bss
  	return 0;
  }
  
- static void ieee80211_sta_send_associnfo(struct net_device *dev,
+ static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,
  					 struct ieee80211_if_sta *ifsta)
  {
 -	char *buf;
 -	size_t len;
 -	int i;
  	union iwreq_data wrqu;
  
 -	if (!ifsta->assocreq_ies && !ifsta->assocresp_ies)
 -		return;
 -
 -	buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len +
 -				ifsta->assocresp_ies_len), GFP_KERNEL);
 -	if (!buf)
 -		return;
 -
 -	len = sprintf(buf, "ASSOCINFO(");
  	if (ifsta->assocreq_ies) {
 -		len += sprintf(buf + len, "ReqIEs=");
 -		for (i = 0; i < ifsta->assocreq_ies_len; i++) {
 -			len += sprintf(buf + len, "%02x",
 -				       ifsta->assocreq_ies[i]);
 -		}
 +		memset(&wrqu, 0, sizeof(wrqu));
 +		wrqu.data.length = ifsta->assocreq_ies_len;
- 		wireless_send_event(dev, IWEVASSOCREQIE, &wrqu,
++		wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu,
 +				    ifsta->assocreq_ies);
  	}
 -	if (ifsta->assocresp_ies) {
 -		if (ifsta->assocreq_ies)
 -			len += sprintf(buf + len, " ");
 -		len += sprintf(buf + len, "RespIEs=");
 -		for (i = 0; i < ifsta->assocresp_ies_len; i++) {
 -			len += sprintf(buf + len, "%02x",
 -				       ifsta->assocresp_ies[i]);
 -		}
 -	}
 -	len += sprintf(buf + len, ")");
  
 -	if (len > IW_CUSTOM_MAX) {
 -		len = sprintf(buf, "ASSOCRESPIE=");
 -		for (i = 0; i < ifsta->assocresp_ies_len; i++) {
 -			len += sprintf(buf + len, "%02x",
 -				       ifsta->assocresp_ies[i]);
 -		}
 +	if (ifsta->assocresp_ies) {
 +		memset(&wrqu, 0, sizeof(wrqu));
 +		wrqu.data.length = ifsta->assocresp_ies_len;
- 		wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu,
++		wireless_send_event(sdata->dev, IWEVASSOCRESPIE, &wrqu,
 +				    ifsta->assocresp_ies);
  	}
 -
 -	memset(&wrqu, 0, sizeof(wrqu));
 -	wrqu.data.length = len;
 -	wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
 -
 -	kfree(buf);
  }
  
  
@@@ -2838,13 -2876,13 +2846,13 @@@ static void ieee80211_rx_bss_info(struc
  		       jiffies);
  #endif /* CONFIG_MAC80211_IBSS_DEBUG */
  		if (beacon_timestamp > rx_timestamp) {
 -#ifndef CONFIG_MAC80211_IBSS_DEBUG
 +#ifdef CONFIG_MAC80211_IBSS_DEBUG
  			printk(KERN_DEBUG "%s: beacon TSF higher than "
  			       "local TSF - IBSS merge with BSSID %s\n",
- 			       dev->name, print_mac(mac, mgmt->bssid));
+ 			       sdata->dev->name, print_mac(mac, mgmt->bssid));
  #endif
- 			ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss);
- 			ieee80211_ibss_add_sta(dev, NULL,
+ 			ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss);
+ 			ieee80211_ibss_add_sta(sdata, NULL,
  					       mgmt->bssid, mgmt->sa,
  					       BIT(rx_status->rate_idx));
  		}

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/8021q/vlan.c between commit 82524746c27fa418c250a56dd7606b9d3fc79826
("rcu: split list.h and move rcu-protected lists into rculist.h") from
Linus' tree and commit 61362766d769c934a9d12d5516323c544c161908 ("vlan:
remove unnecessary include statements") from the net tree.

I just added in the new rculist.h include to the net tree version.
-- 
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: 622 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
Documentation/powerpc/booting-without-of.txt between commit
d0fc2eaaf4c56a95f5ed29b6bfb609e19714fc16 ("powerpc/fsl: Refactor device
bindings") from the powerpc tree and commit
a5edeccb1a8432ae5d9fb9bccea5a4b64c565017 ("net: OpenFirmware GPIO based
MDIO bitbang driver") from the net tree.

I just added the new section from the latter commit in as section 'g'.
It may not even belong in this file any more, but I don't know.  Kumar?

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

[Patrick McHardy]

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

Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> net/netfilter/nf_conntrack_proto_tcp.c between commit
> 6b69fe0c73c0f5a8dacf8f889db3cc9adee53649 ("netfilter: nf_conntrack_tcp:
> fix endless loop") from the net-current tree and commit
> 51091764f26ec36c02e35166f083193a30f426fc ("netfilter: nf_conntrack: add
> nf_ct_kill()") from the net tree.
> 
> Not a simple fixup.  I did what I thought was right, please check.
> 
> The conflict was in tcp_packet() and looked like this:
> 
> 		if (((ct->proto.tcp.seen[dir].flags
> 		      | ct->proto.tcp.seen[!dir].flags)
> 		     & IP_CT_TCP_FLAG_CLOSE_INIT)
> 		    || (ct->proto.tcp.last_dir == dir
> 		        && ct->proto.tcp.last_index == TCP_RST_SET)) {
> 			/* Attempt to reopen a closed/aborted connection.
> 			 * Delete this connection and look up again. */
> 			write_unlock_bh(&tcp_lock);
> <<<<<<< HEAD:net/netfilter/nf_conntrack_proto_tcp.c
> 			/* Only repeat if we can actually remove the timer.
> 			 * Destruction may already be in progress in process
> 			 * context and we must give it a chance to terminate.
> 			 */
> 			if (del_timer(&ct->timeout)) {
> 				ct->timeout.function((unsigned long)ct);
> 				return -NF_REPEAT;
> 			}
> 			return -NF_DROP;
> =======
> 			nf_ct_kill(ct);
> 			return -NF_REPEAT;
>>>>>>>> net/master:net/netfilter/nf_conntrack_proto_tcp.c
> 		}
> 		/* Fall through */
> 	case TCP_CONNTRACK_IGNORE:
> 
> I used the HEAD version.  You may need to return a value from nf_ct_kill()
> indicating if the timer was deleted to fix this properly.

Indeed. The attached against net-next does this.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 3009 bytes --]

commit 6b672c85d01e46b3fddf6c4285330df98a90d462
Author: Patrick McHardy <kaber@trash.net>
Date:   Thu Jul 10 14:10:04 2008 +0200

    netfilter: nf_conntrack_tcp: fix endless loop
    
    When a conntrack entry is destroyed in process context and destruction
    is interrupted by packet processing and the packet is an attempt to
    reopen a closed connection, TCP conntrack tries to kill the old entry
    itself and returns NF_REPEAT to pass the packet through the hook
    again. This may lead to an endless loop: TCP conntrack repeatedly
    finds the old entry, but can not kill it itself since destruction
    is already in progress, but destruction in process context can not
    complete since TCP conntrack is keeping the CPU busy.
    
    Drop the packet in TCP conntrack if we can't kill the connection
    ourselves to avoid this.
    
    Reported by: hemao77@gmail.com [ Kernel bugzilla #11058 ]
    Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d5d76ec..4f367a0 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -223,23 +223,23 @@ static inline void nf_ct_refresh(struct nf_conn *ct,
 	__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0);
 }
 
-extern void __nf_ct_kill_acct(struct nf_conn *ct,
-				enum ip_conntrack_info ctinfo,
-				const struct sk_buff *skb,
-				int do_acct);
+extern int __nf_ct_kill_acct(struct nf_conn *ct,
+			     enum ip_conntrack_info ctinfo,
+			     const struct sk_buff *skb,
+			     int do_acct);
 
 /* kill conntrack and do accounting */
-static inline void nf_ct_kill_acct(struct nf_conn *ct,
-				enum ip_conntrack_info ctinfo,
-				const struct sk_buff *skb)
+static inline int nf_ct_kill_acct(struct nf_conn *ct,
+				  enum ip_conntrack_info ctinfo,
+				  const struct sk_buff *skb)
 {
-	__nf_ct_kill_acct(ct, ctinfo, skb, 1);
+	return __nf_ct_kill_acct(ct, ctinfo, skb, 1);
 }
 
 /* kill conntrack without accounting */
-static inline void nf_ct_kill(struct nf_conn *ct)
+static inline int nf_ct_kill(struct nf_conn *ct)
 {
-	__nf_ct_kill_acct(ct, 0, NULL, 0);
+	return __nf_ct_kill_acct(ct, 0, NULL, 0);
 }
 
 /* These are for NAT.  Icky. */
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 740acd6..47f2516 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -844,8 +844,13 @@ static int tcp_packet(struct nf_conn *ct,
 			/* Attempt to reopen a closed/aborted connection.
 			 * Delete this connection and look up again. */
 			write_unlock_bh(&tcp_lock);
-			nf_ct_kill(ct);
-			return -NF_REPEAT;
+			/* Only repeat if we can actually remove the timer.
+			 * Destruction may already be in progress in process
+			 * context and we must give it a chance to terminate.
+			 */
+			if (nf_ct_kill(ct))
+				return -NF_REPEAT;
+			return -NF_DROP;
 		}
 		/* Fall through */
 	case TCP_CONNTRACK_IGNORE:

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/netfilter/nf_conntrack_proto_tcp.c between commit
6b69fe0c73c0f5a8dacf8f889db3cc9adee53649 ("netfilter: nf_conntrack_tcp:
fix endless loop") from the net-current tree and commit
51091764f26ec36c02e35166f083193a30f426fc ("netfilter: nf_conntrack: add
nf_ct_kill()") from the net tree.

Not a simple fixup.  I did what I thought was right, please check.

The conflict was in tcp_packet() and looked like this:

		if (((ct->proto.tcp.seen[dir].flags
		      | ct->proto.tcp.seen[!dir].flags)
		     & IP_CT_TCP_FLAG_CLOSE_INIT)
		    || (ct->proto.tcp.last_dir == dir
		        && ct->proto.tcp.last_index == TCP_RST_SET)) {
			/* Attempt to reopen a closed/aborted connection.
			 * Delete this connection and look up again. */
			write_unlock_bh(&tcp_lock);
<<<<<<< HEAD:net/netfilter/nf_conntrack_proto_tcp.c
			/* Only repeat if we can actually remove the timer.
			 * Destruction may already be in progress in process
			 * context and we must give it a chance to terminate.
			 */
			if (del_timer(&ct->timeout)) {
				ct->timeout.function((unsigned long)ct);
				return -NF_REPEAT;
			}
			return -NF_DROP;
=======
			nf_ct_kill(ct);
			return -NF_REPEAT;
>>>>>>> net/master:net/netfilter/nf_conntrack_proto_tcp.c
		}
		/* Fall through */
	case TCP_CONNTRACK_IGNORE:

I used the HEAD version.  You may need to return a value from nf_ct_kill()
indicating if the timer was deleted to fix this properly.

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

[Rafael J. Wysocki]

On Tuesday, 8 of July 2008, Tobias Diedrich wrote:
> Stephen Rothwell wrote:
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/pci/pci-acpi.c between commit
> > eb9d0fe40e313c0a74115ef456a2e43a6c8da72f ("PCI ACPI: Rework PCI handling
> > of wake-up") from the pci tree and commit
> > f5ccbcfacaae57e3312e623432a79d5f1f079cf5 ("Fix forcedeth
> > hibernate/wake-on-lan problems") from the net tree.
> > 
> > The former removed the hook that the latter is trying to use.  I have
> > used the pci version of this file for now.  There needs to be a better
> > solution and since this net commit only updates pci code, maybe the
> > solution lies there.
> 
> Assuming it's part of Rafaels "PCI wake-up" patchset, then using
> that one should be right I think. :)

Yes, the net commit should be reverted.  Please find a revert patch below,
details in the changelog.

Thanks,
Rafael

---
PCI ACPI: Remove acpi_platform_enable_wakeup

This patch removes "Fix forcedeth hibernate/wake-on-lan problems",
commit f5ccbcfacaae57e3312e623432a79d5f1f079cf5 in linux-next,
which is incorrect, because it directly manipulates the
wakeup.state.enabled flags of ACPI devices while these flags are
supposed to be used by the user space to control wake-up.  Moreover,
it affects not only the device it is supposed to fix (forcedeth), but
also every PCI device that happens to call
device_init_wakeup(dev, 1).

There are patches in the PCI tree that should fix the issue handled by this
commit.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 drivers/pci/pci-acpi.c |   20 --------------------
 1 file changed, 20 deletions(-)

Index: linux-next/drivers/pci/pci-acpi.c
===================================================================
--- linux-next.orig/drivers/pci/pci-acpi.c
+++ linux-next/drivers/pci/pci-acpi.c
@@ -259,25 +259,6 @@ static pci_power_t acpi_pci_choose_state
 	}
 	return PCI_POWER_ERROR;
 }
-
-static int acpi_platform_enable_wakeup(struct device *dev, int is_on)
-{
-	struct acpi_device	*adev;
-	int			status;
-
-	if (!device_can_wakeup(dev))
-		return -EINVAL;
-
-	if (is_on && !device_may_wakeup(dev))
-		return -EINVAL;
-
-	status = acpi_bus_get_device(DEVICE_ACPI_HANDLE(dev), &adev);
-	if (status < 0)
-		return status;
-
-	adev->wakeup.state.enabled = !!is_on;
-	return 0;
-}
 #endif
 
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
@@ -362,7 +343,6 @@ static int __init acpi_pci_init(void)
 		return 0;
 #ifdef	CONFIG_ACPI_SLEEP
 	platform_pci_choose_state = acpi_pci_choose_state;
-	platform_enable_wakeup = acpi_platform_enable_wakeup;
 #endif
 	platform_pci_set_power_state = acpi_pci_set_power_state;
 	return 0;

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

[Stephen Rothwell]

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

Hi David,

On Mon, 07 Jul 2008 22:44:24 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au> Tue, 8 Jul 2008 14:10:04 +1000
> 
> > I thought we didn't do defconfig updates for things like this as just
> > running "make oldconfig" should have the same effect ...
> 
> These defconfig changes have been removed from the net-next-2.6
> tree.

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

[Tobias Diedrich]

Stephen Rothwell wrote:
> Today's linux-next merge of the net tree got a conflict in
> drivers/pci/pci-acpi.c between commit
> eb9d0fe40e313c0a74115ef456a2e43a6c8da72f ("PCI ACPI: Rework PCI handling
> of wake-up") from the pci tree and commit
> f5ccbcfacaae57e3312e623432a79d5f1f079cf5 ("Fix forcedeth
> hibernate/wake-on-lan problems") from the net tree.
> 
> The former removed the hook that the latter is trying to use.  I have
> used the pci version of this file for now.  There needs to be a better
> solution and since this net commit only updates pci code, maybe the
> solution lies there.

Assuming it's part of Rafaels "PCI wake-up" patchset, then using
that one should be right I think. :)

-- 
Tobias						PGP: http://9ac7e0bc.uguu.de
このメールは十割再利用されたビットで作られています。

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jul 2008 14:10:04 +1000

> I thought we didn't do defconfig updates for things like this as just
> running "make oldconfig" should have the same effect ...

These defconfig changes have been removed from the net-next-2.6
tree.

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jul 2008 14:10:04 +1000

> Today's linux-next merge of the net tree got a conflict in
> arch/x86/configs/x86_64_defconfig between commits
> 5cb04df8d3f03e37a19f2502591a84156be71772 ("x86: defconfig updates") and
> 622e3f28e50fe30cc199c735440cd7c75e0033b0 ("x86: 64-bit defconfig remake")
> from the x86 tree and commit e84e1dcea0ead6cea0fc55b949a7f018727e93c3
> ("netdev: remove unused S2IO_NAPI") and
> 768cea593522d816b374149f3bf35e7c246fc8d0 ("amd8111e: delete non NAPI code
> from the driver") from the net tree.
> 
> I thought we didn't do defconfig updates for things like this as just
> running "make oldconfig" should have the same effect ... I used the
> version from the x86 tree.

That defconfig bit is a mistake, I'll try to undo that.

Thanks!

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/pci/pci-acpi.c between commit
eb9d0fe40e313c0a74115ef456a2e43a6c8da72f ("PCI ACPI: Rework PCI handling
of wake-up") from the pci tree and commit
f5ccbcfacaae57e3312e623432a79d5f1f079cf5 ("Fix forcedeth
hibernate/wake-on-lan problems") from the net tree.

The former removed the hook that the latter is trying to use.  I have
used the pci version of this file for now.  There needs to be a better
solution and since this net commit only updates pci code, maybe the
solution lies there.

-- 
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: 776 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in
arch/x86/configs/x86_64_defconfig between commits
5cb04df8d3f03e37a19f2502591a84156be71772 ("x86: defconfig updates") and
622e3f28e50fe30cc199c735440cd7c75e0033b0 ("x86: 64-bit defconfig remake")
from the x86 tree and commit e84e1dcea0ead6cea0fc55b949a7f018727e93c3
("netdev: remove unused S2IO_NAPI") and
768cea593522d816b374149f3bf35e7c246fc8d0 ("amd8111e: delete non NAPI code
from the driver") from the net tree.

I thought we didn't do defconfig updates for things like this as just
running "make oldconfig" should have the same effect ... I used the
version from the x86 tree.

-- 
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, 3 Jul 2008 14:08:01 +1000

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-4965.c between commit
> ec04fd60fd74a9db9c63fe11d519be3642cabfdd ("iwlwifi: fix incorrect 5GHz
> rates reported in monitor mode") from the wrieless-current tree and
> commit radiotap ("iwlwifi: remove 4965 from iwl4965_rate_info") from the
> net tree.
> 
> I did the obvious fixup (iwl4965_rates -> iwl_rates).

Ok.  As John Linville posted, this was expected :)

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jul 2008 13:56:41 +1000

> Today's linux-next merge of the net tree got a conflict in  between
> commit 16d752397301b95abaa95cbaf9e785d221872311 ("thermal: Create
> CONFIG_THERMAL_HWMON=n") from Linus' tree and commit
> ecbed6a41900126e7b9509e12a8d0cc22176e3eb ("sctp: Mark GET_PEER|
> LOCAL_ADDR_OLD deprecated") from the net tree.
> 
> I just took both new entries.

Yep, that's the thing to do here.

Thanks!

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

[Stephen Rothwell]

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

Hi Dave,

On Thu, 3 Jul 2008 13:56:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi David,
> 
> Today's linux-next merge of the net tree got a conflict in  between
                                                             ^
Documentation/feature-removal-schedule.txt

-- 
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: 520 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ec04fd60fd74a9db9c63fe11d519be3642cabfdd ("iwlwifi: fix incorrect 5GHz
rates reported in monitor mode") from the wrieless-current tree and
commit radiotap ("iwlwifi: remove 4965 from iwl4965_rate_info") from the
net tree.

I did the obvious fixup (iwl4965_rates -> iwl_rates).

-- 
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: 458 bytes --]

Hi David,

Today's linux-next merge of the net tree got a conflict in  between
commit 16d752397301b95abaa95cbaf9e785d221872311 ("thermal: Create
CONFIG_THERMAL_HWMON=n") from Linus' tree and commit
ecbed6a41900126e7b9509e12a8d0cc22176e3eb ("sctp: Mark GET_PEER|
LOCAL_ADDR_OLD deprecated") from the net tree.

I just took both new entries.

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

[Stephen Rothwell]

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

On Tue, 1 Jul 2008 17:19:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in  between
                                                             ^
Documentation/powerpc/booting-without-of.txt

-- 
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: Tue, 1 Jul 2008 17:19:40 +1000

> Today's linux-next merge of the net tree got a conflict
...

Thanks for the heads up on these two conflicts with the
powerpc tree.

The best seems to let you keep using your resolving, so
that's what I'll let you do :)

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in  between
commits aee1dc73b519227084d77b0b2fc972b68b4153d8 ("[POWERPC] Update
booting-without-of for Freescale PCIe MSI") and
83ff9dcf375c418ca3b98eb950711525ca1269e2 ("powerpc/sysdev: implement FSL
GTM support") from the powerpc tree and commit
a5edeccb1a8432ae5d9fb9bccea5a4b64c565017 ("net: OpenFirmware GPIO based
MDIO bitbang driver") from the net tree.

They are just overlapping additions. I renumbered(?) the "MDIO on GPIOs"
section to 'v'.

-- 
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: 596 bytes --]

Hi Dave,

Today's linux-next merge of the net tree got a trivial conflict in
drivers/net/fs_enet/fs_enet-main.c between commit
55b6c8e99d582cc66947b465d0ff3147a0219808 ("drivers/net: Use linux/of_
{device,platform}.h instead of asm") from the powerpc tree and commit
d8b35fac8c7e1b44d873c1afcc5f88bc5ef4b361 ("fs_enet: MDIO on GPIO
support") from the net tree.

I fixed it up and can carry the fixup.
(The powerpc commit just changed asm/of_platform.h to linux/of_platform.h)

-- 
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: 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 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 :-)

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

[Stephen Rothwell]

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

On Wed, 18 Jun 2008 22:01:01 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 19 Jun 2008 13:04:56 +1000
> 
> > I couldn't readily see what to do with it, so I took the version in the
> > net tree.  I assume that this will be sorted out next time that the
> > wireless (or net) tree pulls in Linus' tree.
> 
> Thanks Stephen.  I anticipated this and I will work out a proper
> merge resolution later tonight after I finish something else
> I'm currently working on.

No rush.  It builds.  If it doesn't work, its your problem :-)

-- 
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, 19 Jun 2008 13:04:56 +1000

> Today's linux-next merge of the net tree got a conflict in
> net/mac80211/tx.c between commit 3a5be7d4b079f3a9ce1e8ce4a93ba15ae6d00111
> ("Revert "mac80211: Use skb_header_cloned() on TX path."") from the
> Linus' tree and commit 23c0752a25d73ccc4547700e8a57d5ae2f2edf56
> ("mac80211: clean up skb reallocation code") from the net (wireless) tree.
> 
> I couldn't readily see what to do with it, so I took the version in the
> net tree.  I assume that this will be sorted out next time that the
> wireless (or net) tree pulls in Linus' tree.

Thanks Stephen.  I anticipated this and I will work out a proper
merge resolution later tonight after I finish something else
I'm currently working on.

linux-next: manual merge of the net tree

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/mac80211/tx.c between commit 3a5be7d4b079f3a9ce1e8ce4a93ba15ae6d00111
("Revert "mac80211: Use skb_header_cloned() on TX path."") from the
Linus' tree and commit 23c0752a25d73ccc4547700e8a57d5ae2f2edf56
("mac80211: clean up skb reallocation code") from the net (wireless) tree.

I couldn't readily see what to do with it, so I took the version in the
net tree.  I assume that this will be sorted out next time that the
wireless (or net) tree pulls in Linus' tree.

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

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