Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the net tree with Linus' tree
@ 2019-11-19 21:07 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2019-11-19 21:07 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Geert Uytterhoeven, Marek Behún

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

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  drivers/net/phy/mdio_bus.c

between commit:

  fd8f64df9520 ("mdio_bus: Fix init if CONFIG_RESET_CONTROLLER=n")

from Linus' tree and commit:

  075e238d12c2 ("mdio_bus: fix mdio_register_device when RESET_CONTROLLER is disabled")

from the net tree.

I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2019-07-21 23:41 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2019-07-21 23:41 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Masahiro Yamada, Jeremy Sowden

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

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  include/Kbuild

between commit:

  67bf47452ea0 ("kbuild: update compile-test header list for v5.3-rc1")

from Linus' tree and commit:

  408d2bbbfd46 ("kbuild: add net/netfilter/nf_tables_offload.h to header-test blacklist.")

from the net tree.

I fixed it up (I used the former version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2018-06-28 22:14 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2018-06-28 22:14 UTC (permalink / raw)
  To: David Miller, Networking, Linus Torvalds
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Ursula Braun

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

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  net/smc/af_smc.c

between commit:

  a11e1d432b51 ("Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL")

from Linus' tree and commit:

  24ac3a08e658 ("net/smc: rebuild nonblocking connect")

from the net tree.

I did the obvious syntactic fix up but, given that the commit that the
net tree commit is fixing ie being reverted, I wonder if the net tree
commit is needed (or correct?) any more.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2017-11-26 22:42 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2017-11-26 22:42 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kees Cook,
	David Howells

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  net/rxrpc/call_object.c

between commit:

  e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")

from Linus' tree and commit:

  9faaff593404 ("rxrpc: Provide a different lockdep key for call->user_mutex for kernel calls")

from the net tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/rxrpc/call_object.c
index 994dc2df57e4,7ee3d6ce5aa2..000000000000
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@@ -114,7 -118,16 +118,15 @@@ struct rxrpc_call *rxrpc_alloc_call(str
  		goto nomem_2;
  
  	mutex_init(&call->user_mutex);
+ 
+ 	/* Prevent lockdep reporting a deadlock false positive between the afs
+ 	 * filesystem and sys_sendmsg() via the mmap sem.
+ 	 */
+ 	if (rx->sk.sk_kern_sock)
+ 		lockdep_set_class(&call->user_mutex,
+ 				  &rxrpc_call_user_mutex_lock_class_key);
+ 
 -	setup_timer(&call->timer, rxrpc_call_timer_expired,
 -		    (unsigned long)call);
 +	timer_setup(&call->timer, rxrpc_call_timer_expired, 0);
  	INIT_WORK(&call->processor, &rxrpc_process_call);
  	INIT_LIST_HEAD(&call->link);
  	INIT_LIST_HEAD(&call->chan_wait_link);

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2016-10-15 21:13 Stephen Rothwell
@ 2016-10-17 11:41 ` Mintz, Yuval
  0 siblings, 0 replies; 60+ messages in thread
From: Mintz, Yuval @ 2016-10-17 11:41 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: linux-next, linux-kernel, Amrani, Ram, Doug Ledford

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

>   drivers/net/ethernet/qlogic/Kconfig

> between commit:

>   2e0cbc4dd077 ("qedr: Add RoCE driver framework")

> from Linus' tree and commit:

>   0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR")

> from the net tree.

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  

My bad; I've sent the fix to 'net' and was not aware that the
qedr submission was already accepted in linux-rdma.

> I also added this merge fix patch:

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sun, 16 Oct 2016 08:09:42 +1100
> Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move

> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/infiniband/hw/qedr/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

> diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig
> index 7c06d85568d4..6c9f3923e838 100644
> --- a/drivers/infiniband/hw/qedr/Kconfig
> +++ b/drivers/infiniband/hw/qedr/Kconfig
> @@ -2,6 +2,7 @@ config INFINIBAND_QEDR
>          tristate "QLogic RoCE driver"
>          depends on 64BIT && QEDE
>          select QED_LL2
> +       select QED_RDMA
>          ---help---
>            This driver provides low-level InfiniBand over Ethernet
>            support for QLogic QED host channel adapters (HCAs).
> -- 
> 2.8.1

Looks good; Thanks.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2016-10-15 21:13 Stephen Rothwell
  2016-10-17 11:41 ` Mintz, Yuval
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2016-10-15 21:13 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: linux-next, linux-kernel, Ram Amrani, Doug Ledford, Yuval Mintz

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  drivers/net/ethernet/qlogic/Kconfig

between commit:

  2e0cbc4dd077 ("qedr: Add RoCE driver framework")

from Linus' tree and commit:

  0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR")

from the net tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

I also added this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 16 Oct 2016 08:09:42 +1100
Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/hw/qedr/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig
index 7c06d85568d4..6c9f3923e838 100644
--- a/drivers/infiniband/hw/qedr/Kconfig
+++ b/drivers/infiniband/hw/qedr/Kconfig
@@ -2,6 +2,7 @@ config INFINIBAND_QEDR
 	tristate "QLogic RoCE driver"
 	depends on 64BIT && QEDE
 	select QED_LL2
+	select QED_RDMA
 	---help---
 	  This driver provides low-level InfiniBand over Ethernet
 	  support for QLogic QED host channel adapters (HCAs).
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/qlogic/Kconfig
index 1e8339a67f6e,77567727528a..000000000000
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@@ -107,4 -107,19 +107,7 @@@ config QED
  	---help---
  	  This enables the support for ...
  
+ config QED_RDMA
+ 	bool
+ 
 -config INFINIBAND_QEDR
 -	tristate "QLogic qede RoCE sources [debug]"
 -	depends on QEDE && 64BIT
 -	select QED_LL2
 -	select QED_RDMA
 -	default n
 -	---help---
 -	  This provides a temporary node that allows the compilation
 -	  and logical testing of the InfiniBand over Ethernet support
 -	  for QLogic QED. This would be replaced by the 'real' option
 -	  once the QEDR driver is added [+relocated].
 -
  endif # NET_VENDOR_QLOGIC

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2011-09-22  5:16 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2011-09-22  5:16 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Kasper Pedersen, Matt Carlson

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ethernet/broadcom/tg3.c between commit 5c1e688388f6 ("tg3:
fix VLAN tagging regression") from Linus' tree and commit 93a700a9d20b
("tg3: Code movement") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/tg3.c
index 4a1374d,1485013..0000000
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@@ -6234,15 -6734,17 +6734,15 @@@ static netdev_tx_t tg3_start_xmit(struc
  		}
  	}
  
+ 	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
+ 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)
+ 		base_flags |= TXD_FLAG_JMB_PKT;
+ 
 -#ifdef BCM_KERNEL_SUPPORTS_8021Q
  	if (vlan_tx_tag_present(skb)) {
  		base_flags |= TXD_FLAG_VLAN;
  		vlan = vlan_tx_tag_get(skb);
  	}
 -#endif
  
- 	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
- 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)
- 		base_flags |= TXD_FLAG_JMB_PKT;
- 
  	len = skb_headlen(skb);
  
  	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2011-09-19 15:54   ` Joe Perches
@ 2011-09-19 16:04     ` Dmitry Kravkov
  0 siblings, 0 replies; 60+ messages in thread
From: Dmitry Kravkov @ 2011-09-19 16:04 UTC (permalink / raw)
  To: Joe Perches
  Cc: Stephen Rothwell, David Miller, netdev, linux-next, linux-kernel,
	Yaniv Rosner, Eilon Greenstein

On Mon, 2011-09-19 at 08:54 -0700, Joe Perches wrote:
> On Mon, 2011-09-19 at 09:55 +0300, Dmitry Kravkov wrote:
> > On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:
> > > Today's linux-next merge of the net tree got a conflict in
> > > drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
> > > c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
> > > 94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
> > > net tree.
> []
> > Can you use this one instead?
> > Contains spell fixes and some formatting.
> 
> Multiple line format strings lines are bad style and error prone.
> You introduce broken spacing after string coalescing.
> 

