Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-10-21  0:07 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2019-10-21  0:07 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Eric Dumazet,
	Jiri Pirko

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

Hi all,

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

  include/net/net_namespace.h

between commit:

  2a06b8982f8f ("net: reorder 'struct net' fields to avoid false sharing")

from Linus' tree and commit:

  a30c7b429f2d ("net: introduce per-netns netdevice notifiers")

from the net-next tree.

I fixed it up (see below - but it clearly needs more thought) 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 include/net/net_namespace.h
index 4c2cd9378699,5ac2bb16d4b3..000000000000
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -102,14 -94,14 +103,15 @@@ struct net 
  
  	struct uevent_sock	*uevent_sock;		/* uevent socket */
  
 -	struct list_head 	dev_base_head;
  	struct hlist_head 	*dev_name_head;
  	struct hlist_head	*dev_index_head;
+ 	struct raw_notifier_head	netdev_chain;
 +	/* Note that @hash_mix can be read millions times per second,
 +	 * it is critical that it is on a read_mostly cache line.
 +	 */
 +	u32			hash_mix;
  
 -	unsigned int		dev_base_seq;	/* protected by rtnl_mutex */
 -	int			ifindex;
 -	unsigned int		dev_unreg_count;
 +	struct net_device       *loopback_dev;          /* The loopback */
  
  	/* core fib_rules */
  	struct list_head	rules_ops;

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-09-15 20:31 Mark Brown
  0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2019-09-15 20:31 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

between commit:

  bf280c0387ebbf8ee ("ixgbe: fix double clean of Tx descriptors with xdp")

from Linus' tree and commit:

  5c129241e2de79f09 ("ixgbe: add support for AF_XDP need_wakeup feature")

from the net-next 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.

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index a3b6d8c89127f,ad802a8909e0d..0000000000000
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@@ -682,10 -697,19 +691,17 @@@ bool ixgbe_clean_xdp_tx_irq(struct ixgb
  	if (xsk_frames)
  		xsk_umem_complete_tx(umem, xsk_frames);
  
+ 	if (xsk_umem_uses_need_wakeup(tx_ring->xsk_umem)) {
+ 		if (tx_ring->next_to_clean == tx_ring->next_to_use)
+ 			xsk_set_tx_need_wakeup(tx_ring->xsk_umem);
+ 		else
+ 			xsk_clear_tx_need_wakeup(tx_ring->xsk_umem);
+ 	}
+ 
 -	xmit_done = ixgbe_xmit_zc(tx_ring, q_vector->tx.work_limit);
 -
 -	return budget > 0 && xmit_done;
 +	return ixgbe_xmit_zc(tx_ring, q_vector->tx.work_limit);
  }
  
- int ixgbe_xsk_async_xmit(struct net_device *dev, u32 qid)
+ int ixgbe_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags)
  {
  	struct ixgbe_adapter *adapter = netdev_priv(dev);
  	struct ixgbe_ring *ring;

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-09-15 20:24 Mark Brown
  0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2019-09-15 20:24 UTC (permalink / raw)
  To: Mario Limonciello, Marcel Holtmann, Alex Lu, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  drivers/bluetooth/btusb.c

between commit:

  1ffdb51f28e8ec ("Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature"")

from Linus' tree and commit:

  9e45524a011107 ("Bluetooth: btusb: Fix suspend issue for Realtek devices")

from the net-next 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.

diff --cc drivers/bluetooth/btusb.c
index ba41490543040,ed455de598eae..0000000000000
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1173,7 -1201,18 +1204,14 @@@ static int btusb_open(struct hci_dev *h
  	}
  
  	data->intf->needs_remote_wakeup = 1;
 -	/* device specific wakeup source enabled and required for USB
 -	 * remote wakeup while host is suspended
 -	 */
 -	device_wakeup_enable(&data->udev->dev);
  
+ 	/* Disable device remote wakeup when host is suspended
+ 	 * For Realtek chips, global suspend without
+ 	 * SET_FEATURE (DEVICE_REMOTE_WAKEUP) can save more power in device.
+ 	 */
+ 	if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
+ 		device_wakeup_disable(&data->udev->dev);
+ 
  	if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
  		goto done;
  
@@@ -1237,6 -1276,12 +1275,11 @@@ static int btusb_close(struct hci_dev *
  		goto failed;
  
  	data->intf->needs_remote_wakeup = 0;
+ 
+ 	/* Enable remote wake up for auto-suspend */
+ 	if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
+ 		data->intf->needs_remote_wakeup = 1;
+ 
 -	device_wakeup_disable(&data->udev->dev);
  	usb_autopm_put_interface(data->intf);
  
  failed:

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-06-17  1:44 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2019-06-17  1:44 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Gleixner, Greg Kroah-Hartman, Johannes Berg, Luca Coelho

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

Hi all,

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

  net/mac80211/cfg.c

between commit:

  28c61a66abd6 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 432")

from Linus' tree and commit:

  bd718fc11d5b ("mac80211: use STA info in rate_control_send_low()")

from the net-next 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/mac80211/cfg.c
index a1973a26c7fc,fcf1dfc3a1cc..000000000000
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -5,7 -4,9 +5,7 @@@
   * Copyright 2006-2010	Johannes Berg <johannes@sipsolutions.net>
   * Copyright 2013-2015  Intel Mobile Communications GmbH
   * Copyright (C) 2015-2017 Intel Deutschland GmbH
-  * Copyright (C) 2018 Intel Corporation
+  * Copyright (C) 2018-2019 Intel Corporation
 - *
 - * This file is GPLv2 as found in COPYING.
   */
  
  #include <linux/ieee80211.h>

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-06-04  0:30 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2019-06-04  0:30 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Gleixner, Greg Kroah-Hartman, Arnd Bergmann

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

Hi all,

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

  drivers/isdn/hisax/hfc_usb.c

between commit:

  de6cc6515a44 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 153")

from Linus' tree and commit:

  85993b8c9786 ("isdn: remove hisax driver")

from the net-next tree.

I fixed it up (I just removed the file) 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] 69+ messages in thread

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-06-04  0:29 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2019-06-04  0:29 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Gleixner, Greg Kroah-Hartman, Arnd Bergmann

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

Hi all,

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

  drivers/isdn/gigaset/i4l.c

between commit:

  2874c5fd2842 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152")

from Linus' tree and commit:

  8e6c8aa3b52e ("isdn: gigaset: remove i4l support")

from the net-next tree.

I fixed it up (I just removed the file) 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] 69+ messages in thread

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2019-04-02 22:56 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2019-04-02 22:56 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, NeilBrown,
	Greg Kroah-Hartman

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

Hi all,

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

  drivers/staging/mt7621-eth/mtk_eth_soc.c

between commit:

  bd31342f0046 ("staging: remove mt7621-eth")

from Linus' tree and commit:

  6b16f9ee89b8 ("net: move skb->xmit_more hint to softnet data")

from the net-next tree.

I fixed it up (I just removed the file) 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] 69+ messages in thread

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2018-07-20  1:49 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2018-07-20  1:49 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Alexander Sverdlin, Arnd Bergmann

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

Hi all,

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

  drivers/net/ethernet/cavium/Kconfig

between commit:

  e40562abdf81 ("net: cavium: Add fine-granular dependencies on PCI")

from Linus' tree and commit:

  74525cc5f5f7 ("net: cavium: add missing PCI dependencies")

from the net-next tree.

I fixed it up (I used the latter version, but they were logically
identical) 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] 69+ messages in thread

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2018-06-06  4:37 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2018-06-06  4:37 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Josh Poimboeuf, Sridhar Samudrala

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

Hi all,

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

  MAINTAINERS

between commit:

  2562c011f897 ("MAINTAINERS: add Josh Poimboeuf as faddr2line maintainer")

from Linus' tree and commit:

  30c8bd5aa8b2 ("net: Introduce generic failover module")

from the net-next 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 MAINTAINERS
index 8ac49add2df7,884657f0be11..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5430,11 -5413,14 +5430,19 @@@ S:	Maintaine
  F:	Documentation/hwmon/f71805f
  F:	drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:	Josh Poimboeuf <jpoimboe@redhat.com>
 +S:	Maintained
 +F:	scripts/faddr2line
 +
+ FAILOVER MODULE
+ M:	Sridhar Samudrala <sridhar.samudrala@intel.com>
+ L:	netdev@vger.kernel.org
+ S:	Supported
+ F:	net/core/failover.c
+ F:	include/net/failover.h
+ F:	Documentation/networking/failover.rst
+ 
  FANOTIFY
  M:	Jan Kara <jack@suse.cz>
  R:	Amir Goldstein <amir73il@gmail.com>

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-12-04 22:59 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2017-12-04 22:59 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Marc Kleine-Budde, Pankaj Bansal

Hi all,

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

  drivers/net/can/flexcan.c

between commit:

  29c64b17a0bc ("can: flexcan: fix VF610 state transition issue")

from Linus' tree and commit:

  99b7668c04b2 ("can: flexcan: adding platform specific details for LS1021A")

from the net-next 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 drivers/net/can/flexcan.c
index 0626dcfd1f3d,3a370d8437b0..000000000000
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -184,12 -184,13 +184,13 @@@
   * Below is some version info we got:
   *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-
   *                                Filter? connected?  Passive detection  ception in MB
 - *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no
 + *   MX25  FlexCAN2  03.00.00.00     no        no        no       no        no
   *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no
 - *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no
 + *   MX35  FlexCAN2  03.00.00.00     no        no        no       no        no
   *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no
   *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes
 - *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?
 + *   VF610 FlexCAN3  ?               no       yes        no      yes       yes?
+  * LS1021A FlexCAN2  03.00.04.00     no       yes        no       no       yes
   *
   * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
   */
@@@ -297,10 -302,15 +302,16 @@@ static const struct flexcan_devtype_dat
  
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
  	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
 -		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
 +		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
 +		FLEXCAN_QUIRK_BROKEN_PERR_STATE,
  };
  
