Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

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

1 files changed, 21 insertions, 17 deletions

diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c
index 100f23dfa438..ac584c5823d0 100644
--- a/arch/mips/loongson32/common/platform.c
+++ b/arch/mips/loongson32/common/platform.c
@@ -183,18 +183,20 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv)
 }
 
 static struct plat_stmmacenet_data ls1x_eth0_pdata = {
-        .bus_id         = 0,
-        .phy_addr       = -1,
+        .bus_id                 = 0,
+        .phy_addr               = -1,
 #if defined(CONFIG_LOONGSON1_LS1B)
-        .interface      = PHY_INTERFACE_MODE_MII,
+        .interface              = PHY_INTERFACE_MODE_MII,
 #elif defined(CONFIG_LOONGSON1_LS1C)
-        .interface      = PHY_INTERFACE_MODE_RMII,
+        .interface              = PHY_INTERFACE_MODE_RMII,
 #endif
-        .mdio_bus_data  = &ls1x_mdio_bus_data,
-        .dma_cfg        = &ls1x_eth_dma_cfg,
-        .has_gmac       = 1,
-        .tx_coe         = 1,
-        .init           = ls1x_eth_mux_init,
+        .mdio_bus_data          = &ls1x_mdio_bus_data,
+        .dma_cfg                = &ls1x_eth_dma_cfg,
+        .has_gmac               = 1,
+        .tx_coe                 = 1,
+        .rx_queues_to_use       = 1,
+        .tx_queues_to_use       = 1,
+        .init                   = ls1x_eth_mux_init,
 };
 
 static struct resource ls1x_eth0_resources[] = {
@@ -222,14 +224,16 @@ struct platform_device ls1x_eth0_pdev = {
 
 #ifdef CONFIG_LOONGSON1_LS1B
 static struct plat_stmmacenet_data ls1x_eth1_pdata = {
-        .bus_id         = 1,
-        .phy_addr       = -1,
-        .interface      = PHY_INTERFACE_MODE_MII,
-        .mdio_bus_data  = &ls1x_mdio_bus_data,
-        .dma_cfg        = &ls1x_eth_dma_cfg,
-        .has_gmac       = 1,
-        .tx_coe         = 1,
-        .init           = ls1x_eth_mux_init,
+        .bus_id                 = 1,
+        .phy_addr               = -1,
+        .interface              = PHY_INTERFACE_MODE_MII,
+        .mdio_bus_data          = &ls1x_mdio_bus_data,
+        .dma_cfg                = &ls1x_eth_dma_cfg,
+        .has_gmac               = 1,
+        .tx_coe                 = 1,
+        .rx_queues_to_use       = 1,
+        .tx_queues_to_use       = 1,
+        .init                   = ls1x_eth_mux_init,
 };
 
 static struct resource ls1x_eth1_resources[] = {