Contains spell fixes and some formatting

v2: fix broken spacing

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
---
Joe, Thanks for noticing that
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c |   30 ++++++++--------------
 1 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 8e9b87b..5a9444a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -850,32 +850,24 @@ static int bnx2x_ets_e3b0_get_total_bw(
 
 	*total_bw = 0 ;
 	/* Calculate total BW requested */
-	for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
-		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
+	for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++)
+		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state)
+			*total_bw +=
+				ets_params->cos[cos_idx].params.bw_params.bw;
 
-			if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
-				DP(NETIF_MSG_LINK,
-				   "bnx2x_ets_E3B0_config BW was set to 0\n");
-			return -EINVAL;
-		}
-		*total_bw +=
-		    ets_params->cos[cos_idx].params.bw_params.bw;
-	    }
-	}
-
-	/*Check taotl BW is valid */
+	/* Check total BW is valid */
 	if ((100 != *total_bw) || (0 == *total_bw)) {
 		if (0 == *total_bw) {
 			DP(NETIF_MSG_LINK,
-			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
+			  "bnx2x_ets_E3B0_config total BW shouldn't be 0\n");
 			return -EINVAL;
 		}
 		DP(NETIF_MSG_LINK,
-		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");
-		/**
-		*   We can handle a case whre the BW isn't 100 this can happen
-		*   if the TC are joined.
-		*/
+		   "bnx2x_ets_E3B0_config total BW should be 100\n");
+		/*
+		 * We can handle a case where the BW isn't 100 this can happen
+		 * if the TC are joined.
+		 */
 	}
 	return 0;
 }
-- 
1.7.2.2

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2011-09-19  6:55 ` Dmitry Kravkov
@ 2011-09-19 15:54   ` Joe Perches
  2011-09-19 16:04     ` Dmitry Kravkov
  0 siblings, 1 reply; 60+ messages in thread
From: Joe Perches @ 2011-09-19 15:54 UTC (permalink / raw)
  To: dmitry
  Cc: Stephen Rothwell, David Miller, netdev, linux-next, linux-kernel,
	Yaniv Rosner, Eilon Greenstein

On Mon, 2011-09-19 at 09:55 +0300, Dmitry Kravkov wrote:
> On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
> > c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
> > 94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
> > net tree.
[]
> Can you use this one instead?
> Contains spell fixes and some formatting.

Hey Dmitry.

The toatl/total spelling fix is good,
but I think this isn't better and is
in fact worse.

> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> index 8e9b87b..733ace0 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
> @@ -850,32 +850,24 @@ static int bnx2x_ets_e3b0_get_total_bw(
[]
> -			DP(NETIF_MSG_LINK,
> -			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
> +			DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW"
> +					   "shouldn't be 0\n");

Multiple line format strings lines are bad style and error prone.
You introduce broken spacing after string coalescing.

> -		DP(NETIF_MSG_LINK,
> -		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");
> -		/**
> -		*   We can handle a case whre the BW isn't 100 this can happen
> -		*   if the TC are joined.
> -		*/
> +		DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW should be"
> +				   "100\n");

Here too.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2011-09-19  4:51 Stephen Rothwell
@ 2011-09-19  6:55 ` Dmitry Kravkov
  2011-09-19 15:54   ` Joe Perches
  0 siblings, 1 reply; 60+ messages in thread
From: Dmitry Kravkov @ 2011-09-19  6:55 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Yaniv Rosner,
	Eilon Greenstein, Joe Perches

On Sun, 2011-09-18 at 21:51 -0700, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
> c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
> 94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
> net tree.
> 
> The former removes the code cleaned up by the latter, so I used the
> former (see below).

Can you use this one instead?
Contains spell fixes and some formatting.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c |   34 ++++++++-------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 8e9b87b..733ace0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -850,32 +850,24 @@ static int bnx2x_ets_e3b0_get_total_bw(
 
 	*total_bw = 0 ;
 	/* Calculate total BW requested */
-	for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
-		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
+	for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++)
+		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state)
+			*total_bw +=
+				ets_params->cos[cos_idx].params.bw_params.bw;
 
-			if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
-				DP(NETIF_MSG_LINK,
-				   "bnx2x_ets_E3B0_config BW was set to 0\n");
-			return -EINVAL;
-		}
-		*total_bw +=
-		    ets_params->cos[cos_idx].params.bw_params.bw;
-	    }
-	}
-
-	/*Check taotl BW is valid */
+	/* Check total BW is valid */
 	if ((100 != *total_bw) || (0 == *total_bw)) {
 		if (0 == *total_bw) {
-			DP(NETIF_MSG_LINK,
-			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
+			DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW"
+					   "shouldn't be 0\n");
 			return -EINVAL;
 		}
-		DP(NETIF_MSG_LINK,
-		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");
-		/**
-		*   We can handle a case whre the BW isn't 100 this can happen
-		*   if the TC are joined.
-		*/
+		DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config total BW should be"
+				   "100\n");
+		/*
+		 * We can handle a case where the BW isn't 100 this can happen
+		 * if the TC are joined.
+		 */
 	}
 	return 0;
 }
-- 
1.7.2.2

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2011-09-19  4:51 Stephen Rothwell
  2011-09-19  6:55 ` Dmitry Kravkov
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2011-09-19  4:51 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Yaniv Rosner, Eilon Greenstein, Joe Perches

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c between commit
c482e6c06461 ("bnx2x: Fix ETS bandwidth") from Linus' tree and commit
94f05b0f60de ("bnx2x: Coalesce pr_cont uses and fix DP typos") from the
net tree.