+ static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
+ 	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
+ 		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
+ 		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+ };
+ 
  static const struct can_bittiming_const flexcan_bittiming_const = {
  	.name = DRV_NAME,
  	.tseg1_min = 4,

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-11-09 23:31 Stephen Rothwell
  2017-11-10  4:37 ` Cong Wang
@ 2017-11-10  4:39 ` David Miller
  1 sibling, 0 replies; 69+ messages in thread
From: David Miller @ 2017-11-10  4:39 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, xiyou.wangcong

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 10 Nov 2017 10:31:00 +1100

> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   net/sched/cls_basic.c
>   net/sched/cls_u32.c
> 
> between commits:
> 
>   0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
>   35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")
> 
> from Linus' tree and commit:
> 
>   1d8134fea2eb ("net_sched: use idr to allocate basic filter handles")
> 
> from the net-next tree.

This should be resolved as I've just merged 'net' into 'net-next'.

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-11-09 23:31 Stephen Rothwell
@ 2017-11-10  4:37 ` Cong Wang
  2017-11-10  4:39 ` David Miller
  1 sibling, 0 replies; 69+ messages in thread
From: Cong Wang @ 2017-11-10  4:37 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List

On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I fixed it up (I think - 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.

It looks good to me.

Thanks!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-11-09 23:31 Stephen Rothwell
  2017-11-10  4:37 ` Cong Wang
  2017-11-10  4:39 ` David Miller
  0 siblings, 2 replies; 69+ messages in thread
From: Stephen Rothwell @ 2017-11-09 23:31 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Cong Wang

Hi all,

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

  net/sched/cls_basic.c
  net/sched/cls_u32.c

between commits:

  0b2a59894b76 ("cls_basic: use tcf_exts_get_net() before call_rcu()")
  35c55fc156d8 ("cls_u32: use tcf_exts_get_net() before call_rcu()")

from Linus' tree and commit:

  1d8134fea2eb ("net_sched: use idr to allocate basic filter handles")

from the net-next tree.

I fixed it up (I think - 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/sched/cls_basic.c
index e43c56d5b96a,871351358c10..000000000000
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@@ -118,11 -115,10 +120,13 @@@ static void basic_destroy(struct tcf_pr
  	list_for_each_entry_safe(f, n, &head->flist, link) {
  		list_del_rcu(&f->link);
  		tcf_unbind_filter(tp, &f->res);
+ 		idr_remove_ext(&head->handle_idr, f->handle);
 -		call_rcu(&f->rcu, basic_delete_filter);
 +		if (tcf_exts_get_net(&f->exts))
 +			call_rcu(&f->rcu, basic_delete_filter);
 +		else
 +			__basic_delete_filter(f);
  	}
+ 	idr_destroy(&head->handle_idr);
  	kfree_rcu(head, rcu);
  }
  
@@@ -133,7 -129,7 +137,8 @@@ static int basic_delete(struct tcf_prot
  
  	list_del_rcu(&f->link);
  	tcf_unbind_filter(tp, &f->res);
 +	tcf_exts_get_net(&f->exts);
+ 	idr_remove_ext(&head->handle_idr, f->handle);
  	call_rcu(&f->rcu, basic_delete_filter);
  	*last = list_empty(&head->flist);
  	return 0;
@@@ -226,9 -222,9 +231,10 @@@ static int basic_change(struct net *net
  	*arg = fnew;
  
  	if (fold) {
+ 		idr_replace_ext(&head->handle_idr, fnew, fnew->handle);
  		list_replace_rcu(&fold->link, &fnew->link);
  		tcf_unbind_filter(tp, &fold->res);
 +		tcf_exts_get_net(&fold->exts);
  		call_rcu(&fold->rcu, basic_delete_filter);
  	} else {
  		list_add_rcu(&fnew->link, &head->flist);
diff --cc net/sched/cls_u32.c
index b58eccb21f03,2737b71854c9..000000000000
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@@ -590,10 -589,8 +591,11 @@@ static void u32_clear_hnode(struct tcf_
  					 rtnl_dereference(n->next));
  			tcf_unbind_filter(tp, &n->res);
  			u32_remove_hw_knode(tp, n->handle);
+ 			idr_remove_ext(&ht->handle_idr, n->handle);
 -			call_rcu(&n->rcu, u32_delete_key_freepf_rcu);
 +			if (tcf_exts_get_net(&n->exts))
 +				call_rcu(&n->rcu, u32_delete_key_freepf_rcu);
 +			else
 +				u32_destroy_key(n->tp, n, true);
  		}
  	}
  }

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-10-30 17:43 ` Jakub Kicinski
@ 2017-10-30 18:10   ` Mark Brown
  0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2017-10-30 18:10 UTC (permalink / raw)
  To: Jakub Kicinski
  Cc: David Miller, Networking, Pieter Jansen van Vuuren,
	Linux-Next Mailing List, Linux Kernel Mailing List

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

On Mon, Oct 30, 2017 at 10:43:07AM -0700, Jakub Kicinski wrote:
> On Mon, 30 Oct 2017 17:02:24 +0000, Mark Brown wrote:

> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.

> Unfortunately, this is not a correct resolution.  Please see below.

So I actually ended up just throwing this away (and the rest of what was
going on for net-next, there were just far too many of these self
conflicts.  The tree is one of the bigger time sinks when doing -next
but today was particularly heavy.

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-10-30 17:02 Mark Brown
@ 2017-10-30 17:43 ` Jakub Kicinski
  2017-10-30 18:10   ` Mark Brown
  0 siblings, 1 reply; 69+ messages in thread
From: Jakub Kicinski @ 2017-10-30 17:43 UTC (permalink / raw)
  To: Mark Brown
  Cc: David Miller, Networking, Pieter Jansen van Vuuren,
	Linux-Next Mailing List, Linux Kernel Mailing List

On Mon, 30 Oct 2017 17:02:24 +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/net/ethernet/netronome/nfp/flower/action.c
> 
> between commit:
> 
>   d309ae5c6a0064 ("nfp: refuse offloading filters that redirects to upper devices")
> 
> from Linus' tree and commit:
> 
>   62d3f60b4d065c ("nfp: use struct fields for 8 bit-wide access")

Actually the conflict is with a much older commit b27d6a95a70d ("nfp:
compile flower vxlan tunnel set actions").

> from the net-next 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.

Unfortunately, this is not a correct resolution.  Please see below.

> diff --cc drivers/net/ethernet/netronome/nfp/flower/action.c
> index 8ea9320014ee,0a5fc9f8545f..000000000000
> --- a/drivers/net/ethernet/netronome/nfp/flower/action.c
> +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
> @@@ -105,19 -104,326 +104,329 @@@ nfp_fl_output(struct nfp_fl_output *out
>   	if (!out_dev)
>   		return -EOPNOTSUPP;
>   
> - 	/* Only offload egress ports are on the same device as the ingress
> - 	 * port.
> + 	tmp_flags = last ? NFP_FL_OUT_FLAGS_LAST : 0;
> + 
> + 	if (tun_type) {
> + 		/* Verify the egress netdev matches the tunnel type. */
> + 		if (!nfp_fl_netdev_is_tunnel_type(out_dev, tun_type))
> + 			return -EOPNOTSUPP;
> + 
> + 		if (*tun_out_cnt)
> + 			return -EOPNOTSUPP;
> + 		(*tun_out_cnt)++;
> + 
> + 		output->flags = cpu_to_be16(tmp_flags |
> + 					    NFP_FL_OUT_FLAGS_USE_TUN);
> + 		output->port = cpu_to_be32(NFP_FL_PORT_TYPE_TUN | tun_type);
> + 	} else {
> + 		/* Set action output parameters. */
> + 		output->flags = cpu_to_be16(tmp_flags);
> + 
> + 		/* Only offload if egress ports are on the same device as the
> + 		 * ingress port.
> + 		 */
> + 		if (!switchdev_port_same_parent_id(in_dev, out_dev))
> + 			return -EOPNOTSUPP;

The code from net should be inserted here.  Note that net-next only
indented this area, the code is unchanged.

	if (!nfp_netdev_is_nfp_repr(out_dev))
		return -EOPNOTSUPP;

should immediately follow switchdev_port_same_parent_id() check.

> + 		output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev));
> + 		if (!output->port)
> + 			return -EOPNOTSUPP;
> + 	}
> + 	nfp_flow->meta.shortcut = output->port;
> + 
> + 	return 0;
> + }
> + 
> + static bool nfp_fl_supported_tun_port(const struct tc_action *action)
> + {
> + 	struct ip_tunnel_info *tun = tcf_tunnel_info(action);
> + 
> + 	return tun->key.tp_dst == htons(NFP_FL_VXLAN_PORT);
> + }
> + 
> + static struct nfp_fl_pre_tunnel *nfp_fl_pre_tunnel(char *act_data, int act_len)
> + {
> + 	size_t act_size = sizeof(struct nfp_fl_pre_tunnel);
> + 	struct nfp_fl_pre_tunnel *pre_tun_act;
> + 
> + 	/* Pre_tunnel action must be first on action list.
> + 	 * If other actions already exist they need pushed forward.
>   	 */
> - 	if (!switchdev_port_same_parent_id(in_dev, out_dev))
> + 	if (act_len)
> + 		memmove(act_data + act_size, act_data, act_len);
> + 
> + 	pre_tun_act = (struct nfp_fl_pre_tunnel *)act_data;
> + 
> + 	memset(pre_tun_act, 0, act_size);
> + 
> + 	pre_tun_act->head.jump_id = NFP_FL_ACTION_OPCODE_PRE_TUNNEL;
> + 	pre_tun_act->head.len_lw = act_size >> NFP_FL_LW_SIZ;
> + 
> + 	return pre_tun_act;
> + }
> + 
> + static int
> + nfp_fl_set_vxlan(struct nfp_fl_set_vxlan *set_vxlan,
> + 		 const struct tc_action *action,
> + 		 struct nfp_fl_pre_tunnel *pre_tun)
> + {
> + 	struct ip_tunnel_info *vxlan = tcf_tunnel_info(action);
> + 	size_t act_size = sizeof(struct nfp_fl_set_vxlan);
> + 	u32 tmp_set_vxlan_type_index = 0;
> + 	/* Currently support one pre-tunnel so index is always 0. */
> + 	int pretun_idx = 0;
> + 
> + 	if (vxlan->options_len) {
> + 		/* Do not support options e.g. vxlan gpe. */
>   		return -EOPNOTSUPP;
> + 	}
> + 
>  +	if (!nfp_netdev_is_nfp_repr(out_dev))
>  +		return -EOPNOTSUPP;
>  +
> - 	output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev));
> - 	if (!output->port)
> + 	set_vxlan->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TUNNEL;
> + 	set_vxlan->head.len_lw = act_size >> NFP_FL_LW_SIZ;
> + 
> + 	/* Set tunnel type and pre-tunnel index. */
> + 	tmp_set_vxlan_type_index |=
> + 		FIELD_PREP(NFP_FL_IPV4_TUNNEL_TYPE, NFP_FL_TUNNEL_VXLAN) |
> + 		FIELD_PREP(NFP_FL_IPV4_PRE_TUN_INDEX, pretun_idx);

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-10-30 17:24 Mark Brown
  0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2017-10-30 17:24 UTC (permalink / raw)
  To: David Miller, Networking, Yousuk Seung, Neal Cardwell,
	Soheil Hassas Yeganeh, Yuchung Cheng, Eric Dumazet
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  net/ipv4/tcp_output.c

between commit:

  5889e2c0e441d8 ("tcp: call tcp_rate_skb_sent() when retransmit with unaligned skb->data")

from Linus' tree and commit:

  e2080072ed2d98 ("tcp: new list for sent but unacked skbs for RACK recovery")

from the net-next 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.

diff --cc net/ipv4/tcp_output.c
index ae60dd3faed0,aab6e7145013..000000000000
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -2840,13 -2905,14 +2907,16 @@@ int __tcp_retransmit_skb(struct sock *s
  		     skb_headroom(skb) >= 0xFFFF)) {
  		struct sk_buff *nskb;
  
- 		nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
- 		err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
- 			     -ENOBUFS;
+ 		tcp_skb_tsorted_save(skb) {
+ 			nskb = __pskb_copy(skb, MAX_TCP_HEADER, GFP_ATOMIC);
+ 			err = nskb ? tcp_transmit_skb(sk, nskb, 0, GFP_ATOMIC) :
+ 				     -ENOBUFS;
+ 		} tcp_skb_tsorted_restore(skb);
+ 
 -		if (!err)
 +		if (!err) {
- 			skb->skb_mstamp = tp->tcp_mstamp;
+ 			tcp_update_skb_after_send(tp, skb);
 +			tcp_rate_skb_sent(sk, skb);
 +		}
  	} else {
  		err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
  	}

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-10-30 17:08 Mark Brown
  0 siblings, 0 replies; 69+ messages in thread
From: Mark Brown @ 2017-10-30 17:08 UTC (permalink / raw)
  To: David Miller, Networking, John Fastabend, Alexei Starovoitov,
	Daniel Borkmann
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  kernel/bpf/sockmap.c

between commit:

  bfa640757e9378c ("bpf: rename sk_actions to align with bpf infrastructure")

from Linus' tree and commit:

  6aaae2b6c4330a4 ("bpf: rename bpf_compute_data_end into bpf_compute_data_pointers")

from the net-next 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.

