From: David S. Miller <davem@davemloft.net>
Date: Tue, 1 Aug 2017 17:07:50 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=29fda25a2d31098044f8dfa177c4d2834071828e;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/davem/net

Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).

Signed-off-by: David S. Miller <davem@davemloft.net>
---

29fda25a2d31098044f8dfa177c4d2834071828e
diff --cc MAINTAINERS
index 7d72fdbed6e6,567343b8ffaa..8c5707f5860a
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5138,13 -5090,20 +5090,21 @@@ M:	Andrew Lunn <andrew@lunn.ch
  M:	Florian Fainelli <f.fainelli@gmail.com>
  L:	netdev@vger.kernel.org
  S:	Maintained
- F:	include/linux/phy.h
- F:	include/linux/phy_fixed.h
- F:	include/linux/platform_data/mdio-bcm-unimac.h
- F:	drivers/net/phy/
+ F:	Documentation/ABI/testing/sysfs-bus-mdio
+ F:	Documentation/devicetree/bindings/net/mdio*
  F:	Documentation/networking/phy.txt
+ F:	drivers/net/phy/
  F:	drivers/of/of_mdio.c
  F:	drivers/of/of_net.c
+ F:	include/linux/*mdio*.h
+ F:	include/linux/of_net.h
+ F:	include/linux/phy.h
+ F:	include/linux/phy_fixed.h
+ F:	include/linux/platform_data/mdio-gpio.h
++F:	include/linux/platform_data/mdio-bcm-unimac.h
+ F:	include/trace/events/mdio.h
+ F:	include/uapi/linux/mdio.h
+ F:	include/uapi/linux/mii.h
  
  EXT2 FILE SYSTEM
  M:	Jan Kara <jack@suse.com>
diff --cc drivers/net/hyperv/netvsc_drv.c
index 8ff4cbf582cc,0d78727f1a14..9453eef6d09f
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@@ -358,9 -377,11 +378,10 @@@ static int netvsc_start_xmit(struct sk_
  	u32 rndis_msg_size;
  	struct rndis_per_packet_info *ppi;
  	u32 hash;
 -	struct hv_page_buffer page_buf[MAX_PAGE_BUFFER_COUNT];
 -	struct hv_page_buffer *pb = page_buf;
 +	struct hv_page_buffer pb[MAX_PAGE_BUFFER_COUNT];
  
- 	/* We can only transmit MAX_PAGE_BUFFER_COUNT number
+ 	/* We will atmost need two pages to describe the rndis
+ 	 * header. We can only transmit MAX_PAGE_BUFFER_COUNT number
  	 * of pages in a single packet. If skb is scattered around
  	 * more pages we try linearizing it.
  	 */
diff --cc drivers/net/virtio_net.c
index 1902701e15a9,98f17b05c68b..e90de2186ffc
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -967,6 -902,7 +965,7 @@@ static int add_recvbuf_mergeable(struc
  	}
  
  	sg_init_one(rq->sg, buf, len);
 -	ctx = (void *)(unsigned long)len;
++	ctx = mergeable_len_to_ctx(len, headroom);
  	err = virtqueue_add_inbuf_ctx(rq->vq, rq->sg, 1, buf, ctx, gfp);
  	if (err < 0)
  		put_page(virt_to_head_page(buf));