The former removes the code cleaned up by the latter, so I used the
former (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index ba15bdc,8e9b87b..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -852,20 -852,26 +852,20 @@@ static int bnx2x_ets_e3b0_get_total_bw
  	/* Calculate total BW requested */
  	for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
  		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
 -
 -			if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
 -				DP(NETIF_MSG_LINK,
 -				   "bnx2x_ets_E3B0_config BW was set to 0\n");
 -			return -EINVAL;
 +			*total_bw +=
 +				ets_params->cos[cos_idx].params.bw_params.bw;
  		}
 -		*total_bw +=
 -		    ets_params->cos[cos_idx].params.bw_params.bw;
 -	    }
  	}
  
 -	/*Check taotl BW is valid */
 +	/* Check total BW is valid */
  	if ((100 != *total_bw) || (0 == *total_bw)) {
  		if (0 == *total_bw) {
- 			DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW"
- 					   "shouldn't be 0\n");
+ 			DP(NETIF_MSG_LINK,
+ 			   "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
  			return -EINVAL;
  		}
- 		DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW should be"
- 				   "100\n");
+ 		DP(NETIF_MSG_LINK,
+ 		   "bnx2x_ets_E3B0_config toatl BW should be 100\n");
  		/**
  		*   We can handle a case whre the BW isn't 100 this can happen
  		*   if the TC are joined.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2011-09-19  4:41 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2011-09-19  4:41 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Toshiharu Okada, Jeff Kirsher

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit 7756332f5b64 ("pch_gbe: support ML7831
IOH") from Linus' tree and the driver rearrangement patches from the net
tree.

The changes in the commit from Linus' tree don;t affect fucntionality, so
I just used 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: 490 bytes --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2011-07-18  4:41 Stephen Rothwell
@ 2011-07-18 19:33 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2011-07-18 19:33 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, iliak, padovan, luiz.von.dentz

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jul 2011 14:41:38 +1000

> Today's linux-next merge of the net tree got a conflict in
> net/bluetooth/l2cap_core.c between commit 9191e6ad897a ("Bluetooth: Fix
> regression in L2CAP connection procedure") from Linus' tree and commit
> e2fd318e3a92 ("Bluetooth: Fixes l2cap "command reject" reply according to
> spec") from the net tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks Stephen, I'll sort this out next time I do a merge between
net-2.6 and net-next-2.6.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2011-07-18  4:41 Stephen Rothwell
  2011-07-18 19:33 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2011-07-18  4:41 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Ilia Kolomisnky, Gustavo F. Padovan,
	Luiz Augusto von Dentz

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/bluetooth/l2cap_core.c between commit 9191e6ad897a ("Bluetooth: Fix
regression in L2CAP connection procedure") from Linus' tree and commit
e2fd318e3a92 ("Bluetooth: Fixes l2cap "command reject" reply according to
spec") 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

diff --cc net/bluetooth/l2cap_core.c
index 7705e26,f7f8e2c..0000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -620,11 -763,10 +763,11 @@@ static void l2cap_conn_start(struct l2c
  					struct sock *parent = bt_sk(sk)->parent;
  					rsp.result = cpu_to_le16(L2CAP_CR_PEND);
  					rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
 -					parent->sk_data_ready(parent, 0);
 +					if (parent)
 +						parent->sk_data_ready(parent, 0);
  
  				} else {
- 					sk->sk_state = BT_CONFIG;
+ 					l2cap_state_change(chan, BT_CONFIG);
  					rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
  					rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
  				}
@@@ -2324,10 -2523,14 +2524,13 @@@ static inline int l2cap_config_req(stru
  
  	sk = chan->sk;
  
- 	if (sk->sk_state != BT_CONFIG && sk->sk_state != BT_CONNECT2) {
- 		struct l2cap_cmd_rej rej;
 -	if ((bt_sk(sk)->defer_setup && chan->state != BT_CONNECT2) ||
 -		 (!bt_sk(sk)->defer_setup && chan->state != BT_CONFIG)) {
++	if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {
+ 		struct l2cap_cmd_rej_cid rej;
+ 
+ 		rej.reason = cpu_to_le16(L2CAP_REJ_INVALID_CID);
+ 		rej.scid = cpu_to_le16(chan->scid);
+ 		rej.dcid = cpu_to_le16(chan->dcid);
  
- 		rej.reason = cpu_to_le16(0x0002);
  		l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,
  				sizeof(rej), &rej);
  		goto unlock;
@@@ -4010,10 -4150,9 +4150,10 @@@ static int l2cap_security_cfm(struct hc
  					struct sock *parent = bt_sk(sk)->parent;
  					res = L2CAP_CR_PEND;
  					stat = L2CAP_CS_AUTHOR_PEND;
 -					parent->sk_data_ready(parent, 0);
 +					if (parent)
 +						parent->sk_data_ready(parent, 0);
  				} else {
- 					sk->sk_state = BT_CONFIG;
+ 					l2cap_state_change(chan, BT_CONFIG);
  					res = L2CAP_CR_SUCCESS;
  					stat = L2CAP_CS_NO_INFO;
  				}

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2011-04-08  3:45 Stephen Rothwell
@ 2011-04-08  3:49 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2011-04-08  3:49 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, lucas.demarchi, joe

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Apr 2011 13:45:51 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/smsc911x.c between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit dffc6b2432ea ("smsc911x: Use
> pr_fmt, netdev_<level>, and netif_<level>") from the net tree.
> 
> I fixedd it up (see below) anc can carry the fix as necessary.

Thanks Stephen, I'll clear this one up some time in the next week.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2011-04-08  3:45 Stephen Rothwell
  2011-04-08  3:49 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2011-04-08  3:45 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Lucas De Marchi, Joe Perches

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/smsc911x.c between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit dffc6b2432ea ("smsc911x: Use
pr_fmt, netdev_<level>, and netif_<level>") from the net tree.

I fixedd it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/smsc911x.c
index 4b42ecc,05a882e..0000000
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@@ -1669,7 -1669,7 +1669,7 @@@ static int smsc911x_eeprom_send_cmd(str
  	}
  
  	if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
- 		SMSC_TRACE(DRV, "Error occurred during eeprom operation");
 -		SMSC_TRACE(pdata, drv, "Error occured during eeprom operation");
++		SMSC_TRACE(pdata, drv, "Error occurred during eeprom operation");
  		return -EINVAL;
  	}
  

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-12-26 23:41 Stephen Rothwell
@ 2010-12-27  2:21 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2010-12-27  2:21 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, xiaosuo

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Dec 2010 10:41:44 +1100

> Today's linux-next merge of the net tree got a conflict in
> net/ipv4/fib_frontend.c between commit
> e058464990c2ef1f3ecd6b83a154913c3c06f02a ("Revert "ipv4: Allow
> configuring subnets as local addresses"") from Linus' tree and commit
> 5811662b15db018c740c57d037523683fd3e6123 ("net: use the macros defined
> for the members of flowi") from the net tree.
> 
> Just context changes (I think).  I fixed it up (see below) and can carry
> the fix as necessary.

Thanks Stephen, I'll take care of this.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-12-26 23:41 Stephen Rothwell
  2010-12-27  2:21 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-12-26 23:41 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Changli Gao

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/fib_frontend.c between commit
e058464990c2ef1f3ecd6b83a154913c3c06f02a ("Revert "ipv4: Allow
configuring subnets as local addresses"") from Linus' tree and commit
5811662b15db018c740c57d037523683fd3e6123 ("net: use the macros defined
for the members of flowi") from the net tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/fib_frontend.c
index c19c1f7,9f8bb68..0000000
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@@ -158,11 -158,8 +158,7 @@@ static void fib_flush(struct net *net
  struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref)
  {
  	struct flowi fl = {
- 		.nl_u = {
- 			.ip4_u = {
- 				.daddr = addr
- 			}
- 		},
+ 		.fl4_dst = addr,
 -		.flags = FLOWI_FLAG_MATCH_ANY_IIF
  	};
  	struct fib_result res = { 0 };
  	struct net_device *dev = NULL;

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-10-22  1:19 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-10-22  1:19 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Koki Sanagi, Frederic Weisbecker, Jesse Gross

Hi all,

Today's linux-next merge of the net tree got a conflict in net/core/dev.c
between commit cf66ba58b5cb8b1526e9dd2fb96ff8db048d4d44 ("netdev: Add
tracepoints to netdev layer") from Linus' tree and commits
05532121da0728eaedac2a0a5c3cecad3a95d765 ("net: 802.1q: make
vlan_hwaccel_do_receive() return void") and
3701e51382a026cba10c60b03efabe534fba4ca4 ("vlan: Centralize handling of
hardware acceleration") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/core/dev.c
index 154e25e,6d4218c..0000000
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -128,9 -128,8 +128,10 @@@
  #include <linux/jhash.h>
  #include <linux/random.h>
  #include <trace/events/napi.h>
 +#include <trace/events/net.h>
 +#include <trace/events/skb.h>
  #include <linux/pci.h>
+ #include <linux/inetdevice.h>
  
  #include "net-sysfs.h"
  
@@@ -2835,10 -2898,6 +2905,8 @@@ static int __netif_receive_skb(struct s
  	if (!netdev_tstamp_prequeue)
  		net_timestamp_check(skb);
  
 +	trace_netif_receive_skb(skb);
- 	if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))
- 		return NET_RX_SUCCESS;
 +
  	/* if we've gotten here through NAPI, check netpoll */
  	if (netpoll_receive_skb(skb))
  		return NET_RX_DROP;

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-07-21  3:27 ` David Miller
@ 2010-07-21  3:44   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-07-21  3:44 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, herbert

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

Hi Dave,

On Tue, 20 Jul 2010 20:27:59 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> The net-2.6 changes should be undone as net-next-2.6 has the fixes
> that allow bridge netpoll to work properly, thus in net-next-2.6 the
> net-2.6 commit is completely unnecessary.
> 
> I did this when I merged net-2.6 into net-next-2.6 about an hour ago
> :-)

Excellent, thanks.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-07-21  2:04 Stephen Rothwell
  2010-07-21  2:31 ` Herbert Xu