diff --cc kernel/bpf/sockmap.c
index 66f00a2b27f4,eef843c3b419..000000000000
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-10-30 17:02 Mark Brown
  2017-10-30 17:43 ` Jakub Kicinski
  0 siblings, 1 reply; 69+ messages in thread
From: Mark Brown @ 2017-10-30 17:02 UTC (permalink / raw)
  To: David Miller, Networking, Jakub Kicinski, Pieter Jansen van Vuuren
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  drivers/net/ethernet/netronome/nfp/flower/action.c

between commit:

  d309ae5c6a0064 ("nfp: refuse offloading filters that redirects to upper devices")

from Linus' tree and commit:

  62d3f60b4d065c ("nfp: use struct fields for 8 bit-wide access")

from the net-next 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.

diff --cc drivers/net/ethernet/netronome/nfp/flower/action.c
index 8ea9320014ee,0a5fc9f8545f..000000000000
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@@ -105,19 -104,326 +104,329 @@@ nfp_fl_output(struct nfp_fl_output *out
  	if (!out_dev)
  		return -EOPNOTSUPP;
  
- 	/* Only offload egress ports are on the same device as the ingress
- 	 * port.
+ 	tmp_flags = last ? NFP_FL_OUT_FLAGS_LAST : 0;
+ 
+ 	if (tun_type) {
+ 		/* Verify the egress netdev matches the tunnel type. */
+ 		if (!nfp_fl_netdev_is_tunnel_type(out_dev, tun_type))
+ 			return -EOPNOTSUPP;
+ 
+ 		if (*tun_out_cnt)
+ 			return -EOPNOTSUPP;
+ 		(*tun_out_cnt)++;
+ 
+ 		output->flags = cpu_to_be16(tmp_flags |
+ 					    NFP_FL_OUT_FLAGS_USE_TUN);
+ 		output->port = cpu_to_be32(NFP_FL_PORT_TYPE_TUN | tun_type);
+ 	} else {
+ 		/* Set action output parameters. */
+ 		output->flags = cpu_to_be16(tmp_flags);
+ 
+ 		/* Only offload if egress ports are on the same device as the
+ 		 * ingress port.
+ 		 */
+ 		if (!switchdev_port_same_parent_id(in_dev, out_dev))
+ 			return -EOPNOTSUPP;
+ 
+ 		output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev));
+ 		if (!output->port)
+ 			return -EOPNOTSUPP;
+ 	}
+ 	nfp_flow->meta.shortcut = output->port;
+ 
+ 	return 0;
+ }
+ 
+ static bool nfp_fl_supported_tun_port(const struct tc_action *action)
+ {
+ 	struct ip_tunnel_info *tun = tcf_tunnel_info(action);
+ 
+ 	return tun->key.tp_dst == htons(NFP_FL_VXLAN_PORT);
+ }
+ 
+ static struct nfp_fl_pre_tunnel *nfp_fl_pre_tunnel(char *act_data, int act_len)
+ {
+ 	size_t act_size = sizeof(struct nfp_fl_pre_tunnel);
+ 	struct nfp_fl_pre_tunnel *pre_tun_act;
+ 
+ 	/* Pre_tunnel action must be first on action list.
+ 	 * If other actions already exist they need pushed forward.
  	 */
- 	if (!switchdev_port_same_parent_id(in_dev, out_dev))
+ 	if (act_len)
+ 		memmove(act_data + act_size, act_data, act_len);
+ 
+ 	pre_tun_act = (struct nfp_fl_pre_tunnel *)act_data;
+ 
+ 	memset(pre_tun_act, 0, act_size);
+ 
+ 	pre_tun_act->head.jump_id = NFP_FL_ACTION_OPCODE_PRE_TUNNEL;
+ 	pre_tun_act->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+ 
+ 	return pre_tun_act;
+ }
+ 
+ static int
+ nfp_fl_set_vxlan(struct nfp_fl_set_vxlan *set_vxlan,
+ 		 const struct tc_action *action,
+ 		 struct nfp_fl_pre_tunnel *pre_tun)
+ {
+ 	struct ip_tunnel_info *vxlan = tcf_tunnel_info(action);
+ 	size_t act_size = sizeof(struct nfp_fl_set_vxlan);
+ 	u32 tmp_set_vxlan_type_index = 0;
+ 	/* Currently support one pre-tunnel so index is always 0. */
+ 	int pretun_idx = 0;
+ 
+ 	if (vxlan->options_len) {
+ 		/* Do not support options e.g. vxlan gpe. */
  		return -EOPNOTSUPP;
+ 	}
+ 
 +	if (!nfp_netdev_is_nfp_repr(out_dev))
 +		return -EOPNOTSUPP;
 +
- 	output->port = cpu_to_be32(nfp_repr_get_port_id(out_dev));
- 	if (!output->port)
+ 	set_vxlan->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TUNNEL;
+ 	set_vxlan->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+ 
+ 	/* Set tunnel type and pre-tunnel index. */
+ 	tmp_set_vxlan_type_index |=
+ 		FIELD_PREP(NFP_FL_IPV4_TUNNEL_TYPE, NFP_FL_TUNNEL_VXLAN) |
+ 		FIELD_PREP(NFP_FL_IPV4_PRE_TUN_INDEX, pretun_idx);
+ 
+ 	set_vxlan->tun_type_index = cpu_to_be32(tmp_set_vxlan_type_index);
+ 
+ 	set_vxlan->tun_id = vxlan->key.tun_id;
+ 	set_vxlan->tun_flags = vxlan->key.tun_flags;
+ 	set_vxlan->ipv4_ttl = vxlan->key.ttl;
+ 	set_vxlan->ipv4_tos = vxlan->key.tos;
+ 
+ 	/* Complete pre_tunnel action. */
+ 	pre_tun->ipv4_dst = vxlan->key.u.ipv4.dst;
+ 
+ 	return 0;
+ }
+ 
+ static void nfp_fl_set_helper32(u32 value, u32 mask, u8 *p_exact, u8 *p_mask)
+ {
+ 	u32 oldvalue = get_unaligned((u32 *)p_exact);
+ 	u32 oldmask = get_unaligned((u32 *)p_mask);
+ 
+ 	value &= mask;
+ 	value |= oldvalue & ~mask;
+ 
+ 	put_unaligned(oldmask | mask, (u32 *)p_mask);
+ 	put_unaligned(value, (u32 *)p_exact);
+ }
+ 
+ static int
+ nfp_fl_set_eth(const struct tc_action *action, int idx, u32 off,
+ 	       struct nfp_fl_set_eth *set_eth)
+ {
+ 	u32 exact, mask;
+ 
+ 	if (off + 4 > ETH_ALEN * 2)
+ 		return -EOPNOTSUPP;
+ 
+ 	mask = ~tcf_pedit_mask(action, idx);
+ 	exact = tcf_pedit_val(action, idx);
+ 
+ 	if (exact & ~mask)
  		return -EOPNOTSUPP;
  
- 	nfp_flow->meta.shortcut = output->port;
+ 	nfp_fl_set_helper32(exact, mask, &set_eth->eth_addr_val[off],
+ 			    &set_eth->eth_addr_mask[off]);
+ 
+ 	set_eth->reserved = cpu_to_be16(0);
+ 	set_eth->head.jump_id = NFP_FL_ACTION_OPCODE_SET_ETHERNET;
+ 	set_eth->head.len_lw = sizeof(*set_eth) >> NFP_FL_LW_SIZ;
+ 
+ 	return 0;
+ }
+ 
+ static int
+ nfp_fl_set_ip4(const struct tc_action *action, int idx, u32 off,
+ 	       struct nfp_fl_set_ip4_addrs *set_ip_addr)
+ {
+ 	__be32 exact, mask;
+ 
+ 	/* We are expecting tcf_pedit to return a big endian value */
+ 	mask = (__force __be32)~tcf_pedit_mask(action, idx);
+ 	exact = (__force __be32)tcf_pedit_val(action, idx);
+ 
+ 	if (exact & ~mask)
+ 		return -EOPNOTSUPP;
+ 
+ 	switch (off) {
+ 	case offsetof(struct iphdr, daddr):
+ 		set_ip_addr->ipv4_dst_mask = mask;
+ 		set_ip_addr->ipv4_dst = exact;
+ 		break;
+ 	case offsetof(struct iphdr, saddr):
+ 		set_ip_addr->ipv4_src_mask = mask;
+ 		set_ip_addr->ipv4_src = exact;
+ 		break;
+ 	default:
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+ 	set_ip_addr->reserved = cpu_to_be16(0);
+ 	set_ip_addr->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS;
+ 	set_ip_addr->head.len_lw = sizeof(*set_ip_addr) >> NFP_FL_LW_SIZ;
+ 
+ 	return 0;
+ }
+ 
+ static void
+ nfp_fl_set_ip6_helper(int opcode_tag, int idx, __be32 exact, __be32 mask,
+ 		      struct nfp_fl_set_ipv6_addr *ip6)
+ {
+ 	ip6->ipv6[idx % 4].mask = mask;
+ 	ip6->ipv6[idx % 4].exact = exact;
+ 
+ 	ip6->reserved = cpu_to_be16(0);
+ 	ip6->head.jump_id = opcode_tag;
+ 	ip6->head.len_lw = sizeof(*ip6) >> NFP_FL_LW_SIZ;
+ }
+ 
+ static int
+ nfp_fl_set_ip6(const struct tc_action *action, int idx, u32 off,
+ 	       struct nfp_fl_set_ipv6_addr *ip_dst,
+ 	       struct nfp_fl_set_ipv6_addr *ip_src)
+ {
+ 	__be32 exact, mask;
+ 
+ 	/* We are expecting tcf_pedit to return a big endian value */
+ 	mask = (__force __be32)~tcf_pedit_mask(action, idx);
+ 	exact = (__force __be32)tcf_pedit_val(action, idx);
+ 
+ 	if (exact & ~mask)
+ 		return -EOPNOTSUPP;
+ 
+ 	if (off < offsetof(struct ipv6hdr, saddr))
+ 		return -EOPNOTSUPP;
+ 	else if (off < offsetof(struct ipv6hdr, daddr))
+ 		nfp_fl_set_ip6_helper(NFP_FL_ACTION_OPCODE_SET_IPV6_SRC, idx,
+ 				      exact, mask, ip_src);
+ 	else if (off < offsetof(struct ipv6hdr, daddr) +
+ 		       sizeof(struct in6_addr))
+ 		nfp_fl_set_ip6_helper(NFP_FL_ACTION_OPCODE_SET_IPV6_DST, idx,
+ 				      exact, mask, ip_dst);
+ 	else
+ 		return -EOPNOTSUPP;
+ 
+ 	return 0;
+ }
+ 
+ static int
+ nfp_fl_set_tport(const struct tc_action *action, int idx, u32 off,
+ 		 struct nfp_fl_set_tport *set_tport, int opcode)
+ {
+ 	u32 exact, mask;
+ 
+ 	if (off)
+ 		return -EOPNOTSUPP;
+ 
+ 	mask = ~tcf_pedit_mask(action, idx);
+ 	exact = tcf_pedit_val(action, idx);
+ 
+ 	if (exact & ~mask)
+ 		return -EOPNOTSUPP;
+ 
+ 	nfp_fl_set_helper32(exact, mask, set_tport->tp_port_val,
+ 			    set_tport->tp_port_mask);
+ 
+ 	set_tport->reserved = cpu_to_be16(0);
+ 	set_tport->head.jump_id = opcode;
+ 	set_tport->head.len_lw = sizeof(*set_tport) >> NFP_FL_LW_SIZ;
+ 
+ 	return 0;
+ }
+ 
+ static int
+ nfp_fl_pedit(const struct tc_action *action, char *nfp_action, int *a_len)
+ {
+ 	struct nfp_fl_set_ipv6_addr set_ip6_dst, set_ip6_src;
+ 	struct nfp_fl_set_ip4_addrs set_ip_addr;
+ 	struct nfp_fl_set_tport set_tport;
+ 	struct nfp_fl_set_eth set_eth;
+ 	enum pedit_header_type htype;
+ 	int idx, nkeys, err;
+ 	size_t act_size;
+ 	u32 offset, cmd;
+ 
+ 	memset(&set_ip6_dst, 0, sizeof(set_ip6_dst));
+ 	memset(&set_ip6_src, 0, sizeof(set_ip6_src));
+ 	memset(&set_ip_addr, 0, sizeof(set_ip_addr));
+ 	memset(&set_tport, 0, sizeof(set_tport));
+ 	memset(&set_eth, 0, sizeof(set_eth));
+ 	nkeys = tcf_pedit_nkeys(action);
+ 
+ 	for (idx = 0; idx < nkeys; idx++) {
+ 		cmd = tcf_pedit_cmd(action, idx);
+ 		htype = tcf_pedit_htype(action, idx);
+ 		offset = tcf_pedit_offset(action, idx);
+ 
+ 		if (cmd != TCA_PEDIT_KEY_EX_CMD_SET)
+ 			return -EOPNOTSUPP;
+ 
+ 		switch (htype) {
+ 		case TCA_PEDIT_KEY_EX_HDR_TYPE_ETH:
+ 			err = nfp_fl_set_eth(action, idx, offset, &set_eth);
+ 			break;
+ 		case TCA_PEDIT_KEY_EX_HDR_TYPE_IP4:
+ 			err = nfp_fl_set_ip4(action, idx, offset, &set_ip_addr);
+ 			break;
+ 		case TCA_PEDIT_KEY_EX_HDR_TYPE_IP6:
+ 			err = nfp_fl_set_ip6(action, idx, offset, &set_ip6_dst,
+ 					     &set_ip6_src);
+ 			break;
+ 		case TCA_PEDIT_KEY_EX_HDR_TYPE_TCP:
+ 			err = nfp_fl_set_tport(action, idx, offset, &set_tport,
+ 					       NFP_FL_ACTION_OPCODE_SET_TCP);
+ 			break;
+ 		case TCA_PEDIT_KEY_EX_HDR_TYPE_UDP:
+ 			err = nfp_fl_set_tport(action, idx, offset, &set_tport,
+ 					       NFP_FL_ACTION_OPCODE_SET_UDP);
+ 			break;
+ 		default:
+ 			return -EOPNOTSUPP;
+ 		}
+ 		if (err)
+ 			return err;
+ 	}
+ 
+ 	if (set_eth.head.len_lw) {
+ 		act_size = sizeof(set_eth);
+ 		memcpy(nfp_action, &set_eth, act_size);
+ 		*a_len += act_size;
+ 	} else if (set_ip_addr.head.len_lw) {
+ 		act_size = sizeof(set_ip_addr);
+ 		memcpy(nfp_action, &set_ip_addr, act_size);
+ 		*a_len += act_size;
+ 	} else if (set_ip6_dst.head.len_lw && set_ip6_src.head.len_lw) {
+ 		/* TC compiles set src and dst IPv6 address as a single action,
+ 		 * the hardware requires this to be 2 separate actions.
+ 		 */
+ 		act_size = sizeof(set_ip6_src);
+ 		memcpy(nfp_action, &set_ip6_src, act_size);
+ 		*a_len += act_size;
+ 
+ 		act_size = sizeof(set_ip6_dst);
+ 		memcpy(&nfp_action[sizeof(set_ip6_src)], &set_ip6_dst,
+ 		       act_size);
+ 		*a_len += act_size;
+ 	} else if (set_ip6_dst.head.len_lw) {
+ 		act_size = sizeof(set_ip6_dst);
+ 		memcpy(nfp_action, &set_ip6_dst, act_size);
+ 		*a_len += act_size;
+ 	} else if (set_ip6_src.head.len_lw) {
+ 		act_size = sizeof(set_ip6_src);
+ 		memcpy(nfp_action, &set_ip6_src, act_size);
+ 		*a_len += act_size;
+ 	} else if (set_tport.head.len_lw) {
+ 		act_size = sizeof(set_tport);
+ 		memcpy(nfp_action, &set_tport, act_size);
+ 		*a_len += act_size;
+ 	}
  
  	return 0;
  }

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-06-30  0:57 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2017-06-30  0:57 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Dan Carpenter, Arkadi Sharshevsky

Hi all,

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

  drivers/net/ethernet/rocker/rocker_ofdpa.c

between commit:

  acb4b7df48b5 ("rocker: move dereference before free")

from Linus' tree and commit:

  00fc0c51e35b ("rocker: Change world_ops API and implementation to be switchdev independant")

from the net-next 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 drivers/net/ethernet/rocker/rocker_ofdpa.c
index a9ce82d3e9cf,bd0e3f157e9e..000000000000
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@@ -1505,10 -1409,10 +1409,10 @@@ static int ofdpa_port_ipv4_nh(struct of
  		*index = entry->index;
  		resolved = false;
  	} else if (removing) {
 -		ofdpa_neigh_del(found);
  		*index = found->index;
- 		ofdpa_neigh_del(trans, found);
++		ofdpa_neigh_del(found);
  	} else if (updating) {
- 		ofdpa_neigh_update(found, trans, NULL, false);
+ 		ofdpa_neigh_update(found, NULL, false);
  		resolved = !is_zero_ether_addr(found->eth_dst);
  		*index = found->index;
  	} else {

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-05-03  1:07 Stephen Rothwell
@ 2017-05-03  4:08 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2017-05-03  4:08 UTC (permalink / raw)
  To: sfr
  Cc: netdev, linux-next, linux-kernel, egtvedt, hskinnemoen,
	nicolas.ferre, johunt, sridhar.samudrala, alexander.h.duyck

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 May 2017 11:07:03 +1000

> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   arch/avr32/include/uapi/asm/socket.h
> 
> between commit:
> 
>   26202873bb51 ("avr32: remove support for AVR32 architecture")
> 
> from Linus' tree and commits:
> 
>   a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
>   6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID"
>   5daab9db7b65 ("New getsockopt option to get socket cookie")
> 
> from the net-next tree.
> 
> I fixed it up (I removed the file) 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.

Duly noted in the pull request I sent to Linus, and now that he took
net-next in it is resolved in his tree.

Thanks!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-05-03  1:07 Stephen Rothwell
  2017-05-03  4:08 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2017-05-03  1:07 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Hans-Christian Noren Egtvedt, Håvard Skinnemoen,
	Nicolas Ferre, Josh Hunt, Sridhar Samudrala, Alexander Duyck

Hi all,

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

  arch/avr32/include/uapi/asm/socket.h

between commit:

  26202873bb51 ("avr32: remove support for AVR32 architecture")

from Linus' tree and commits:

  a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt")
  6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID"
  5daab9db7b65 ("New getsockopt option to get socket cookie")

from the net-next tree.

I fixed it up (I removed the file) 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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-03-24  0:10 ` David Miller
@ 2017-03-24  1:24   ` Alexei Starovoitov
  0 siblings, 0 replies; 69+ messages in thread
From: Alexei Starovoitov @ 2017-03-24  1:24 UTC (permalink / raw)
  To: David Miller, sfr; +Cc: netdev, linux-next, linux-kernel, kafai

On 3/23/17 5:10 PM, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 24 Mar 2017 11:05:14 +1100
>
>> Hi all,
>>
>> Today's linux-next merge of the net-next tree got a conflict in:
>>
>>   kernel/bpf/hashtab.c
>>
>> between commit:
>>
>>   8c290e60fa2a ("bpf: fix hashmap extra_elems logic")
>>
>> from Linus' tree and commit:
>>
>>   bcc6b1b7ebf8 ("bpf: Add hash of maps support")
>>
>> from the net-next 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 did the same resolution just an hour ago when merging net into
> net-next.

yes. that's correct merge conflict resolution.
Just rebuilt and retested. All looks good.
Thanks!

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2017-03-24  0:05 Stephen Rothwell
@ 2017-03-24  0:10 ` David Miller
  2017-03-24  1:24   ` Alexei Starovoitov
  0 siblings, 1 reply; 69+ messages in thread
From: David Miller @ 2017-03-24  0:10 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ast, kafai

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Mar 2017 11:05:14 +1100

> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   kernel/bpf/hashtab.c
> 
> between commit:
> 
>   8c290e60fa2a ("bpf: fix hashmap extra_elems logic")
> 
> from Linus' tree and commit:
> 
>   bcc6b1b7ebf8 ("bpf: Add hash of maps support")
> 
> from the net-next 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 did the same resolution just an hour ago when merging net into
net-next.

Thanks!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-03-24  0:05 Stephen Rothwell
  2017-03-24  0:10 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2017-03-24  0:05 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: linux-next, linux-kernel, Alexei Starovoitov, Martin KaFai Lau

Hi all,

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

  kernel/bpf/hashtab.c

between commit:

  8c290e60fa2a ("bpf: fix hashmap extra_elems logic")

from Linus' tree and commit:

  bcc6b1b7ebf8 ("bpf: Add hash of maps support")

from the net-next 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 kernel/bpf/hashtab.c
index 361a69dfe543,343fb5394c95..000000000000
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@@ -582,7 -609,20 +616,15 @@@ static void htab_elem_free_rcu(struct r
  
  static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l)
  {
+ 	struct bpf_map *map = &htab->map;
+ 
+ 	if (map->ops->map_fd_put_ptr) {
+ 		void *ptr = fd_htab_map_get_ptr(map, l);
+ 
+ 		map->ops->map_fd_put_ptr(ptr);
+ 	}
+ 
 -	if (l->state == HTAB_EXTRA_ELEM_USED) {
 -		l->state = HTAB_EXTRA_ELEM_FREE;
 -		return;
 -	}
 -
 -	if (!(htab->map.map_flags & BPF_F_NO_PREALLOC)) {
 +	if (htab_is_prealloc(htab)) {
  		pcpu_freelist_push(&htab->freelist, &l->fnode);
  	} else {
  		atomic_dec(&htab->count);

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

* RE: linux-next: manual merge of the net-next tree with Linus' tree
  2017-02-02  1:49 Stephen Rothwell
@ 2017-02-02  8:40 ` Yotam Gigi
  0 siblings, 0 replies; 69+ messages in thread
