linux-next: manual merge of the net-next tree with the staging.current tree

linux-next: manual merge of the net-next tree with the staging.current tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/staging/Kconfig
  drivers/staging/Makefile

between commit:

  df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")

from the staging.current tree and commit:

  52340b82cf1a ("hp100: Move 100BaseVG AnyLAN driver to staging")

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/staging/Kconfig
index 927d29eb92c6,333308fe807e..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,6 -125,6 +125,8 @@@ source "drivers/staging/exfat/Kconfig
  
  source "drivers/staging/qlge/Kconfig"
  
 +source "drivers/staging/vboxsf/Kconfig"
 +
+ source "drivers/staging/hp/Kconfig"
+ 
  endif # STAGING
diff --cc drivers/staging/Makefile
index f01f04199073,e4943cd63e98..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,4 -53,4 +53,5 @@@ obj-$(CONFIG_UWB)		+= uwb
  obj-$(CONFIG_USB_WUSB)		+= wusbcore/
  obj-$(CONFIG_EXFAT_FS)		+= exfat/
  obj-$(CONFIG_QLGE)		+= qlge/
 +obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
+ obj-$(CONFIG_NET_VENDOR_HP)	+= hp/

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

linux-next: manual merge of the net-next tree with the staging.current tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/staging/gdm724x/gdm_lte.c

between commit:

  fc7f750dc9d1 ("staging: gdm724x: fix use after free in gdm_lte_rx()")

from the staging.current tree and commit:

  4bcc4249b4cf ("staging: Use netif_rx().")

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/staging/gdm724x/gdm_lte.c
index 0d8d8fed283d,2587309da766..000000000000
--- a/drivers/staging/gdm724x/gdm_lte.c
+++ b/drivers/staging/gdm724x/gdm_lte.c
@@@ -76,10 -76,9 +76,10 @@@ static void tx_complete(void *arg
  
  static int gdm_lte_rx(struct sk_buff *skb, struct nic *nic, int nic_type)
  {
 -	int ret;
 +	int ret, len;
  
 +	len = skb->len + ETH_HLEN;
- 	ret = netif_rx_ni(skb);
+ 	ret = netif_rx(skb);
  	if (ret == NET_RX_DROP) {
  		nic->stats.rx_dropped++;
  	} else {

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