@ 2010-07-21  3:27 ` David Miller
  2010-07-21  3:44   ` Stephen Rothwell
  1 sibling, 1 reply; 60+ messages in thread
From: David Miller @ 2010-07-21  3:27 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, herbert

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Jul 2010 12:04:48 +1000

> Today's linux-next merge of the net tree got a conflict in
> net/bridge/br_device.c between commit
> 573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable
> netpoll support") from Linus' tree and commit
> 91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support")
> from the net tree.
> 
> The net tree commit seems to be a fuller fix, so I used that.

The net-2.6 changes should be undone as net-next-2.6 has the fixes
that allow bridge netpoll to work properly, thus in net-next-2.6 the
net-2.6 commit is completely unnecessary.

I did this when I merged net-2.6 into net-next-2.6 about an hour ago
:-)

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-07-21  2:04 Stephen Rothwell
@ 2010-07-21  2:31 ` Herbert Xu
  2010-07-21  3:27 ` David Miller
  1 sibling, 0 replies; 60+ messages in thread
From: Herbert Xu @ 2010-07-21  2:31 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel

On Wed, Jul 21, 2010 at 12:04:48PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> net/bridge/br_device.c between commit
> 573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable
> netpoll support") from Linus' tree and commit
> 91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support")
> from the net tree.
> 
> The net tree commit seems to be a fuller fix, so I used that.

Yeah, 573201f is just the temporary fix for 2.6.35.

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-07-21  2:04 Stephen Rothwell
  2010-07-21  2:31 ` Herbert Xu
  2010-07-21  3:27 ` David Miller
  0 siblings, 2 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-07-21  2:04 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Herbert Xu

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/bridge/br_device.c between commit
573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable
netpoll support") from Linus' tree and commit
91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support")
from the net tree.