From: Yotam Gigi @ 2017-02-02  8:40 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking; +Cc: linux-next, linux-kernel

>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>Behalf Of Stephen Rothwell
>Sent: Thursday, February 02, 2017 3:50 AM
>To: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>
>Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Yotam Gigi
><yotamg@mellanox.com>
>Subject: linux-next: manual merge of the net-next tree with Linus' tree
>
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
>  net/sched/cls_matchall.c
>
>between commit:
>
>  fd62d9f5c575 ("net/sched: matchall: Fix configuration race")
>
>from Linus' tree and commit:
>
>  ec2507d2a306 ("net/sched: cls_matchall: Fix error path")
>
>from the net-next 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.

Looks good. Thanks!

>
>--
>Cheers,
>Stephen Rothwell
>
>diff --cc net/sched/cls_matchall.c
>index b12bc2abea93,fcecf5aac666..000000000000
>--- a/net/sched/cls_matchall.c
>+++ b/net/sched/cls_matchall.c
>@@@ -118,19 -141,24 +118,24 @@@ static int mall_set_parms(struct net *n
>  	struct tcf_exts e;
>  	int err;
>
>- 	tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
>+ 	err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
>+ 	if (err)
>+ 		return err;
>  	err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
>  	if (err < 0)
>- 		return err;
>+ 		goto errout;
>
>  	if (tb[TCA_MATCHALL_CLASSID]) {
> -		f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
> -		tcf_bind_filter(tp, &f->res, base);
> +		head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
> +		tcf_bind_filter(tp, &head->res, base);
>  	}
>
> -	tcf_exts_change(tp, &f->exts, &e);
> +	tcf_exts_change(tp, &head->exts, &e);
>
>  	return 0;
>+ errout:
>+ 	tcf_exts_destroy(&e);
>+ 	return err;
>  }
>
>  static int mall_change(struct net *net, struct sk_buff *in_skb,
>@@@ -162,39 -194,43 +167,44 @@@
>  			return -EINVAL;
>  	}
>
> -	f = kzalloc(sizeof(*f), GFP_KERNEL);
> -	if (!f)
> +	new = kzalloc(sizeof(*new), GFP_KERNEL);
> +	if (!new)
>  		return -ENOBUFS;
>
>- 	tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
> -	err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0);
>++	err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
>+ 	if (err)
>+ 		goto err_exts_init;
>
>  	if (!handle)
>  		handle = 1;
> -	f->handle = handle;
> -	f->flags = flags;
> +	new->handle = handle;
> +	new->flags = flags;
>
> -	err = mall_set_parms(net, tp, f, base, tb, tca[TCA_RATE], ovr);
> +	err = mall_set_parms(net, tp, new, base, tb, tca[TCA_RATE], ovr);
>  	if (err)
>- 		goto errout;
>+ 		goto err_set_parms;
>
>  	if (tc_should_offload(dev, tp, flags)) {
> -		err = mall_replace_hw_filter(tp, f, (unsigned long) f);
> +		err = mall_replace_hw_filter(tp, new, (unsigned long) new);
>  		if (err) {
>  			if (tc_skip_sw(flags))
>- 				goto errout;
>+ 				goto err_replace_hw_filter;
>  			else
>  				err = 0;
>  		}
>  	}
>
> -	*arg = (unsigned long) f;
> -	rcu_assign_pointer(head->filter, f);
> -
> +	*arg = (unsigned long) head;
> +	rcu_assign_pointer(tp->root, new);
> +	if (head)
> +		call_rcu(&head->rcu, mall_destroy_rcu);
>  	return 0;
>
>- errout:
>+ err_replace_hw_filter:
>+ err_set_parms:
> -	tcf_exts_destroy(&f->exts);
>++	tcf_exts_destroy(&new->exts);
>+ err_exts_init:
> -	kfree(f);
> +	kfree(new);
>  	return err;
>  }
>

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2017-02-02  1:49 Stephen Rothwell
  2017-02-02  8:40 ` Yotam Gigi
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2017-02-02  1:49 UTC (permalink / raw)
  To: David Miller, Networking; +Cc: linux-next, linux-kernel, Yotam Gigi

Hi all,

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

  net/sched/cls_matchall.c

between commit:

  fd62d9f5c575 ("net/sched: matchall: Fix configuration race")

from Linus' tree and commit:

  ec2507d2a306 ("net/sched: cls_matchall: Fix error path")

from the net-next 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/sched/cls_matchall.c
index b12bc2abea93,fcecf5aac666..000000000000
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@@ -118,19 -141,24 +118,24 @@@ static int mall_set_parms(struct net *n
  	struct tcf_exts e;
  	int err;
  
- 	tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
+ 	err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
+ 	if (err)
+ 		return err;
  	err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
  	if (err < 0)
- 		return err;
+ 		goto errout;
  
  	if (tb[TCA_MATCHALL_CLASSID]) {
 -		f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
 -		tcf_bind_filter(tp, &f->res, base);
 +		head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
 +		tcf_bind_filter(tp, &head->res, base);
  	}
  
 -	tcf_exts_change(tp, &f->exts, &e);
 +	tcf_exts_change(tp, &head->exts, &e);
  
  	return 0;
+ errout:
+ 	tcf_exts_destroy(&e);
+ 	return err;
  }
  
  static int mall_change(struct net *net, struct sk_buff *in_skb,
@@@ -162,39 -194,43 +167,44 @@@
  			return -EINVAL;
  	}
  
 -	f = kzalloc(sizeof(*f), GFP_KERNEL);
 -	if (!f)
 +	new = kzalloc(sizeof(*new), GFP_KERNEL);
 +	if (!new)
  		return -ENOBUFS;
  
- 	tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
 -	err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0);
++	err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
+ 	if (err)
+ 		goto err_exts_init;
  
  	if (!handle)
  		handle = 1;
 -	f->handle = handle;
 -	f->flags = flags;
 +	new->handle = handle;
 +	new->flags = flags;
  
 -	err = mall_set_parms(net, tp, f, base, tb, tca[TCA_RATE], ovr);
 +	err = mall_set_parms(net, tp, new, base, tb, tca[TCA_RATE], ovr);
  	if (err)
- 		goto errout;
+ 		goto err_set_parms;
  
  	if (tc_should_offload(dev, tp, flags)) {
 -		err = mall_replace_hw_filter(tp, f, (unsigned long) f);
 +		err = mall_replace_hw_filter(tp, new, (unsigned long) new);
  		if (err) {
  			if (tc_skip_sw(flags))
- 				goto errout;
+ 				goto err_replace_hw_filter;
  			else
  				err = 0;
  		}
  	}
  
 -	*arg = (unsigned long) f;
 -	rcu_assign_pointer(head->filter, f);
 -
 +	*arg = (unsigned long) head;
 +	rcu_assign_pointer(tp->root, new);
 +	if (head)
 +		call_rcu(&head->rcu, mall_destroy_rcu);
  	return 0;
  
- errout:
+ err_replace_hw_filter:
+ err_set_parms:
 -	tcf_exts_destroy(&f->exts);
++	tcf_exts_destroy(&new->exts);
+ err_exts_init:
 -	kfree(f);
 +	kfree(new);
  	return err;
  }
  

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2016-10-02 22:37 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2016-10-02 22:37 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: linux-next, linux-kernel, Xin Long, Lorenzo Colitti

Hi all,

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

  net/sctp/sctp_diag.c

between commit:

  1cceda784980 ("sctp: fix the issue sctp_diag uses lock_sock in rcu_read_lock")

from Linus' tree and commit:

  d545caca827b ("net: inet: diag: expose the socket mark to privileged processes.")

from the net-next 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/sctp/sctp_diag.c
index cef0cee182d4,807158e32f5f..000000000000
--- a/net/sctp/sctp_diag.c
+++ b/net/sctp/sctp_diag.c
@@@ -299,9 -314,10 +303,10 @@@ static int sctp_sock_dump(struct sock *
  					sk_user_ns(NETLINK_CB(cb->skb).sk),
  					NETLINK_CB(cb->skb).portid,
  					cb->nlh->nlmsg_seq,
- 					NLM_F_MULTI, cb->nlh) < 0) {
+ 					NLM_F_MULTI, cb->nlh,
+ 					commp->net_admin) < 0) {
  			cb->args[3] = 1;
 -			err = 2;
 +			err = 1;
  			goto release;
  		}
  		cb->args[3] = 1;
@@@ -309,8 -325,9 +314,9 @@@
  		if (inet_sctp_diag_fill(sk, assoc, skb, r,
  					sk_user_ns(NETLINK_CB(cb->skb).sk),
  					NETLINK_CB(cb->skb).portid,
- 					cb->nlh->nlmsg_seq, 0, cb->nlh) < 0) {
+ 					cb->nlh->nlmsg_seq, 0, cb->nlh,
+ 					commp->net_admin) < 0) {
 -			err = 2;
 +			err = 1;
  			goto release;
  		}
  next:

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2016-10-02 22:32 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2016-10-02 22:32 UTC (permalink / raw)
  To: David Miller, Networking; +Cc: linux-next, linux-kernel, Xin Long

Hi all,

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

  net/sctp/outqueue.c

between commit:

  be4947bf46cb ("sctp: change to check peer prsctp_capable when using prsctp polices")

from Linus' tree and commit:

  2c89791eeb6f ("sctp: remove the unnecessary state check in sctp_outq_tail")

from the net-next 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/sctp/outqueue.c
index 107233da5cc9,3ec6da8bbb53..000000000000
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@@ -299,42 -298,19 +298,19 @@@ void sctp_outq_tail(struct sctp_outq *q
  	 * immediately.
  	 */
  	if (sctp_chunk_is_data(chunk)) {
- 		/* Is it OK to queue data chunks?  */
- 		/* From 9. Termination of Association
- 		 *
- 		 * When either endpoint performs a shutdown, the
- 		 * association on each peer will stop accepting new
- 		 * data from its user and only deliver data in queue
- 		 * at the time of sending or receiving the SHUTDOWN
- 		 * chunk.
- 		 */
- 		switch (q->asoc->state) {
- 		case SCTP_STATE_CLOSED:
- 		case SCTP_STATE_SHUTDOWN_PENDING:
- 		case SCTP_STATE_SHUTDOWN_SENT:
- 		case SCTP_STATE_SHUTDOWN_RECEIVED:
- 		case SCTP_STATE_SHUTDOWN_ACK_SENT:
- 			/* Cannot send after transport endpoint shutdown */
- 			error = -ESHUTDOWN;
- 			break;
- 
- 		default:
- 			pr_debug("%s: outqueueing: outq:%p, chunk:%p[%s])\n",
- 				 __func__, q, chunk, chunk && chunk->chunk_hdr ?
- 				 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :
- 				 "illegal chunk");
- 
- 			sctp_chunk_hold(chunk);
- 			sctp_outq_tail_data(q, chunk);
- 			if (chunk->asoc->peer.prsctp_capable &&
- 			    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))
- 				chunk->asoc->sent_cnt_removable++;
- 			if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)
- 				SCTP_INC_STATS(net, SCTP_MIB_OUTUNORDERCHUNKS);
- 			else
- 				SCTP_INC_STATS(net, SCTP_MIB_OUTORDERCHUNKS);
- 			break;
- 		}
+ 		pr_debug("%s: outqueueing: outq:%p, chunk:%p[%s])\n",
+ 			 __func__, q, chunk, chunk && chunk->chunk_hdr ?
+ 			 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :
+ 			 "illegal chunk");
+ 
+ 		sctp_outq_tail_data(q, chunk);
 -		if (chunk->asoc->prsctp_enable &&
++		if (chunk->asoc->peer.prsctp_capable &&
+ 		    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))
+ 			chunk->asoc->sent_cnt_removable++;
+ 		if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)
+ 			SCTP_INC_STATS(net, SCTP_MIB_OUTUNORDERCHUNKS);
+ 		else
+ 			SCTP_INC_STATS(net, SCTP_MIB_OUTORDERCHUNKS);
  	} else {
  		list_add_tail(&chunk->list, &q->control_chunk_list);
  		SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2016-06-30  1:01 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2016-06-30  1:01 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Florian Fainelli, Russell King

Hi all,

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

  drivers/net/phy/fixed_phy.c

between commit:

  69fc58a57e56 ("net: phy: Manage fixed PHY address space using IDA")

from Linus' tree and commit:

  bf7afb29d545 ("phy: improve safety of fixed-phy MII register reading")

from the net-next 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 drivers/net/phy/fixed_phy.c
index 9ec7f7353434,b376ada83598..000000000000
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@@ -23,9 -23,9 +23,10 @@@
  #include <linux/slab.h>
  #include <linux/of.h>
  #include <linux/gpio.h>
+ #include <linux/seqlock.h>
 +#include <linux/idr.h>
  
- #define MII_REGS_NUM 29
+ #include "swphy.h"
  
  struct fixed_mdio_bus {
  	struct mii_bus *mii_bus;

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2016-05-03  3:15 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2016-05-03  3:15 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jiri Benc, Tom Herbert

Hi all,

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

  net/ipv4/ip_gre.c

between commits:

  2090714e1d6e ("gre: build header correctly for collect metadata tunnels")
  b7f8fe251e46 ("gre: do not pull header in ICMP error processing")

from Linus' tree and commit:

  95f5c64c3c13 ("gre: Move utility functions to common headers")
  182a352d2d5e ("gre: Create common functions for transmit")

from the net-next 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/ipv4/ip_gre.c
index 205a2b8a5a84,2480d79b0e37..000000000000
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -341,8 -221,9 +221,9 @@@ static void gre_err(struct sk_buff *skb
  	const int code = icmp_hdr(skb)->code;
  	struct tnl_ptk_info tpi;
  	bool csum_err = false;
+ 	int hdr_len;
  
- 	if (parse_gre_header(skb, &tpi, &csum_err) < 0) {
 -	if (gre_parse_header(skb, &tpi, &csum_err, &hdr_len)) {
++	if (gre_parse_header(skb, &tpi, &csum_err, &hdr_len) < 0) {
  		if (!csum_err)		/* ignore csum errors. */
  			return;
  	}
@@@ -574,15 -414,12 +415,12 @@@ static void gre_fb_xmit(struct sk_buff 
  	}
  
  	/* Push Tunnel header. */
- 	skb = gre_handle_offloads(skb, !!(tun_info->key.tun_flags & TUNNEL_CSUM));
- 	if (IS_ERR(skb)) {
- 		skb = NULL;
+ 	if (gre_handle_offloads(skb, !!(tun_info->key.tun_flags & TUNNEL_CSUM)))
  		goto err_free_rt;
- 	}
  
  	flags = tun_info->key.tun_flags & (TUNNEL_CSUM | TUNNEL_KEY);
- 	build_header(skb, tunnel_hlen, flags, proto,
- 		     tunnel_id_to_key(tun_info->key.tun_id), 0);
 -	gre_build_header(skb, tunnel_hlen, flags, htons(ETH_P_TEB),
++	gre_build_header(skb, tunnel_hlen, flags, proto,
+ 			 tunnel_id_to_key(tun_info->key.tun_id), 0);
  
  	df = key->tun_flags & TUNNEL_DONT_FRAGMENT ?  htons(IP_DF) : 0;
  

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2016-03-15  0:07 Stephen Rothwell
@ 2016-03-15  8:53 ` Gregory CLEMENT
  0 siblings, 0 replies; 69+ messages in thread