The net tree commit seems to be a fuller fix, so I used 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 --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-05-17  5:28 ` David Miller
@ 2010-05-17  6:24   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-05-17  6:24 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, jengelh, chrisw

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

Hi Dave,

On Sun, 16 May 2010 22:28:03 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'll merge net-2.6 into net-next-2.6 to fix this for you, and
> in fact your merge is exactly what I will use.

Great, thanks.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-05-17  2:09 Stephen Rothwell
@ 2010-05-17  5:28 ` David Miller
  2010-05-17  6:24   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2010-05-17  5:28 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, jengelh, chrisw

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 May 2010 12:09:22 +1000

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> include/linux/if_link.h between commit
> c02db8c6290bb992442fec1407643c94cc414375 ("rtnetlink: make SR-IOV VF
> interface symmetric") from Linus' tree and commit
> 10708f37ae729baba9b67bd134c3720709d4ae62 ("net: core: add IFLA_STATS64
> support") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.

I'll merge net-2.6 into net-next-2.6 to fix this for you, and
in fact your merge is exactly what I will use.

Thanks!

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-05-17  2:09 Stephen Rothwell
  2010-05-17  5:28 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-05-17  2:09 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jan Engelhardt, Chris Wright

Hi all,

Today's linux-next merge of the net tree got a conflict in
include/linux/if_link.h between commit
c02db8c6290bb992442fec1407643c94cc414375 ("rtnetlink: make SR-IOV VF
interface symmetric") from Linus' tree and commit
10708f37ae729baba9b67bd134c3720709d4ae62 ("net: core: add IFLA_STATS64
support") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/if_link.h
index d94963b,cfd420b..0000000
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@@ -79,7 -111,11 +111,8 @@@ enum 
  	IFLA_NET_NS_PID,
  	IFLA_IFALIAS,
  	IFLA_NUM_VF,		/* Number of VFs if device is SR-IOV PF */
 -	IFLA_VF_MAC,		/* Hardware queue specific attributes */
 -	IFLA_VF_VLAN,
 -	IFLA_VF_TX_RATE,	/* TX Bandwidth Allocation */
 -	IFLA_VFINFO,
 +	IFLA_VFINFO_LIST,
+ 	IFLA_STATS64,
  	__IFLA_MAX
  };
  

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-05-12  2:26 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-05-12  2:26 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Andreas Meissner, Patrick McHardy

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/ipmr.c between commit bbd725435ddb1cac732f7a8c23c21ff67f24c60f
("IPv4: unresolved multicast route cleanup") from Linus' tree and commits
e258beb22f4d3ea3dc88586ffc9c990d0eb03380 ("ipv4: ipmr: move unres_queue
and timer to per-namespace data") and
0c12295a741d3186987f96f518cfbdaf01abb087 ("ipv4: ipmr: move mroute data
into seperate structure") from the net tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/ipmr.c
index ec19a89,f3f1c6b..0000000
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@@ -750,12 -995,10 +995,11 @@@ ipmr_cache_unresolved(struct mr_table *
  			return err;
  		}
  
- 		atomic_inc(&net->ipv4.cache_resolve_queue_len);
- 		c->next = mfc_unres_queue;
- 		mfc_unres_queue = c;
+ 		atomic_inc(&mrt->cache_resolve_queue_len);
+ 		list_add(&c->list, &mrt->mfc_unres_queue);
  
 -		mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
 +		if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
- 			mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
++			mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
  	}
  
  	/*

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-28  0:05 ` David Miller
@ 2010-04-28  0:47   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-28  0:47 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, alan, joe

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

Hi Dave,

On Tue, 27 Apr 2010 17:05:43 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> This should be resolved now that I pulled net-2.6 into net-next-2.6
> earlier today.

Excellent, thanks.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-27  1:28 Stephen Rothwell
@ 2010-04-28  0:05 ` David Miller
  2010-04-28  0:47   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2010-04-28  0:05 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, alan, joe

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Apr 2010 11:28:27 +1000

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/e100.c between commit
> 401da6aea31ef69c2fcd260382adabdcf7ce820a ("e100: Fix the TX workqueue
> race") from Linus' tree and commit
> fa05e1ad1b61b37fb64a66794c11ab478e975c56 ("drivers/net/e100.c: Use
> pr_<level> and netif_<level>") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.

This should be resolved now that I pulled net-2.6 into net-next-2.6
earlier today.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-27  1:28 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-27  1:28 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Mike Christie, James Bottomley, Eric Dumazet

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/scsi/iscsi_tcp.c between commit
d7d05548a62c87ee55b0c81933669177f885aa8d ("[SCSI] iscsi_tcp: fix
relogin/shutdown hang") from the  tree and commit
aa395145165cb06a0d0885221bbe0ce4a564391d ("net: sk_sleep() helper") from
the net tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/scsi/iscsi_tcp.c
index cdb4fd8,9eae04a..0000000
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@@ -601,9 -599,9 +601,9 @@@ static void iscsi_sw_tcp_conn_stop(stru
  	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);
  	write_unlock_bh(&tcp_sw_conn->sock->sk->sk_callback_lock);
  
- 	if (sock->sk->sk_sleep) {
 -	if (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
++	if (sk_sleep(sock->sk)) {
  		sock->sk->sk_err = EIO;
- 		wake_up_interruptible(sock->sk->sk_sleep);
+ 		wake_up_interruptible(sk_sleep(sock->sk));
  	}
  
  	iscsi_conn_stop(cls_conn, flag);

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-27  1:28 Stephen Rothwell
  2010-04-28  0:05 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-27  1:28 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Alan Cox, Joe Perches

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e100.c between commit
401da6aea31ef69c2fcd260382adabdcf7ce820a ("e100: Fix the TX workqueue
race") from Linus' tree and commit
fa05e1ad1b61b37fb64a66794c11ab478e975c56 ("drivers/net/e100.c: Use
pr_<level> and netif_<level>") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e100.c
index 7910803,3e8d000..0000000
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@@ -2264,15 -2278,10 +2279,15 @@@ static void e100_tx_timeout_task(struc
  	struct nic *nic = container_of(work, struct nic, tx_timeout_task);
  	struct net_device *netdev = nic->netdev;
  
- 	DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
- 		ioread8(&nic->csr->scb.status));
+ 	netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
+ 		     "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status));
 -	e100_down(netdev_priv(netdev));
 -	e100_up(netdev_priv(netdev));
 +
 +	rtnl_lock();
 +	if (netif_running(netdev)) {
 +		e100_down(netdev_priv(netdev));
 +		e100_up(netdev_priv(netdev));
 +	}
 +	rtnl_unlock();
  }
  
  static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-14  1:52   ` Stephen Rothwell
@ 2010-04-14  2:00     ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2010-04-14  2:00 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ken_kawasaki, jpirko

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2010 11:52:44 +1000

> Hi Dave,
> 
> On Tue, 13 Apr 2010 18:47:24 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>> Thanks a lot Stephen, I'll merge net-2.6 into net-next-2.6 to
>> fix this up for you.
> 
> Thanks.
> 
> There was another conflict in drivers/net/virtio_net.c (because there is
> a patch in both your tree and Linus' (via net-current)) that git did not
> quite resolve correctly.  The sg_init_table() in add_recvbuf_small() was
> reinserted by the automatic merge ... I removed it in my merge.

Yes I expected that, the cherrypicked fix gets changed by a subsequent
commit in net-next-2.6 that changes where the scatterlist entries are
stored in that driver.

Anyways, thanks for the heads up.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-14  1:47 ` David Miller
@ 2010-04-14  1:52   ` Stephen Rothwell
  2010-04-14  2:00     ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-14  1:52 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, ken_kawasaki, jpirko

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

Hi Dave,

On Tue, 13 Apr 2010 18:47:24 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Thanks a lot Stephen, I'll merge net-2.6 into net-next-2.6 to
> fix this up for you.

Thanks.

There was another conflict in drivers/net/virtio_net.c (because there is
a patch in both your tree and Linus' (via net-current)) that git did not
quite resolve correctly.  The sg_init_table() in add_recvbuf_small() was
reinserted by the automatic merge ... I removed it in my merge.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-14  1:45 Stephen Rothwell
@ 2010-04-14  1:47 ` David Miller
  2010-04-14  1:52   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2010-04-14  1:47 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ken_kawasaki, jpirko

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2010 11:45:56 +1000

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/pcmcia/smc91c92_cs.c between commit
> a6d37024de02e7cb2b2333e438e71355a9c32a0a ("smc91c92_cs: define
> multicast_table as unsigned char") from Linus' tree and commit
> 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
> list_head") from the net tree.
> 
> I fixed it up (see below) and can carry the fix for a while.

Thanks a lot Stephen, I'll merge net-2.6 into net-next-2.6 to
fix this up for you.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-14  1:45 Stephen Rothwell
  2010-04-14  1:47 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-14  1:45 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Ken Kawasaki, Jiri Pirko

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/pcmcia/smc91c92_cs.c between commit
a6d37024de02e7cb2b2333e438e71355a9c32a0a ("smc91c92_cs: define
multicast_table as unsigned char") from Linus' tree and commit
22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
list_head") from the net tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/pcmcia/smc91c92_cs.c
index fd9d6e3,ad22676..0000000
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@@ -1621,10 -1618,14 +1621,10 @@@ static void set_rx_mode(struct net_devi
  	rx_cfg_setting = RxStripCRC | RxEnable | RxAllMulti;
      else {
  	if (!netdev_mc_empty(dev)) {
- 	    struct dev_mc_list *mc_addr;
+ 	    struct netdev_hw_addr *ha;
  
- 	    netdev_for_each_mc_addr(mc_addr, dev) {
- 		u_int position = ether_crc(6, mc_addr->dmi_addr);
+ 	    netdev_for_each_mc_addr(ha, dev) {
+ 		u_int position = ether_crc(6, ha->addr);
 -#ifndef final_version		/* Verify multicast address. */
 -		if ((ha->addr[0] & 1) == 0)
 -		    continue;
 -#endif
  		multicast_table[position >> 29] |= 1 << ((position >> 26) & 7);
  	    }
  	}

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-09  0:41 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-09  0:41 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, chavey

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/core/ethtool.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
97f8aefbbfb5aa5c9944e5fa8149f1fdaf71c7b6 ("net: fix ethtool coding style
errors and warnings") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/core/ethtool.c
index 9d55c57,99e9f85..0000000
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@@ -18,8 -18,7 +18,8 @@@
  #include <linux/ethtool.h>
  #include <linux/netdevice.h>
  #include <linux/bitops.h>
+ #include <linux/uaccess.h>
 +#include <linux/slab.h>
- #include <asm/uaccess.h>
  
  /*
   * Some useful ethtool_ops methods that're device independent.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-07  3:20 ` Cong Wang
@ 2010-04-07  5:28   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-07  5:28 UTC (permalink / raw)
  To: Cong Wang; +Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko

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

Hi,

On Wed, 07 Apr 2010 11:20:09 +0800 Cong Wang <amwang@redhat.com> wrote:
>
> If I read the combined diff correctly, it looks fine for me.

Thanks for the confirmation.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-04-07  2:58 Stephen Rothwell
@ 2010-04-07  3:20 ` Cong Wang
  2010-04-07  5:28   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: Cong Wang @ 2010-04-07  3:20 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/bonding/bond_main.c between commit
> 9e2e61fbf8ad016d24e4af0afff13505f3dd2a2a ("bonding: fix potential
> deadlock in bond_uninit()") from Linus' tree and commit
> 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
> list_head") from the net tree.
> 
> Just context changes.  If fixed it up (see below) and can carry the fix
> for a while.

Hi, Stephen,

If I read the combined diff correctly, it looks fine for me.

Thanks for letting me know!

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-07  2:58 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-07  2:58 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Francois Romieu

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/via-velocity.c between commit
bcbe53682f65330bdd9ad7eed9575d2ff536353a ("via-velocity: Fix
FLOW_CNTL_TX_RX handling in set_mii_flow_control()") from Linus' tree and
commit 3a7f8681ffb27bcc540fb74cda15e39c9395737b ("via-velocity: remove
private #define") from the net tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/via-velocity.c
index bc278d4,078903f..0000000
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@@ -811,8 -811,8 +811,8 @@@ static void set_mii_flow_control(struc
  		break;
  
  	case FLOW_CNTL_TX_RX:
- 		MII_REG_BITS_ON(ANAR_PAUSE, MII_REG_ANAR, vptr->mac_regs);
- 		MII_REG_BITS_OFF(ANAR_ASMDIR, MII_REG_ANAR, vptr->mac_regs);
+ 		MII_REG_BITS_ON(ADVERTISE_PAUSE_CAP, MII_ADVERTISE, vptr->mac_regs);
 -		MII_REG_BITS_ON(ADVERTISE_PAUSE_ASYM, MII_ADVERTISE, vptr->mac_regs);
++		MII_REG_BITS_OFF(ADVERTISE_PAUSE_ASYM, MII_ADVERTISE, vptr->mac_regs);
  		break;
  
  	case FLOW_CNTL_DISABLE:

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-04-07  2:58 Stephen Rothwell
  2010-04-07  3:20 ` Cong Wang
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-04-07  2:58 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Amerigo Wang, Jiri Pirko

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bonding/bond_main.c between commit
9e2e61fbf8ad016d24e4af0afff13505f3dd2a2a ("bonding: fix potential
deadlock in bond_uninit()") from Linus' tree and commit
22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
list_head") from the net tree.

Just context changes.  If fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/bonding/bond_main.c
index 0075514,22682f1..0000000
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@@ -4550,9 -4476,10 +4508,7 @@@ static void bond_uninit(struct net_devi
  
  	bond_remove_proc_entry(bond);
  
- 	netif_addr_lock_bh(bond_dev);
- 	bond_mc_list_destroy(bond);
- 	netif_addr_unlock_bh(bond_dev);
 -	if (bond->wq)
 -		destroy_workqueue(bond->wq);
 -
+ 	__hw_addr_flush(&bond->mc_list);
  }
  
  /*------------------------- Module initialization ---------------------------*/

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-03-01  3:20 Stephen Rothwell
@ 2010-03-01  3:21 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2010-03-01  3:21 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, joe, hartleys

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Mar 2010 14:20:02 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/firmware/iscsi_ibft.c between commit
> 00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c:
> remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit
> 2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c:
> use %pM to show MAC address") from the net tree.
> 
> Just a trivial context change.  I fixed it up and can carry the change as
> necessary.

Thanks Stephen, I'll fix this up.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-03-01  3:20 Stephen Rothwell
  2010-03-01  3:21 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-03-01  3:20 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Joe Perches, hartleys

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

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/firmware/iscsi_ibft.c between commit
00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c:
remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit
2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c:
use %pM to show MAC address") from the net tree.

Just a trivial context change.  I fixed it up and can carry the change as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-01-11  7:59     ` David Miller
@ 2010-01-11  8:49       ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2010-01-11  8:49 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, hawk, hadi

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

Hi Dave,

On Sun, 10 Jan 2010 23:59:27 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I have no personal preference, you can leave it how it is :)

OK, that is easy for me!
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-01-11  7:56   ` Stephen Rothwell
@ 2010-01-11  7:59     ` David Miller
  2010-01-11  8:49       ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2010-01-11  7:59 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, hawk, hadi

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 18:56:45 +1100

> On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>>
>> That latter commit is specially in the net-next-2.6 tree not the
>> net-2.6 tree.
> 
> What you call "net-next-2.6", I have always called "net".  What you call
> "net-2.6", I have always called "net-current".  Would you like me to
> change the names?

I have no personal preference, you can leave it how it is :)

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-01-11  6:50 ` David Miller
@ 2010-01-11  7:56   ` Stephen Rothwell
  2010-01-11  7:59     ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-01-11  7:56 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, hawk, hadi

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

Hi Dave,

On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> That latter commit is specially in the net-next-2.6 tree not the
> net-2.6 tree.

What you call "net-next-2.6", I have always called "net".  What you call
"net-2.6", I have always called "net-current".  Would you like me to
change the names?

> I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!

Thanks.

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

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2010-01-11  2:31 Stephen Rothwell
@ 2010-01-11  6:50 ` David Miller
  2010-01-11  7:56   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2010-01-11  6:50 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, hawk, hadi

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 13:31:09 +1100

> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in include/linux/sysctl.h between commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ("net: restore ip source validation") from Linus' tree and commit 65324144b50bc7022cc9b6ca8f4a536a957019e3 ("net: RFC3069, private VLAN proxy arp support") from the net tree.

That latter commit is specially in the net-next-2.6 tree not the
net-2.6 tree.

> They both use the same number in an enum...  I fixed it up (see below) and
> can carry the fix (or some other) for a while.

I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2010-01-11  2:31 Stephen Rothwell
  2010-01-11  6:50 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2010-01-11  2:31 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jesper Dangaard Brouer, Jamal Hadi Salim

Hi all,

Today's linux-next merge of the net tree got a conflict in include/linux/sysctl.h between commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ("net: restore ip source validation") from Linus' tree and commit 65324144b50bc7022cc9b6ca8f4a536a957019e3 ("net: RFC3069, private VLAN proxy arp support") from the net tree.

They both use the same number in an enum...  I fixed it up (see below) and
can carry the fix (or some other) for a while.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/sysctl.h
index bd27fbc,24ff7e3..0000000
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -482,7 -482,7 +482,8 @@@ enu
  	NET_IPV4_CONF_ARP_ACCEPT=21,
  	NET_IPV4_CONF_ARP_NOTIFY=22,
  	NET_IPV4_CONF_ACCEPT_LOCAL=23,
 -	NET_IPV4_CONF_PROXY_ARP_PVLAN=24,
 +	NET_IPV4_CONF_SRC_VMARK=24,
++	NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
  	__NET_IPV4_CONF_MAX
  };
  

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-09-02  7:33 ` David Miller
@ 2009-09-02  8:52   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2009-09-02  8:52 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, linux-kernel, shemminger, roel.kluin

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

Hi Dave,

On Wed, 02 Sep 2009 00:33:39 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I just merged net-2.6 into net-next-2.6 to clear this up for you.

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-09-02  3:37 Stephen Rothwell
@ 2009-09-02  7:33 ` David Miller
  2009-09-02  8:52   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2009-09-02  7:33 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, linux-kernel, shemminger, roel.kluin

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 2 Sep 2009 13:37:58 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/yellowfin.c between commit
> e7a5965a81a29a13cd4994fa23a6a7a1488bcdb6 ("yellowfin: Fix buffer underrun
> after dev_alloc_skb() failure") from Linus' tree and commit
> 61357325f377889a1daffa14962d705dc814dd0e ("netdev: convert bulk of
> drivers to netdev_tx_t") from the net tree.
> 
> Just context changes.  I fixed it up (see below) and will carry the fix
> for a while.

I just merged net-2.6 into net-next-2.6 to clear this up for you.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-09-02  3:37 Stephen Rothwell
  2009-09-02  7:33 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2009-09-02  3:37 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, linux-kernel, Stephen Hemminger, Roel Kluin

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/yellowfin.c between commit
e7a5965a81a29a13cd4994fa23a6a7a1488bcdb6 ("yellowfin: Fix buffer underrun
after dev_alloc_skb() failure") from Linus' tree and commit
61357325f377889a1daffa14962d705dc814dd0e ("netdev: convert bulk of
drivers to netdev_tx_t") from the net tree.

Just context changes.  I fixed it up (see below) and will carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/yellowfin.c
index c2fd618,9509477..0000000
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@@ -346,8 -346,9 +346,9 @@@ static int netdev_ioctl(struct net_devi
  static int yellowfin_open(struct net_device *dev);
  static void yellowfin_timer(unsigned long data);
  static void yellowfin_tx_timeout(struct net_device *dev);
 -static void yellowfin_init_ring(struct net_device *dev);
 +static int yellowfin_init_ring(struct net_device *dev);
- static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
+ 					struct net_device *dev);
  static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance);
  static int yellowfin_rx(struct net_device *dev);
  static void yellowfin_error(struct net_device *dev, int intr_status);
@@@ -813,10 -806,11 +814,11 @@@ static int yellowfin_init_ring(struct n
  }
  #endif
  	yp->tx_tail_desc = &yp->tx_status[0];
 -	return;
 +	return 0;
  }
  
- static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ static netdev_tx_t yellowfin_start_xmit(struct sk_buff *skb,
+ 					struct net_device *dev)
  {
  	struct yellowfin_private *yp = netdev_priv(dev);
  	unsigned entry;

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-08-07  1:58 Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2009-08-07  1:58 UTC (permalink / raw)
  To: David Miller
  Cc: linux-next, linux-kernel, Arnd Bergmann, Jan Engelhardt, Michal Simek

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

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
arch/microblaze/include/asm/socket.h between commit
81d8279ea31a3fc6d4ffacd87119a04c561ca62e ("microblaze: fall back on
generic header files for the ABI") from Linus' tree and commits
49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
implement a SO_DOMAIN getsockoption") from the net tree.

The former commit supercedes the latter ones, so I used that 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 --]

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-06-03  2:20 Stephen Rothwell
@ 2009-06-03 10:33 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2009-06-03 10:33 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, linux-kernel, eswierk, aabdulla

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Jun 2009 12:20:48 +1000

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/forcedeth.c between commit
> 5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 ("forcedeth: add phy_power_down
> parameter, leave phy powered up by default (v2)") from Linus' tree and
> commit 88d7d8b00cdc3117150faab4c4ace6d464b71c22 ("forcedeth: add clock
> gating feature <resend>") from the net tree.
> 
> Just context changing.  I fixed it up (see below) and can carry the fix
> for a while.

This will be fixed with a push I'll do in a few moments.

Thanks Stephen!

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-06-03  2:20 Stephen Rothwell
  2009-06-03 10:33 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2009-06-03  2:20 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, linux-kernel, Ed Swierk, Ayaz Abdulla

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/forcedeth.c between commit
5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 ("forcedeth: add phy_power_down
parameter, leave phy powered up by default (v2)") from Linus' tree and
commit 88d7d8b00cdc3117150faab4c4ace6d464b71c22 ("forcedeth: add clock
gating feature <resend>") from the net tree.

Just context changing.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/forcedeth.c
index 9f6a68f,d0b1d9f..0000000
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@@ -5522,7 -5534,8 +5543,8 @@@ static int nv_close(struct net_device *
  
  	nv_drain_rxtx(dev);
  
 -	if (np->wolenabled) {
 +	if (np->wolenabled || !phy_power_down) {
+ 		nv_txrx_gate(dev, false);
  		writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
  		nv_start_rx(dev);
  	} else {

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-05-19  4:09 ` David Miller
@ 2009-05-19  4:43   ` Stephen Rothwell
  0 siblings, 0 replies; 60+ messages in thread
From: Stephen Rothwell @ 2009-05-19  4:43 UTC (permalink / raw)
  To: David Miller
  Cc: linux-next, linux-kernel, vasu.dev, jeykholt, robert.w.love,
	James.Bottomley, christopher.leech

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

Hi Dave,

On Mon, 18 May 2009 21:09:13 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'll pull net-2.6 into net-next-2.6 and push the result to kernel.org
> to resolve this.

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

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-05-19  3:39 Stephen Rothwell
@ 2009-05-19  4:09 ` David Miller
  2009-05-19  4:43   ` Stephen Rothwell
  0 siblings, 1 reply; 60+ messages in thread
From: David Miller @ 2009-05-19  4:09 UTC (permalink / raw)
  To: sfr
  Cc: linux-next, linux-kernel, vasu.dev, jeykholt, robert.w.love,
	James.Bottomley, christopher.leech

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 May 2009 13:39:58 +1000

> Today's linux-next merge of the net tree got a conflict in
> drivers/scsi/fcoe/fcoe.c between commit
> 6401bdcad536cc00589c38e7e1c140d3acc00087 ("[SCSI] fcoe: fip: add
> multicast filter to receive FIP advertisements") from Linus' tree and
> commit 184dd3459bb334d9061b58faed3610d08d6c7ff8 ("fcoe: adds spma mode
> support") from the net tree.
> 
> There is another trivial conflict between commit
> dd3fd72e692c8af007f70df4433c0cffe8582d8b ("[SCSI] fcoe: fix spelling
> typos and bad comments") from Linus' tree and commit
> ab6b85c1d7a1bf6c2b27fb542a7b2404e45b7e24 ("fcoe: consolidates netdev
> related config and cleanup for spma mode") from the net tree.
> 
> Just context changes.  I fixed them up (see below) and can carry them for
> a while.

I'll pull net-2.6 into net-next-2.6 and push the result to kernel.org
to resolve this.

Thanks!

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-05-19  3:39 Stephen Rothwell
  2009-05-19  4:09 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2009-05-19  3:39 UTC (permalink / raw)
  To: David Miller
  Cc: linux-next, LKML, Vasu Dev, Joe Eykholt, Robert Love,
	James Bottomley, Chris Leech

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/scsi/fcoe/fcoe.c between commit
6401bdcad536cc00589c38e7e1c140d3acc00087 ("[SCSI] fcoe: fip: add
multicast filter to receive FIP advertisements") from Linus' tree and
commit 184dd3459bb334d9061b58faed3610d08d6c7ff8 ("fcoe: adds spma mode
support") from the net tree.

There is another trivial conflict between commit
dd3fd72e692c8af007f70df4433c0cffe8582d8b ("[SCSI] fcoe: fix spelling
typos and bad comments") from Linus' tree and commit
ab6b85c1d7a1bf6c2b27fb542a7b2404e45b7e24 ("fcoe: consolidates netdev
related config and cleanup for spma mode") from the net tree.

Just context changes.  I fixed them up (see below) and can carry them for
a while.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/scsi/fcoe/fcoe.c
index 03e1926,f2d1612..0000000
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@@ -136,8 -136,61 +136,60 @@@ static struct scsi_host_template fcoe_s
  };
  
  /**
+  * fcoe_fip_recv - handle a received FIP frame.
+  * @skb: the receive skb
+  * @dev: associated &net_device
+  * @ptype: the &packet_type structure which was used to register this handler.
+  * @orig_dev: original receive &net_device, in case @dev is a bond.
+  *
+  * Returns: 0 for success
+  */
+ static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *dev,
+ 			 struct packet_type *ptype,
+ 			 struct net_device *orig_dev)
+ {
+ 	struct fcoe_softc *fc;
+ 
+ 	fc = container_of(ptype, struct fcoe_softc, fip_packet_type);
+ 	fcoe_ctlr_recv(&fc->ctlr, skb);
+ 	return 0;
+ }
+ 
+ /**
+  * fcoe_fip_send() - send an Ethernet-encapsulated FIP frame.
+  * @fip: FCoE controller.
+  * @skb: FIP Packet.
+  */
+ static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
+ {
+ 	skb->dev = fcoe_from_ctlr(fip)->real_dev;
+ 	dev_queue_xmit(skb);
+ }
+ 
+ /**
+  * fcoe_update_src_mac() - Update Ethernet MAC filters.
+  * @fip: FCoE controller.
+  * @old: Unicast MAC address to delete if the MAC is non-zero.
+  * @new: Unicast MAC address to add.
+  *
+  * Remove any previously-set unicast MAC filter.
+  * Add secondary FCoE MAC address filter for our OUI.
+  */
+ static void fcoe_update_src_mac(struct fcoe_ctlr *fip, u8 *old, u8 *new)
+ {
+ 	struct fcoe_softc *fc;
+ 
+ 	fc = fcoe_from_ctlr(fip);
+ 	rtnl_lock();
+ 	if (!is_zero_ether_addr(old))
+ 		dev_unicast_delete(fc->real_dev, old, ETH_ALEN);
+ 	dev_unicast_add(fc->real_dev, new, ETH_ALEN);
+ 	rtnl_unlock();
+ }
+ 
+ /**
   * fcoe_lport_config() - sets up the fc_lport
   * @lp: ptr to the fc_lport
 - * @shost: ptr to the parent scsi host
   *
   * Returns: 0 for success
   */
@@@ -255,7 -349,8 +348,9 @@@ static int fcoe_netdev_config(struct fc
  	rtnl_lock();
  	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
  	dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN);
 +	dev_mc_add(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
+ 	if (fc->ctlr.spma)
+ 		dev_unicast_add(fc->real_dev, fc->ctlr.ctl_src_addr, ETH_ALEN);
  	rtnl_unlock();
  
  	/*
@@@ -370,17 -470,7 +470,7 @@@ static int fcoe_if_destroy(struct net_d
  	if (lp->emp)
  		fc_exch_mgr_free(lp->emp);
  
- 	/* Delete secondary MAC addresses */
- 	rtnl_lock();
- 	memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
- 	dev_unicast_delete(fc->real_dev, flogi_maddr, ETH_ALEN);
- 	if (!is_zero_ether_addr(fc->ctlr.data_src_addr))
- 		dev_unicast_delete(fc->real_dev,
- 				   fc->ctlr.data_src_addr, ETH_ALEN);
- 	dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
- 	rtnl_unlock();
- 
 -	/* Free the per-CPU revieve threads */
 +	/* Free the per-CPU receive threads */
  	fcoe_percpu_clean(lp);
  
  	/* Free existing skbs */

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-02-26  2:48 Stephen Rothwell
@ 2009-02-27  7:17 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2009-02-27  7:17 UTC (permalink / raw)
  To: sfr
  Cc: linux-next, fenghua.yu, David.Woodhouse, bhavesh, chrisw,
	tomas.winkler, samuel.ortiz, reinette.chatre, linville

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Feb 2009 13:48:59 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-tx.c between commit
> 6aa03ab06978e97b3e0720f83280d7841051916b ("Fix iwlan DMA mapping
> direction") from Linus' tree and commit
> 7aaa1d79e3a2d573ac469744506f17b1c9386840 ("iwlwifi: Add TFD library
> operations") from the net tree.
> 
> The latter moved some code that the former modified.  I fixed it up (see
> below) and can carry it for a while.

I'll sort this out, thanks Stephen.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-02-26  2:48 Stephen Rothwell
  2009-02-27  7:17 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2009-02-26  2:48 UTC (permalink / raw)
  To: David Miller
  Cc: linux-next, Fenghua Yu, David Woodhouse, Bhavesh Davda,
	Chris Wright, Tomas Winkler, Samuel Ortiz, Reinette Chatre,
	John W. Linville

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-tx.c between commit
6aa03ab06978e97b3e0720f83280d7841051916b ("Fix iwlan DMA mapping
direction") from Linus' tree and commit
7aaa1d79e3a2d573ac469744506f17b1c9386840 ("iwlwifi: Add TFD library
operations") from the net tree.

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

diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
index ab13ff2,ae04c20..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 397577c..e9729f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -444,7 +444,7 @@ void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
 		pci_unmap_single(dev,
 				pci_unmap_addr(&txq->cmd[index]->meta, mapping),
 				pci_unmap_len(&txq->cmd[index]->meta, len),
-				PCI_DMA_TODEVICE);
+				PCI_DMA_BIDIRECTIONAL);
 
 	/* Unmap chunks, if any. */
 	for (i = 1; i < num_tbs; i++) {

^ permalink raw reply	[flat|nested] 60+ messages in thread

* Re: linux-next: manual merge of the net tree with Linus' tree
  2009-02-02  3:13 Stephen Rothwell
@ 2009-02-03  7:51 ` David Miller
  0 siblings, 0 replies; 60+ messages in thread
From: David Miller @ 2009-02-03  7:51 UTC (permalink / raw)
  To: sfr; +Cc: linux-next, s.hauer, Matt.Waddel, gerg

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Feb 2009 14:13:28 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/Kconfig between commit
> d4732d3c59b84bb093e11c8f755f32801b4bf86d ("m68knommu: add ColdFire M532x
> to the FEC configuration options") from Linus' tree and commit
> 196719ecec0c526de273dcb902f0be956a193232 ("fec: Add support for Freescale
> MX27") from the net tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.

I'll take care of this, thanks Stephen.

^ permalink raw reply	[flat|nested] 60+ messages in thread

* linux-next: manual merge of the net tree with Linus' tree
@ 2009-02-02  3:13 Stephen Rothwell
  2009-02-03  7:51 ` David Miller
  0 siblings, 1 reply; 60+ messages in thread
From: Stephen Rothwell @ 2009-02-02  3:13 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, Sascha Hauer, Matt Waddel, Greg Ungerer

Hi Dave,

Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit
d4732d3c59b84bb093e11c8f755f32801b4bf86d ("m68knommu: add ColdFire M532x
to the FEC configuration options") from Linus' tree and commit
196719ecec0c526de273dcb902f0be956a193232 ("fec: Add support for Freescale
MX27") from the net tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/Kconfig
index 6bdfd47,0ec01e4..0000000
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1828,11 -1828,11 +1828,11 @@@ config 68360_ENE
  	  the Motorola 68360 processor.
  
  config FEC
- 	bool "FEC ethernet controller (of ColdFire CPUs)"
- 	depends on M523x || M527x || M5272 || M528x || M520x || M532x
+ 	bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 -	depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27
++	depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
- 	  controller on some Motorola ColdFire processors.
+ 	  controller on some Motorola ColdFire and Freescale i.MX processors.
  
  config FEC2
  	bool "Second FEC ethernet controller (on some ColdFire CPUs)"

^ permalink raw reply	[flat|nested] 60+ messages in thread

end of thread, back to index

Thread overview: 60+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-19 21:07 linux-next: manual merge of the net tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-07-21 23:41 Stephen Rothwell
2018-06-28 22:14 Stephen Rothwell
2017-11-26 22:42 Stephen Rothwell
2016-10-15 21:13 Stephen Rothwell
2016-10-17 11:41 ` Mintz, Yuval
2011-09-22  5:16 Stephen Rothwell
2011-09-19  4:51 Stephen Rothwell
2011-09-19  6:55 ` Dmitry Kravkov
2011-09-19 15:54   ` Joe Perches
2011-09-19 16:04     ` Dmitry Kravkov
2011-09-19  4:41 Stephen Rothwell
2011-07-18  4:41 Stephen Rothwell
2011-07-18 19:33 ` David Miller
2011-04-08  3:45 Stephen Rothwell
2011-04-08  3:49 ` David Miller
2010-12-26 23:41 Stephen Rothwell
2010-12-27  2:21 ` David Miller
2010-10-22  1:19 Stephen Rothwell
2010-07-21  2:04 Stephen Rothwell
2010-07-21  2:31 ` Herbert Xu
2010-07-21  3:27 ` David Miller
2010-07-21  3:44   ` Stephen Rothwell
2010-05-17  2:09 Stephen Rothwell
2010-05-17  5:28 ` David Miller
2010-05-17  6:24   ` Stephen Rothwell
2010-05-12  2:26 Stephen Rothwell
2010-04-27  1:28 Stephen Rothwell
2010-04-27  1:28 Stephen Rothwell
2010-04-28  0:05 ` David Miller
2010-04-28  0:47   ` Stephen Rothwell
2010-04-14  1:45 Stephen Rothwell
2010-04-14  1:47 ` David Miller
2010-04-14  1:52   ` Stephen Rothwell
2010-04-14  2:00     ` David Miller
2010-04-09  0:41 Stephen Rothwell
2010-04-07  2:58 Stephen Rothwell
2010-04-07  2:58 Stephen Rothwell
2010-04-07  3:20 ` Cong Wang
2010-04-07  5:28   ` Stephen Rothwell
2010-03-01  3:20 Stephen Rothwell
2010-03-01  3:21 ` David Miller
2010-01-11  2:31 Stephen Rothwell
2010-01-11  6:50 ` David Miller
2010-01-11  7:56   ` Stephen Rothwell
2010-01-11  7:59     ` David Miller
2010-01-11  8:49       ` Stephen Rothwell
2009-09-02  3:37 Stephen Rothwell
2009-09-02  7:33 ` David Miller
2009-09-02  8:52   ` Stephen Rothwell
2009-08-07  1:58 Stephen Rothwell
2009-06-03  2:20 Stephen Rothwell
2009-06-03 10:33 ` David Miller
2009-05-19  3:39 Stephen Rothwell
2009-05-19  4:09 ` David Miller
2009-05-19  4:43   ` Stephen Rothwell
2009-02-26  2:48 Stephen Rothwell
2009-02-27  7:17 ` David Miller
2009-02-02  3:13 Stephen Rothwell
2009-02-03  7:51 ` David Miller

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git