From: Gregory CLEMENT @ 2016-03-15  8:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Thomas Petazzoni,
	Olof Johansson, Marcin Wojtas

Hi Stephen,
 
 On mar., mars 15 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
>   arch/arm/boot/dts/armada-xp-db.dts
>   arch/arm/boot/dts/armada-xp-gp.dts
>   arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
>
> between commit:
>
>   d7d5a43c0d16 ("ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window")
>
> from Linus' tree and commits:
>
>   9dd7a57e2cbf ("ARM: dts: armada-xp: enable buffer manager support on Armada XP boards")
>   293fdc24fcc9 ("ARM: dts: armada-xp-openblocks-ax3-4: Add BM support")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This fix is good, thanks!

Gregory

>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm/boot/dts/armada-xp-db.dts
> index 45813a5526c8,30657302305d..000000000000
> --- a/arch/arm/boot/dts/armada-xp-db.dts
> +++ b/arch/arm/boot/dts/armada-xp-db.dts
> @@@ -76,8 -76,9 +76,9 @@@
>   		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
>   			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
>   			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
>  -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
>  -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
>  +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + 			  MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>   
>   		devbus-bootcs {
>   			status = "okay";
> @@@ -229,34 -242,10 +242,38 @@@
>   					spi-max-frequency = <20000000>;
>   				};
>   			};
>  +
>  +			nand@d0000 {
>  +				status = "okay";
>  +				num-cs = <1>;
>  +				marvell,nand-keep-config;
>  +				marvell,nand-enable-arbiter;
>  +				nand-on-flash-bbt;
>  +
>  +				partitions {
>  +					compatible = "fixed-partitions";
>  +					#address-cells = <1>;
>  +					#size-cells = <1>;
>  +
>  +					partition@0 {
>  +						label = "U-Boot";
>  +						reg = <0 0x800000>;
>  +					};
>  +					partition@800000 {
>  +						label = "Linux";
>  +						reg = <0x800000 0x800000>;
>  +					};
>  +					partition@1000000 {
>  +						label = "Filesystem";
>  +						reg = <0x1000000 0x3f000000>;
>  +
>  +					};
>  +				};
>  +			};
>   		};
> + 
> + 		bm-bppi {
> + 			status = "okay";
> + 		};
>   	};
>   };
> diff --cc arch/arm/boot/dts/armada-xp-gp.dts
> index 5730b875c4f5,a1ded01d0c07..000000000000
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@@ -95,8 -95,9 +95,9 @@@
>   		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
>   			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
>   			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
>  -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
>  -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
>  +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + 			  MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>   
>   		devbus-bootcs {
>   			status = "okay";
> diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> index 853bd392a4fe,3aa29a91c7b8..000000000000
> --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> @@@ -65,9 -65,10 +65,10 @@@
>   	soc {
>   		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
>   			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
>  -			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
>  -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
>  -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
>  +			  MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
>  +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + 			  MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
>   
>   		devbus-bootcs {
>   			status = "okay";

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2016-03-15  0:07 Stephen Rothwell
  2016-03-15  8:53 ` Gregory CLEMENT
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2016-03-15  0:07 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Thomas Petazzoni, Olof Johansson,
	Gregory CLEMENT, Marcin Wojtas

Hi all,

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

  arch/arm/boot/dts/armada-xp-db.dts
  arch/arm/boot/dts/armada-xp-gp.dts
  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

between commit:

  d7d5a43c0d16 ("ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window")

from Linus' tree and commits:

  9dd7a57e2cbf ("ARM: dts: armada-xp: enable buffer manager support on Armada XP boards")
  293fdc24fcc9 ("ARM: dts: armada-xp-openblocks-ax3-4: Add BM support")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/boot/dts/armada-xp-db.dts
index 45813a5526c8,30657302305d..000000000000
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@@ -76,8 -76,9 +76,9 @@@
  		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
  			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
  			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
 -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
- 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+ 			  MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
  
  		devbus-bootcs {
  			status = "okay";
@@@ -229,34 -242,10 +242,38 @@@
  					spi-max-frequency = <20000000>;
  				};
  			};
 +
 +			nand@d0000 {
 +				status = "okay";
 +				num-cs = <1>;
 +				marvell,nand-keep-config;
 +				marvell,nand-enable-arbiter;
 +				nand-on-flash-bbt;
 +
 +				partitions {
 +					compatible = "fixed-partitions";
 +					#address-cells = <1>;
 +					#size-cells = <1>;
 +
 +					partition@0 {
 +						label = "U-Boot";
 +						reg = <0 0x800000>;
 +					};
 +					partition@800000 {
 +						label = "Linux";
 +						reg = <0x800000 0x800000>;
 +					};
 +					partition@1000000 {
 +						label = "Filesystem";
 +						reg = <0x1000000 0x3f000000>;
 +
 +					};
 +				};
 +			};
  		};
+ 
+ 		bm-bppi {
+ 			status = "okay";
+ 		};
  	};
  };
diff --cc arch/arm/boot/dts/armada-xp-gp.dts
index 5730b875c4f5,a1ded01d0c07..000000000000
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@@ -95,8 -95,9 +95,9 @@@
  		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
  			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
  			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
 -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
- 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+ 			  MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
  
  		devbus-bootcs {
  			status = "okay";
diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 853bd392a4fe,3aa29a91c7b8..000000000000
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@@ -65,9 -65,10 +65,10 @@@
  	soc {
  		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
  			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
 -			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
 -			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +			  MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
 +			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
- 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+ 			  MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
  
  		devbus-bootcs {
  			status = "okay";

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2015-07-14  1:46 Stephen Rothwell
@ 2015-07-14  8:23 ` Nikolay Aleksandrov
  0 siblings, 0 replies; 69+ messages in thread
From: Nikolay Aleksandrov @ 2015-07-14  8:23 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, netdev; +Cc: linux-next, linux-kernel

On 07/14/2015 03:46 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   net/bridge/br_mdb.c
> 
> between commit:
> 
>   f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use")
> 
> from Linus' tree and commit:
> 
>   74fe61f17e99 ("bridge: mdb: add vlan support for user entries")
> 
> from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Looks good to me, thanks Stephen!

Cheers,
 Nik

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2015-07-14  1:46 Stephen Rothwell
  2015-07-14  8:23 ` Nikolay Aleksandrov
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2015-07-14  1:46 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Nikolay Aleksandrov

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

Hi all,

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

  net/bridge/br_mdb.c

between commit:

  f1158b74e54f ("bridge: mdb: zero out the local br_ip variable before use")

from Linus' tree and commit:

  74fe61f17e99 ("bridge: mdb: add vlan support for user entries")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc net/bridge/br_mdb.c
index c11cf2611db0,a8d0e93d43f2..000000000000
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@@ -348,10 -352,8 +353,10 @@@ static int br_mdb_add_group(struct net_
  	if (unlikely(!p))
  		return -ENOMEM;
  	rcu_assign_pointer(*pp, p);
 +	if (state == MDB_TEMPORARY)
 +		mod_timer(&p->timer, now + br->multicast_membership_interval);
  
- 	br_mdb_notify(br->dev, port, group, RTM_NEWMDB);
+ 	br_mdb_notify(br->dev, port, group, RTM_NEWMDB, state);
  	return 0;
  }
  
@@@ -374,7 -376,7 +379,8 @@@ static int __br_mdb_add(struct net *net
  	if (!p || p->br != br || p->state == BR_STATE_DISABLED)
  		return -EINVAL;
  
 +	memset(&ip, 0, sizeof(ip));
+ 	ip.vid = entry->vid;
  	ip.proto = entry->addr.proto;
  	if (ip.proto == htons(ETH_P_IP))
  		ip.u.ip4 = entry->addr.u.ip4;
@@@ -421,14 -423,21 +427,15 @@@ static int __br_mdb_del(struct net_brid
  	if (!netif_running(br->dev) || br->multicast_disabled)
  		return -EINVAL;
  
 +	memset(&ip, 0, sizeof(ip));
+ 	ip.vid = entry->vid;
  	ip.proto = entry->addr.proto;
 -	if (ip.proto == htons(ETH_P_IP)) {
 -		if (timer_pending(&br->ip4_other_query.timer))
 -			return -EBUSY;
 -
 +	if (ip.proto == htons(ETH_P_IP))
  		ip.u.ip4 = entry->addr.u.ip4;
  #if IS_ENABLED(CONFIG_IPV6)
 -	} else {
 -		if (timer_pending(&br->ip6_other_query.timer))
 -			return -EBUSY;
 -
 +	else
  		ip.u.ip6 = entry->addr.u.ip6;
  #endif
 -	}
  
  	spin_lock_bh(&br->multicast_lock);
  	mdb = mlock_dereference(br->mdb, br);

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2015-05-28  4:17 Stephen Rothwell
@ 2015-05-28 13:34 ` Tom Lendacky
  0 siblings, 0 replies; 69+ messages in thread
From: Tom Lendacky @ 2015-05-28 13:34 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, netdev; +Cc: linux-next, linux-kernel

On 05/27/2015 11:17 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca
> ("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus'
> tree and commit 7c12aa08779c ("amd-xgbe: Move the PHY support into
> amd-xgbe") from the net-next tree.
>
> I fixed it up (the latter removed the file, so I did that - there may
> be more needed) and can carry the fix as necessary (no action is
> required).

I looked over the tree and it appears that everything is good. Deleting
the file is the correct action and it looks like the necessary changes
to the Makefiles and Kconfigs are present to account for that.

Thanks,
Tom

>

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2015-05-28  4:17 Stephen Rothwell
  2015-05-28 13:34 ` Tom Lendacky
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2015-05-28  4:17 UTC (permalink / raw)
  To: David Miller, netdev, Lendacky, Thomas; +Cc: linux-next, linux-kernel

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca
("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus'
tree and commit 7c12aa08779c ("amd-xgbe: Move the PHY support into
amd-xgbe") from the net-next tree.

I fixed it up (the latter removed the file, so I did that - there may
be more needed) and can carry the fix as necessary (no action is
required).

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

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

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

* linux-next: manual merge of the net-next tree with Linus'  tree
@ 2015-02-12  1:05 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2015-02-12  1:05 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Linus Torvalds, Al Viro

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
crypto/af_alg.c between commit 9399f0c51489 ("crypto: fix
af_alg_make_sg() conversion to iov_iter") from Linus' tree and commit
750d8065d88b ("crypto: Fix regressions caused by iov_iter changes")
from the net-next tree.

I fixed it up (I used the net-next tree version (for no particular
reason)) and can carry the fix as necessary (no action is required).

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

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2014-06-12  2:01 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2014-06-12  2:01 UTC (permalink / raw)
  To: David Miller, netdev, Roland Dreier, linux-rdma
  Cc: linux-next, linux-kernel, Steve Wise, Hariprasad Shenai

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/infiniband/hw/cxgb4/cm.c between commits 11b8e22d4d09
("RDMA/cxgb4: Fix vlan support") and 9eccfe109b27 ("RDMA/cxgb4: Add
support for iWARP Port Mapper user space service") from Linus' tree and
commits 92e7ae71726c ("iw_cxgb4: Choose appropriate hw mtu index and
ISS for iWARP connections") and b408ff282dda ("iw_cxgb4: don't truncate
the recv window size") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/infiniband/hw/cxgb4/cm.c
index 96d7131ab974,965eaafd5851..000000000000
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@@ -533,38 -532,17 +537,49 @@@ static int send_abort(struct c4iw_ep *e
  	return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);
  }
  
 +/*
 + * c4iw_form_pm_msg - Form a port mapper message with mapping info
 + */
 +static void c4iw_form_pm_msg(struct c4iw_ep *ep,
 +				struct iwpm_sa_data *pm_msg)
 +{
 +	memcpy(&pm_msg->loc_addr, &ep->com.local_addr,
 +		sizeof(ep->com.local_addr));
 +	memcpy(&pm_msg->rem_addr, &ep->com.remote_addr,
 +		sizeof(ep->com.remote_addr));
 +}
 +
 +/*
 + * c4iw_form_reg_msg - Form a port mapper message with dev info
 + */
 +static void c4iw_form_reg_msg(struct c4iw_dev *dev,
 +				struct iwpm_dev_data *pm_msg)
 +{
 +	memcpy(pm_msg->dev_name, dev->ibdev.name, IWPM_DEVNAME_SIZE);
 +	memcpy(pm_msg->if_name, dev->rdev.lldi.ports[0]->name,
 +				IWPM_IFNAME_SIZE);
 +}
 +
 +static void c4iw_record_pm_msg(struct c4iw_ep *ep,
 +			struct iwpm_sa_data *pm_msg)
 +{
 +	memcpy(&ep->com.mapped_local_addr, &pm_msg->mapped_loc_addr,
 +		sizeof(ep->com.mapped_local_addr));
 +	memcpy(&ep->com.mapped_remote_addr, &pm_msg->mapped_rem_addr,
 +		sizeof(ep->com.mapped_remote_addr));
 +}
 +
+ static void best_mtu(const unsigned short *mtus, unsigned short mtu,
+ 		     unsigned int *idx, int use_ts)
+ {
+ 	unsigned short hdr_size = sizeof(struct iphdr) +
+ 				  sizeof(struct tcphdr) +
+ 				  (use_ts ? 12 : 0);
+ 	unsigned short data_size = mtu - hdr_size;
+ 
+ 	cxgb4_best_aligned_mtu(mtus, hdr_size, data_size, 8, idx);
+ }
+ 
  static int send_connect(struct c4iw_ep *ep)
  {
  	struct cpl_act_open_req *req;
@@@ -583,14 -561,11 +598,15 @@@
  	int sizev6 = is_t4(ep->com.dev->rdev.lldi.adapter_type) ?
  				sizeof(struct cpl_act_open_req6) :
  				sizeof(struct cpl_t5_act_open_req6);
 -	struct sockaddr_in *la = (struct sockaddr_in *)&ep->com.local_addr;
 -	struct sockaddr_in *ra = (struct sockaddr_in *)&ep->com.remote_addr;
 -	struct sockaddr_in6 *la6 = (struct sockaddr_in6 *)&ep->com.local_addr;
 -	struct sockaddr_in6 *ra6 = (struct sockaddr_in6 *)&ep->com.remote_addr;
 +	struct sockaddr_in *la = (struct sockaddr_in *)
 +				 &ep->com.mapped_local_addr;
 +	struct sockaddr_in *ra = (struct sockaddr_in *)
 +				 &ep->com.mapped_remote_addr;
 +	struct sockaddr_in6 *la6 = (struct sockaddr_in6 *)
 +				   &ep->com.mapped_local_addr;
 +	struct sockaddr_in6 *ra6 = (struct sockaddr_in6 *)
 +				   &ep->com.mapped_remote_addr;
+ 	int win;
  
  	wrlen = (ep->com.remote_addr.ss_family == AF_INET) ?
  			roundup(sizev4, 16) :
@@@ -1796,7 -1821,8 +1862,8 @@@ static int import_ep(struct c4iw_ep *ep
  		step = cdev->rdev.lldi.nrxq /
  			cdev->rdev.lldi.nchan;
  		ep->rss_qid = cdev->rdev.lldi.rxq_ids[
 -			cxgb4_port_idx(n->dev) * step];
 +			cxgb4_port_idx(pdev) * step];
+ 		set_tcp_window(ep, (struct port_info *)netdev_priv(pdev));
  
  		if (clear_mpa_v1) {
  			ep->retry_with_mpa_v1 = 0;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* RE: linux-next: manual merge of the net-next tree with Linus' tree
  2014-06-05  3:13 Stephen Rothwell
@ 2014-06-05  3:26 ` KY Srinivasan
  0 siblings, 0 replies; 69+ messages in thread
From: KY Srinivasan @ 2014-06-05  3:26 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, netdev
  Cc: linux-next, linux-kernel, Greg Kroah-Hartman, stephen hemminger



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Wednesday, June 4, 2014 8:14 PM
> To: David Miller; netdev@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; KY Srinivasan;
> Greg Kroah-Hartman; stephen hemminger
> Subject: linux-next: manual merge of the net-next tree with Linus' tree
> 
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
> Eliminate the channel spinlock in the callback path") from Linus' tree and
> commit 1b9d48f2a579 ("hyper-v: make uuid_le const") from the net-next
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action is
> required).

Thanks Stephen.

Regards,

K. Y
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/hv/channel_mgmt.c
> index 6c8b032cacba,90d654556437..000000000000
> --- a/drivers/hv/channel_mgmt.c
> +++ b/drivers/hv/channel_mgmt.c
> @@@ -404,7 -365,7 +404,7 @@@ static u32  next_vp
>    * performance critical channels (IDE, SCSI and Network) will be uniformly
>    * distributed across all available CPUs.
>    */
> - static void init_vp_index(struct vmbus_channel *channel, uuid_le
> *type_guid)  -static u32 get_vp_index(const uuid_le *type_guid)
> ++static void init_vp_index(struct vmbus_channel *channel, const uuid_le
> ++*type_guid)
>   {
>   	u32 cur_cpu;
>   	int i;

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2014-06-05  3:13 Stephen Rothwell
  2014-06-05  3:26 ` KY Srinivasan
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2014-06-05  3:13 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, K. Y. Srinivasan, Greg Kroah-Hartman,
	stephen hemminger

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/hv/channel_mgmt.c between commit d3ba720dd58c ("Drivers: hv:
Eliminate the channel spinlock in the callback path") from Linus' tree
and commit 1b9d48f2a579 ("hyper-v: make uuid_le const") from the
net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/hv/channel_mgmt.c
index 6c8b032cacba,90d654556437..000000000000
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@@ -404,7 -365,7 +404,7 @@@ static u32  next_vp
   * performance critical channels (IDE, SCSI and Network) will be uniformly
   * distributed across all available CPUs.
   */
- static void init_vp_index(struct vmbus_channel *channel, uuid_le *type_guid)
 -static u32 get_vp_index(const uuid_le *type_guid)
++static void init_vp_index(struct vmbus_channel *channel, const uuid_le *type_guid)
  {
  	u32 cur_cpu;
  	int i;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-12-18  1:56 ` Jeff Kirsher
@ 2013-12-18  2:19   ` Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-12-18  2:19 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: David Miller, netdev, linux-next, linux-kernel, Jesse Brandeburg,
	Anjali Singhai Jain

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

Hi Jeff,

On Tue, 17 Dec 2013 17:56:09 -0800 Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote:
>
> Your fix is fine, what I have in my tree is the following, so if you
> want to modify your change so that the resultant code looks like this:
> 
>         struct rtnl_link_stats64 *vsi_stats =
> i40e_get_vsi_stats_struct(vsi);
>         int i;
>   
>         if (test_bit(__I40E_DOWN, &vsi->state))
>                return stats;
> 
>         if (!vsi->tx_rings)
>                return stats;
>   
>         rcu_read_lock();
>         for (i = 0; i < vsi->num_queue_pairs; i++) {

OK, I updated my rerere cache, so it will look like that tomorrow.

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

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-12-18  1:46 Stephen Rothwell
@ 2013-12-18  1:56 ` Jeff Kirsher
  2013-12-18  2:19   ` Stephen Rothwell
  0 siblings, 1 reply; 69+ messages in thread
From: Jeff Kirsher @ 2013-12-18  1:56 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Jesse Brandeburg,
	Anjali Singhai Jain

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

On Wed, 2013-12-18 at 12:46 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/i40e/i40e_main.c between commit 3c325ced6aef
> ("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
> ("i40e: reinit flow for the main VSI") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Your fix is fine, what I have in my tree is the following, so if you
want to modify your change so that the resultant code looks like this:

        struct rtnl_link_stats64 *vsi_stats =
i40e_get_vsi_stats_struct(vsi);
        int i;
  
        if (test_bit(__I40E_DOWN, &vsi->state))
               return stats;

        if (!vsi->tx_rings)
               return stats;
  
        rcu_read_lock();
        for (i = 0; i < vsi->num_queue_pairs; i++) {

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-12-18  1:46 Stephen Rothwell
  2013-12-18  1:56 ` Jeff Kirsher
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-12-18  1:46 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jesse Brandeburg, Jeff Kirsher,
	Anjali Singhai Jain

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/i40e/i40e_main.c between commit 3c325ced6aef
("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
("i40e: reinit flow for the main VSI") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 12b0932204ba,fba0aada062a..000000000000
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -354,8 -354,8 +354,10 @@@ static struct rtnl_link_stats64 *i40e_g
  	struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);
  	int i;
  
 +	if (!vsi->tx_rings)
 +		return stats;
+ 	if (test_bit(__I40E_DOWN, &vsi->state))
+ 		return stats;
  
  	rcu_read_lock();
  	for (i = 0; i < vsi->num_queue_pairs; i++) {

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-09-05  5:19 Stephen Rothwell
@ 2013-09-05  7:33 ` Daniel Borkmann
  0 siblings, 0 replies; 69+ messages in thread
From: Daniel Borkmann @ 2013-09-05  7:33 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel

On 09/05/2013 07:19 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/bridge/br_multicast.c between commit 2d98c29b6fb3 ("net: bridge:
> convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus'
> tree and commit e3f5b17047de ("net: ipv6: mld: get rid of MLDV2_MRC and
> simplify calculation") from the net-next tree.
>
> I just used the net-next tree version and can carry the fix as necessary
> (no action is required).

Sounds good thanks Stephen!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-09-05  5:23 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-09-05  5:23 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Hannes Frederic Sowa, Nicolas Dichtel

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv6/sit.c between commit 3d483058c8c8 ("ipv6: wire up
skb->encapsulation") from Linus' tree and commit 8b7ed2d91d6a
("iptunnels: remove net arg from iptunnel_xmit()") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc net/ipv6/sit.c
index 21b25dd,19abcc9..0000000
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@@ -886,13 -881,8 +879,13 @@@ static netdev_tx_t ipip6_tunnel_xmit(st
  		ttl = iph6->hop_limit;
  	tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
  
 +	if (likely(!skb->encapsulation)) {
 +		skb_reset_inner_headers(skb);
 +		skb->encapsulation = 1;
 +	}
 +
- 	err = iptunnel_xmit(dev_net(dev), rt, skb, fl4.saddr, fl4.daddr,
- 			    IPPROTO_IPV6, tos, ttl, df);
+ 	err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, IPPROTO_IPV6, tos,
+ 			    ttl, df, !net_eq(tunnel->net, dev_net(dev)));
  	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
  	return NETDEV_TX_OK;
  

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-09-05  5:19 Stephen Rothwell
  2013-09-05  7:33 ` Daniel Borkmann
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-09-05  5:19 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Daniel Borkmann

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/bridge/br_multicast.c between commit 2d98c29b6fb3 ("net: bridge:
convert MLDv2 Query MRC into msecs_to_jiffies for max_delay") from Linus'
tree and commit e3f5b17047de ("net: ipv6: mld: get rid of MLDV2_MRC and
simplify calculation") from the net-next tree.

I just used the net-next tree version and can carry the fix as necessary
(no action is required).


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

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-09-02  3:12 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-09-02  3:12 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Byungho An, Sonic Zhang

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c between commit
64c3b252e9fc ("net: stmmac: fixed the pbl setting with DT") from the
tree and commit e2a240c7d3bc ("driver:net:stmmac: Disable DMA store and
forward mode if platform data force_thresh_dma_mode is set") from the
net-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary (no
action is required).


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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 1c83a44,623ebc5..0000000
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@@ -71,18 -71,19 +71,23 @@@ static int stmmac_probe_config_dt(struc
  		plat->force_sf_dma_mode = 1;
  	}
  
 -	dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg), GFP_KERNEL);
 -	if (!dma_cfg)
 -		return -ENOMEM;
 -
 -	plat->dma_cfg = dma_cfg;
 -	of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
 -	dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
 -	dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst");
 +	if (of_find_property(np, "snps,pbl", NULL)) {
 +		dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
 +				       GFP_KERNEL);
 +		if (!dma_cfg)
 +			return -ENOMEM;
 +		plat->dma_cfg = dma_cfg;
 +		of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
 +		dma_cfg->fixed_burst =
 +			of_property_read_bool(np, "snps,fixed-burst");
 +		dma_cfg->mixed_burst =
 +			of_property_read_bool(np, "snps,mixed-burst");
 +	}
+ 	plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
+ 	if (plat->force_thresh_dma_mode) {
+ 		plat->force_sf_dma_mode = 0;
+ 		pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");
+ 	}
  
  	return 0;
  }

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-06-17  2:44 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-06-17  2:44 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Antonio Quartulli, Marek Lindner,
	Simon Wunderlich

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/batman-adv/bat_iv_ogm.c between commit 7c24bbbeab41 ("batman-adv:
forward late OGMs from best next hop") from Linus' tree and commit
24a5deeb8a19 ("batman-adv: move ring_buffer helper functions in
bat_iv_ogm") from the net-next tree.

I fixed it up (as specified in your email (thanks) - see below) and can
carry the fix as necessary (no action is required).

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

diff --cc net/batman-adv/bat_iv_ogm.c
index f680ee1,d07323b..0000000
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@@ -30,20 -29,47 +29,63 @@@
  #include "network-coding.h"
  
  /**
 + * batadv_dup_status - duplicate status
 + * @BATADV_NO_DUP: the packet is a duplicate
 + * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
 + *  neighbor)
 + * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor
 + * @BATADV_PROTECTED: originator is currently protected (after reboot)
 + */
 +enum batadv_dup_status {
 +	BATADV_NO_DUP = 0,
 +	BATADV_ORIG_DUP,
 +	BATADV_NEIGH_DUP,
 +	BATADV_PROTECTED,
 +};
 +
++/**
+  * batadv_ring_buffer_set - update the ring buffer with the given value
+  * @lq_recv: pointer to the ring buffer
+  * @lq_index: index to store the value at
+  * @value: value to store in the ring buffer
+  */
+ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
+ 				   uint8_t value)
+ {
+ 	lq_recv[*lq_index] = value;
+ 	*lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;
+ }
+ 
+ /**
+  * batadv_ring_buffer_set - compute the average of all non-zero values stored
+  * in the given ring buffer
+  * @lq_recv: pointer to the ring buffer
+  *
+  * Returns computed average value.
+  */
+ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
+ {
+ 	const uint8_t *ptr;
+ 	uint16_t count = 0, i = 0, sum = 0;
+ 
+ 	ptr = lq_recv;
+ 
+ 	while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {
+ 		if (*ptr != 0) {
+ 			count++;
+ 			sum += *ptr;
+ 		}
+ 
+ 		i++;
+ 		ptr++;
+ 	}
+ 
+ 	if (count == 0)
+ 		return 0;
+ 
+ 	return (uint8_t)(sum / count);
+ }
++
  static struct batadv_neigh_node *
  batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
  			const uint8_t *neigh_addr,
@@@ -1013,11 -1062,10 +1085,11 @@@ static void batadv_iv_ogm_process(cons
  	struct batadv_neigh_node *orig_neigh_router = NULL;
  	int has_directlink_flag;
  	int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
- 	int is_broadcast = 0, is_bidirect;
+ 	int is_bidirect;
  	bool is_single_hop_neigh = false;
  	bool is_from_best_next_hop = false;
 -	int is_duplicate, sameseq, simlar_ttl;
 +	int sameseq, similar_ttl;
 +	enum batadv_dup_status dup_status;
  	uint32_t if_incoming_seqno;
  	uint8_t *prev_sender;
  

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-06-17  2:38 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-06-17  2:38 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jan Beulich, Wei Liu

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/xen-netback/netback.c between commit 94f950c4060c
("xen-netback: don't de-reference vif pointer after having called
xenvif_put()") from Linus' tree and commit e1f00a69ec26 ("xen-netback:
split event channels support for Xen backend driver") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/net/xen-netback/netback.c
index 8c20935,82576ff..0000000
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -783,9 -789,8 +790,9 @@@ static void xen_netbk_rx_action(struct 
  	}
  
  	list_for_each_entry_safe(vif, tmp, &notify, notify_list) {
- 		notify_remote_via_irq(vif->irq);
+ 		notify_remote_via_irq(vif->rx_irq);
  		list_del_init(&vif->notify_list);
 +		xenvif_put(vif);
  	}
  
  	/* More work to do? */

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-04-22  3:09 Stephen Rothwell
@ 2013-04-23  0:42 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2013-04-23  0:42 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, torvalds, ebiederm

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 13:09:39 +1000

> Today's linux-next merge of the net-next tree got a conflict in
> include/net/scm.h between commit 83f1b4ba917d ("net: fix incorrect
> credentials passing") from Linus' tree and commit 6b0ee8c036ec ("scm:
> Stop passing struct cred") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).  I also applied the following merge fix patch (I am not
> sure if this is correct, but it seems to be consistent):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 22 Apr 2013 13:06:10 +1000
> Subject: [PATCH] net: af_unix fix for incorrect credentials passing
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

I took care of this during the net --> net-next merge, thanks!

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-04-22  3:03 Stephen Rothwell
@ 2013-04-23  0:41 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2013-04-23  0:41 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, edumazet, nanditad

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 13:03:24 +1000

> Today's linux-next merge of the net-next tree got a conflict in
> net/ipv4/tcp_input.c between commit 12fb3dd9dc3c ("tcp: call
> tcp_replace_ts_recent() from tcp_ack()") from Linus' tree and commit
> 9b717a8d2450 ("tcp: TLP loss detection") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I took care of this during the net --> net-next merge, thanks!

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-04-22  2:43 Stephen Rothwell
@ 2013-04-23  0:41 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2013-04-23  0:41 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ivecera, kaber

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 12:43:34 +1000

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
> ("be2net: take care of __vlan_put_tag return value") from Linus' tree and
> commit 86a9bad3ab6b ("net: vlan: add protocol argument to packet tagging
> functions") from the net-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I took care of this during the net --> net-next merge, thanks!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-04-22  3:09 Stephen Rothwell
  2013-04-23  0:42 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-04-22  3:09 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Linus Torvalds, Eric W. Biederman

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/net/scm.h between commit 83f1b4ba917d ("net: fix incorrect
credentials passing") from Linus' tree and commit 6b0ee8c036ec ("scm:
Stop passing struct cred") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  I also applied the following merge fix patch (I am not
sure if this is correct, but it seems to be consistent):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 13:06:10 +1000
Subject: [PATCH] net: af_unix fix for incorrect credentials passing

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/unix/af_unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 5ca1631..9efe011 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1414,7 +1414,7 @@ static void maybe_add_creds(struct sk_buff *skb, const struct socket *sock,
 	    !other->sk_socket ||
 	    test_bit(SOCK_PASSCRED, &other->sk_socket->flags)) {
 		UNIXCB(skb).pid  = get_pid(task_tgid(current));
-		current_euid_egid(&UNIXCB(skb).uid, &UNIXCB(skb).gid);
+		current_uid_gid(&UNIXCB(skb).uid, &UNIXCB(skb).gid);
 	}
 }
 
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/net/scm.h
index b117081,5a4c6a9..0000000
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@@ -81,8 -75,10 +75,10 @@@ static __inline__ int scm_send(struct s
  			       struct scm_cookie *scm, bool forcecreds)
  {
  	memset(scm, 0, sizeof(*scm));
+ 	scm->creds.uid = INVALID_UID;
+ 	scm->creds.gid = INVALID_GID;
  	if (forcecreds)
- 		scm_set_cred(scm, task_tgid(current), current_cred());
 -		scm_set_cred(scm, task_tgid(current), current_euid(), current_egid());
++		scm_set_cred(scm, task_tgid(current), current_uid(), current_gid());
  	unix_get_peersec_dgram(sock, scm);
  	if (msg->msg_controllen <= 0)
  		return 0;

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-04-22  3:03 Stephen Rothwell
  2013-04-23  0:41 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-04-22  3:03 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Eric Dumazet, Nandita Dukkipati

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/ipv4/tcp_input.c between commit 12fb3dd9dc3c ("tcp: call
tcp_replace_ts_recent() from tcp_ack()") from Linus' tree and commit
9b717a8d2450 ("tcp: TLP loss detection") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc net/ipv4/tcp_input.c
index 13b9c08,6d9ca35..0000000
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@@ -108,12 -107,10 +107,11 @@@ int sysctl_tcp_early_retrans __read_mos
  #define FLAG_DATA_SACKED	0x20 /* New SACK.				*/
  #define FLAG_ECE		0x40 /* ECE in this ACK				*/
  #define FLAG_SLOWPATH		0x100 /* Do not skip RFC checks for window update.*/
- #define FLAG_ONLY_ORIG_SACKED	0x200 /* SACKs only non-rexmit sent before RTO */
+ #define FLAG_ORIG_SACK_ACKED	0x200 /* Never retransmitted data are (s)acked	*/
  #define FLAG_SND_UNA_ADVANCED	0x400 /* Snd_una was changed (!= FLAG_DATA_ACKED) */
  #define FLAG_DSACKING_ACK	0x800 /* SACK blocks contained D-SACK info */
- #define FLAG_NONHEAD_RETRANS_ACKED	0x1000 /* Non-head rexmitted data was ACKed */
  #define FLAG_SACK_RENEGING	0x2000 /* snd_una advanced to a sacked seq */
 +#define FLAG_UPDATE_TS_RECENT	0x4000 /* tcp_replace_ts_recent() */
  
  #define FLAG_ACKED		(FLAG_DATA_ACKED|FLAG_SYN_ACKED)
  #define FLAG_NOT_DUP		(FLAG_DATA|FLAG_WIN_UPDATE|FLAG_ACKED)
@@@ -3565,27 -3265,38 +3266,59 @@@ static void tcp_send_challenge_ack(stru
  	}
  }
  
 +static void tcp_store_ts_recent(struct tcp_sock *tp)
 +{
 +	tp->rx_opt.ts_recent = tp->rx_opt.rcv_tsval;
 +	tp->rx_opt.ts_recent_stamp = get_seconds();
 +}
 +
 +static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)
 +{
 +	if (tp->rx_opt.saw_tstamp && !after(seq, tp->rcv_wup)) {
 +		/* PAWS bug workaround wrt. ACK frames, the PAWS discard
 +		 * extra check below makes sure this can only happen
 +		 * for pure ACK frames.  -DaveM
 +		 *
 +		 * Not only, also it occurs for expired timestamps.
 +		 */
 +
 +		if (tcp_paws_check(&tp->rx_opt, 0))
 +			tcp_store_ts_recent(tp);
 +	}
 +}
 +
+ /* This routine deals with acks during a TLP episode.
+  * Ref: loss detection algorithm in draft-dukkipati-tcpm-tcp-loss-probe.
+  */
+ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
+ {
+ 	struct tcp_sock *tp = tcp_sk(sk);
+ 	bool is_tlp_dupack = (ack == tp->tlp_high_seq) &&
+ 			     !(flag & (FLAG_SND_UNA_ADVANCED |
+ 				       FLAG_NOT_DUP | FLAG_DATA_SACKED));
+ 
+ 	/* Mark the end of TLP episode on receiving TLP dupack or when
+ 	 * ack is after tlp_high_seq.
+ 	 */
+ 	if (is_tlp_dupack) {
+ 		tp->tlp_high_seq = 0;
+ 		return;
+ 	}
+ 
+ 	if (after(ack, tp->tlp_high_seq)) {
+ 		tp->tlp_high_seq = 0;
+ 		/* Don't reduce cwnd if DSACK arrives for TLP retrans. */
+ 		if (!(flag & FLAG_DSACKING_ACK)) {
+ 			tcp_init_cwnd_reduction(sk, true);
+ 			tcp_set_ca_state(sk, TCP_CA_CWR);
+ 			tcp_end_cwnd_reduction(sk);
+ 			tcp_set_ca_state(sk, TCP_CA_Open);
+ 			NET_INC_STATS_BH(sock_net(sk),
+ 					 LINUX_MIB_TCPLOSSPROBERECOVERY);
+ 		}
+ 	}
+ }
+ 
  /* This routine deals with incoming acks, but not outgoing ones. */
  static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
  {

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-04-22  2:48 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2013-04-22  2:48 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Alexander Duyck, Jeff Kirsher

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/igb/igb_main.c between commit f9d40f6a9921
("igb: Revert support for build_skb in igb") from Linus' tree and commit
b980ac18c95f ("igb: Fix code comments and whitespace") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
index 64f7529,9bf08b9..0000000
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@@ -3350,11 -3387,25 +3387,11 @@@ void igb_configure_rx_ring(struct igb_a
  	wr32(E1000_RXDCTL(reg_idx), rxdctl);
  }
  
 -static void igb_set_rx_buffer_len(struct igb_adapter *adapter,
 -				  struct igb_ring *rx_ring)
 -{
 -#define IGB_MAX_BUILD_SKB_SIZE \
 -	(SKB_WITH_OVERHEAD(IGB_RX_BUFSZ) - \
 -	 (NET_SKB_PAD + NET_IP_ALIGN + IGB_TS_HDR_LEN))
 -
 -	/* set build_skb flag */
 -	if (adapter->max_frame_size <= IGB_MAX_BUILD_SKB_SIZE)
 -		set_ring_build_skb_enabled(rx_ring);
 -	else
 -		clear_ring_build_skb_enabled(rx_ring);
 -}
 -
  /**
-  * igb_configure_rx - Configure receive Unit after Reset
-  * @adapter: board private structure
+  *  igb_configure_rx - Configure receive Unit after Reset
+  *  @adapter: board private structure
   *
-  * Configure the Rx unit of the MAC after a reset.
+  *  Configure the Rx unit of the MAC after a reset.
   **/
  static void igb_configure_rx(struct igb_adapter *adapter)
  {
@@@ -3365,12 -3416,16 +3402,13 @@@
  
  	/* set the correct pool for the PF default MAC address in entry 0 */
  	igb_rar_set_qsel(adapter, adapter->hw.mac.addr, 0,
- 	                 adapter->vfs_allocated_count);
+ 			 adapter->vfs_allocated_count);
  
  	/* Setup the HW Rx Head and Tail Descriptor Pointers and
- 	 * the Base and Length of the Rx Descriptor Ring */
+ 	 * the Base and Length of the Rx Descriptor Ring
+ 	 */
 -	for (i = 0; i < adapter->num_rx_queues; i++) {
 -		struct igb_ring *rx_ring = adapter->rx_ring[i];
 -		igb_set_rx_buffer_len(adapter, rx_ring);
 -		igb_configure_rx_ring(adapter, rx_ring);
 -	}
 +	for (i = 0; i < adapter->num_rx_queues; i++)
 +		igb_configure_rx_ring(adapter, adapter->rx_ring[i]);
  }
  
  /**
@@@ -6688,9 -6808,17 +6716,9 @@@ static bool igb_alloc_mapped_page(struc
  	return true;
  }
  
 -static inline unsigned int igb_rx_offset(struct igb_ring *rx_ring)
 -{
 -	if (ring_uses_build_skb(rx_ring))
 -		return NET_SKB_PAD + NET_IP_ALIGN;
 -	else
 -		return 0;
 -}
 -
  /**
-  * igb_alloc_rx_buffers - Replace used receive buffers; packet split
-  * @adapter: address of board private structure
+  *  igb_alloc_rx_buffers - Replace used receive buffers; packet split
+  *  @adapter: address of board private structure
   **/
  void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
  {
@@@ -6710,11 -6838,12 +6738,10 @@@
  		if (!igb_alloc_mapped_page(rx_ring, bi))
  			break;
  
- 		/*
- 		 * Refresh the desc even if buffer_addrs didn't change
+ 		/* Refresh the desc even if buffer_addrs didn't change
  		 * because each write-back erases this info.
  		 */
 -		rx_desc->read.pkt_addr = cpu_to_le64(bi->dma +
 -						     bi->page_offset +
 -						     igb_rx_offset(rx_ring));
 +		rx_desc->read.pkt_addr = cpu_to_le64(bi->dma + bi->page_offset);
  
  		rx_desc++;
  		bi++;

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-04-22  2:43 Stephen Rothwell
  2013-04-23  0:41 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-04-22  2:43 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Ivan Vecera, Patrick McHardy

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
("be2net: take care of __vlan_put_tag return value") from Linus' tree and
commit 86a9bad3ab6b ("net: vlan: add protocol argument to packet tagging
functions") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
index 2886c9b,811d0a4..0000000
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@@ -759,9 -771,8 +771,9 @@@ static struct sk_buff *be_insert_vlan_i
  
  	if (vlan_tx_tag_present(skb)) {
  		vlan_tag = be_get_tx_vlan_tag(adapter, skb);
- 		skb = __vlan_put_tag(skb, vlan_tag);
 -		__vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 -		skb->vlan_tci = 0;
++		skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 +		if (skb)
 +			skb->vlan_tci = 0;
  	}
  
  	return skb;

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-03-27  0:57 Stephen Rothwell
@ 2013-03-27  4:54 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2013-03-27  4:54 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, pshelar

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Mar 2013 11:57:43 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> include/net/ipip.h between commit 330305cc4a6b ("pv4: Fix ip-header
> identification for gso packets") from Linus' tree and commit c54419321455
> ("GRE: Refactor GRE tunneling code") from the net-next tree.
> 
> I just dropped the file (as the latter change did) and can carry the fix
> as necessary (no action is required).

Thanks, I'll take care of this when I next merge.

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-03-27  0:57 Stephen Rothwell
  2013-03-27  4:54 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-03-27  0:57 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Pravin B Shelar

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
include/net/ipip.h between commit 330305cc4a6b ("pv4: Fix ip-header
identification for gso packets") from Linus' tree and commit c54419321455
("GRE: Refactor GRE tunneling code") from the net-next tree.

I just dropped the file (as the latter change did) and can carry the fix
as necessary (no action is required).

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

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2013-03-12  0:33 Stephen Rothwell
@ 2013-03-12 10:49 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2013-03-12 10:49 UTC (permalink / raw)
  To: sfr
  Cc: netdev, linux-next, linux-kernel, khlebnikov, jeffrey.t.kirsher,
	bruce.w.allan

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 Mar 2013 11:33:20 +1100

> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/e1000e/netdev.c between commits 4e0855dff094
> ("e1000e: fix pci-device enable-counter balance") and 66148babe728
> ("e1000e: fix runtime power management transitions") from Linus' tree and
> commit f0ff439872e1 ("e1000e: cleanup CODE_INDENT checkpatch errors")
> from the net-next tree.
> 
> The former removed the line fixed by the latter, so I did that and can
> carry the fix as necessary (no action is required).

I've just merged 'net' into 'net-next' and resolved this merge conflict.

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2013-03-12  0:33 Stephen Rothwell
  2013-03-12 10:49 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2013-03-12  0:33 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Konstantin Khlebnikov, Jeff Kirsher,
	Bruce Allan

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/e1000e/netdev.c between commits 4e0855dff094
("e1000e: fix pci-device enable-counter balance") and 66148babe728
("e1000e: fix runtime power management transitions") from Linus' tree and
commit f0ff439872e1 ("e1000e: cleanup CODE_INDENT checkpatch errors")
from the net-next tree.

The former removed the line fixed by the latter, so I did that and can
carry the fix as necessary (no action is required).

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

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2012-11-08 23:53 Stephen Rothwell
@ 2012-11-10 23:34 ` David Miller
  0 siblings, 0 replies; 69+ messages in thread
From: David Miller @ 2012-11-10 23:34 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, meravs, dmitry, eilong

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Nov 2012 10:53:18 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
> 477864ddd365 ("bnx2x: Disable FCoE for 57840 since not yet supported by
> FW") from Linus' tree and commit 55c11941e382 ("bnx2x: Support loading
> cnic resources at run-time") from the net-next tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

I'm pulling 'net' into 'net-next' and this is exactly how I will resolve
this conflict.  Thanks Stephen.

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2012-11-08 23:53 Stephen Rothwell
  2012-11-10 23:34 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2012-11-08 23:53 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Merav Sicron, Dmitry Kravkov, Eilon Greenstein

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
477864ddd365 ("bnx2x: Disable FCoE for 57840 since not yet supported by
FW") from Linus' tree and commit 55c11941e382 ("bnx2x: Support loading
cnic resources at run-time") from the net-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index bd1fd3d,0546cf4..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -11899,22 -12065,10 +12066,20 @@@ static int __devinit bnx2x_init_one(str
  	/* calc qm_cid_count */
  	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
  
- #ifdef BCM_CNIC
- 	/* disable FCOE L2 queue for E1x */
+ 	/* disable FCOE L2 queue for E1x*/
  	if (CHIP_IS_E1x(bp))
  		bp->flags |= NO_FCOE_FLAG;
+ 
 +	/* disable FCOE for 57840 device, until FW supports it */
 +	switch (ent->driver_data) {
 +	case BCM57840_O:
 +	case BCM57840_4_10:
 +	case BCM57840_2_20:
 +	case BCM57840_MFO:
 +	case BCM57840_MF:
 +		bp->flags |= NO_FCOE_FLAG;
 +	}
- #endif
- 
 +
  	/* Set bp->num_queues for MSI-X mode*/
  	bnx2x_set_num_queues(bp);
  

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2012-10-02  1:51 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2012-10-02  1:51 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Linus Torvalds, Cong Wang,
	Pablo Neira Ayuso, Samuel Ortiz

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
Documentation/feature-removal-schedule.txt between commit 9c0ece069b32
("Get rid of Documentation/feature-removal.txt") from Linus' tree and
commits 965505015bec ("netfilter: remove xt_NOTRACK") and 7b55279f6a45
("NFC: Remove the pn544 raw driver") from the net-next tree.

I removed the file and can carry the fix as necessary (no action
is required).

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

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2012-09-26  1:46 Stephen Rothwell
  0 siblings, 0 replies; 69+ messages in thread
From: Stephen Rothwell @ 2012-09-26  1:46 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, \"Linus Lüssing\,
	Antonio Quartulli, Sven Eckelmann

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/batman-adv/bat_iv_ogm.c between commit 7caf69fb9c50 ("batman-adv: Fix
symmetry check / route flapping in multi interface setups") from Linus'
tree and commit bbb1f90efba8 ("batman-adv: Don't break statements after
assignment operator") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc net/batman-adv/bat_iv_ogm.c
index 469daab,df79300..0000000
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@@ -642,9 -652,9 +652,10 @@@ batadv_iv_ogm_orig_update(struct batadv
  	struct batadv_neigh_node *router = NULL;
  	struct batadv_orig_node *orig_node_tmp;
  	struct hlist_node *node;
 +	int if_num;
  	uint8_t sum_orig, sum_neigh;
  	uint8_t *neigh_addr;
+ 	uint8_t tq_avg;
  
  	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
  		   "update_originator(): Searching and updating originator entry of received packet\n");

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2012-07-19  1:15 Stephen Rothwell
@ 2012-07-19  1:18 ` Jeff Kirsher
  0 siblings, 0 replies; 69+ messages in thread
From: Jeff Kirsher @ 2012-07-19  1:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Narendra K,
	Alexander Duyck

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

On Thu, 2012-07-19 at 11:15 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c between commit
> 936597631dd3 ("ixgbevf: Prevent RX/TX statistics getting reset to zero")
> from Linus' tree and various commits from the net-next tree.
> 
> I just used the version from the net tree.

I will take a look at it later tonight to verify the conflict resolution
is correct.

Thanks Stephen.

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

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2012-07-19  1:15 Stephen Rothwell
  2012-07-19  1:18 ` Jeff Kirsher
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2012-07-19  1:15 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Narendra K, Jeff Kirsher, Alexander Duyck

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c between commit
936597631dd3 ("ixgbevf: Prevent RX/TX statistics getting reset to zero")
from Linus' tree and various commits from the net-next tree.

I just used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2012-02-27  4:05 ` David Miller
@ 2012-02-29  3:21   ` Ben Hutchings
  0 siblings, 0 replies; 69+ messages in thread
From: Ben Hutchings @ 2012-02-29  3:21 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, netdev, linux-next, linux-kernel

On Sun, 2012-02-26 at 23:05 -0500, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Feb 2012 12:11:25 +1100
> 
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
> > assignment of ip_summed for pre-allocated skbs") from Linus' tree and
> > commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
> > booleans with a flags field") from the net-next tree.
> > 
> > Just context changes.  I fixed it up (see below) and can carry the fix as
> > necessary.
> 
> I just merged net into net-next and resolved this conflict.

Thank you both.  I should have flagged this when sending the change for
the net tree.

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

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

* Re: linux-next: manual merge of the net-next tree with Linus' tree
  2012-02-27  1:11 Stephen Rothwell
@ 2012-02-27  4:05 ` David Miller
  2012-02-29  3:21   ` Ben Hutchings
  0 siblings, 1 reply; 69+ messages in thread
From: David Miller @ 2012-02-27  4:05 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, bhutchings


From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Feb 2012 12:11:25 +1100

> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
> assignment of ip_summed for pre-allocated skbs") from Linus' tree and
> commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
> booleans with a flags field") from the net-next tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

I just merged net into net-next and resolved this conflict.

Thanks!

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

* linux-next: manual merge of the net-next tree with Linus' tree
@ 2012-02-27  1:11 Stephen Rothwell
  2012-02-27  4:05 ` David Miller
  0 siblings, 1 reply; 69+ messages in thread
From: Stephen Rothwell @ 2012-02-27  1:11 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Ben Hutchings

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
assignment of ip_summed for pre-allocated skbs") from Linus' tree and
commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
booleans with a flags field") from the net-next 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/sfc/rx.c
index fc52fca,506d246..0000000
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@@ -156,10 -155,11 +155,10 @@@ static int efx_init_rx_buffers_skb(stru
  		if (unlikely(!skb))
  			return -ENOMEM;
  
 -		/* Adjust the SKB for padding and checksum */
 +		/* Adjust the SKB for padding */
  		skb_reserve(skb, NET_IP_ALIGN);
  		rx_buf->len = skb_len - NET_IP_ALIGN;
- 		rx_buf->is_page = false;
+ 		rx_buf->flags = 0;
 -		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		rx_buf->dma_addr = pci_map_single(efx->pci_dev,
  						  skb->data, rx_buf->len,
@@@ -493,9 -494,8 +493,9 @@@ static void efx_rx_packet_gro(struct ef
  	} else {
  		struct sk_buff *skb = rx_buf->u.skb;
  
- 		EFX_BUG_ON_PARANOID(!checksummed);
+ 		EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
  		rx_buf->u.skb = NULL;
 +		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		gro_result = napi_gro_receive(napi, skb);
  	}

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

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

end of thread, back to index

Thread overview: 69+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-21  0:07 linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-09-15 20:31 Mark Brown
2019-09-15 20:24 Mark Brown
2019-06-17  1:44 Stephen Rothwell
2019-06-04  0:30 Stephen Rothwell
2019-06-04  0:29 Stephen Rothwell
2019-04-02 22:56 Stephen Rothwell
2018-07-20  1:49 Stephen Rothwell
2018-06-06  4:37 Stephen Rothwell
2017-12-04 22:59 Stephen Rothwell
2017-11-09 23:31 Stephen Rothwell
2017-11-10  4:37 ` Cong Wang
2017-11-10  4:39 ` David Miller
2017-10-30 17:24 Mark Brown
2017-10-30 17:08 Mark Brown
2017-10-30 17:02 Mark Brown
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 18:10   ` Mark Brown
2017-06-30  0:57 Stephen Rothwell
2017-05-03  1:07 Stephen Rothwell
2017-05-03  4:08 ` David Miller
2017-03-24  0:05 Stephen Rothwell
2017-03-24  0:10 ` David Miller
2017-03-24  1:24   ` Alexei Starovoitov
2017-02-02  1:49 Stephen Rothwell
2017-02-02  8:40 ` Yotam Gigi
2016-10-02 22:37 Stephen Rothwell
2016-10-02 22:32 Stephen Rothwell
2016-06-30  1:01 Stephen Rothwell
2016-05-03  3:15 Stephen Rothwell
2016-03-15  0:07 Stephen Rothwell
2016-03-15  8:53 ` Gregory CLEMENT
2015-07-14  1:46 Stephen Rothwell
2015-07-14  8:23 ` Nikolay Aleksandrov
2015-05-28  4:17 Stephen Rothwell
2015-05-28 13:34 ` Tom Lendacky
2015-02-12  1:05 Stephen Rothwell
2014-06-12  2:01 Stephen Rothwell
2014-06-05  3:13 Stephen Rothwell
2014-06-05  3:26 ` KY Srinivasan
2013-12-18  1:46 Stephen Rothwell
2013-12-18  1:56 ` Jeff Kirsher
2013-12-18  2:19   ` Stephen Rothwell
2013-09-05  5:23 Stephen Rothwell
2013-09-05  5:19 Stephen Rothwell
2013-09-05  7:33 ` Daniel Borkmann
2013-09-02  3:12 Stephen Rothwell
2013-06-17  2:44 Stephen Rothwell
2013-06-17  2:38 Stephen Rothwell
2013-04-22  3:09 Stephen Rothwell
2013-04-23  0:42 ` David Miller
2013-04-22  3:03 Stephen Rothwell
2013-04-23  0:41 ` David Miller
2013-04-22  2:48 Stephen Rothwell
2013-04-22  2:43 Stephen Rothwell
2013-04-23  0:41 ` David Miller
2013-03-27  0:57 Stephen Rothwell
2013-03-27  4:54 ` David Miller
2013-03-12  0:33 Stephen Rothwell
2013-03-12 10:49 ` David Miller
2012-11-08 23:53 Stephen Rothwell
2012-11-10 23:34 ` David Miller
2012-10-02  1:51 Stephen Rothwell
2012-09-26  1:46 Stephen Rothwell
2012-07-19  1:15 Stephen Rothwell
2012-07-19  1:18 ` Jeff Kirsher
2012-02-27  1:11 Stephen Rothwell
2012-02-27  4:05 ` David Miller
2012-02-29  3:21   ` Ben Hutchings

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