Merge remote-tracking branch 'net-next/master'

Conflicts:
	Documentation/driver-model/devres.txt
	drivers/hv/channel_mgmt.c
	drivers/staging/rtl8821ae/core.c

diff --cc Documentation/driver-model/devres.txt
index 89472558011ef295a98667745aa313cf4e6187f1,c74e04494ade32bd60b0cef1aafe725352afb0ca..df2613c73b1a696a84d5621ef6ee7a326fdbee2d
--- 1/Documentation/driver-model/devres.txt
--- 2/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@@ -312,9 -309,7 +312,14 @@@ SLAVE DMA ENGIN
  SPI
    devm_spi_register_master()
  
+ MDIO
+   devm_mdiobus_alloc()
+   devm_mdiobus_alloc_size()
+   devm_mdiobus_free()
++
 +GPIO
 +  devm_gpiod_get()
 +  devm_gpiod_get_index()
 +  devm_gpiod_get_optional()
 +  devm_gpiod_get_index_optional()
 +  devm_gpiod_put()

diff --cc Documentation/networking/can.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-xp-matrix.dts
Simple merge

diff --cc arch/sparc/include/asm/checksum_32.h
Simple merge

diff --cc arch/sparc/include/asm/checksum_64.h
Simple merge

diff --cc arch/sparc/net/bpf_jit_comp.c
index 49cee4af16f437d17af35e725d56cce426185671,c88cf147deed8916ae46b0bd1d2e0faa7e478003..892a102671adafc03950f907612f23b6902f934a
--- 1/arch/sparc/net/bpf_jit_comp.c
--- 2/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@@ -597,23 -589,23 +589,23 @@@ void bpf_jit_compile(struct sk_filter *
                                emit_alu_K(SRL, 5);
                                break;
  #endif
-                       case BPF_S_ANC_IFINDEX:
+                       case BPF_ANC | SKF_AD_IFINDEX:
                                emit_skb_loadptr(dev, r_A);
                                emit_cmpi(r_A, 0);
 -                              emit_branch(BNE_PTR, cleanup_addr + 4);
 +                              emit_branch(BE_PTR, cleanup_addr + 4);
                                emit_nop();
                                emit_load32(r_A, struct net_device, ifindex, r_A);
                                break;
-                       case BPF_S_ANC_MARK:
+                       case BPF_ANC | SKF_AD_MARK:
                                emit_skb_load32(mark, r_A);
                                break;
-                       case BPF_S_ANC_QUEUE:
+                       case BPF_ANC | SKF_AD_QUEUE:
                                emit_skb_load16(queue_mapping, r_A);
                                break;
-                       case BPF_S_ANC_HATYPE:
+                       case BPF_ANC | SKF_AD_HATYPE:
                                emit_skb_loadptr(dev, r_A);
                                emit_cmpi(r_A, 0);
 -                              emit_branch(BNE_PTR, cleanup_addr + 4);
 +                              emit_branch(BE_PTR, cleanup_addr + 4);
                                emit_nop();
                                emit_load16(r_A, struct net_device, type, r_A);
                                break;

diff --cc drivers/clk/ti/clk-43xx.c
Simple merge

diff --cc drivers/hv/channel_mgmt.c
index 6c8b032cacba7c0e7a21d37a5dd4de9d9d42e19b,90d6545564378c35d55fcb7f71a635ca5cfc32d5..ed9350d42764e06bb38eacfdf8756ae8ac43b2ba
--- 1/drivers/hv/channel_mgmt.c
--- 2/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;

diff --cc drivers/hv/hyperv_vmbus.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb/cxgb2.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/tile/tilegx.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.h
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/wmi.h
Simple merge

diff --cc drivers/net/wireless/orinoco/orinoco_usb.c
Simple merge

diff --cc drivers/net/wireless/ti/wlcore/main.c
Simple merge

diff --cc drivers/s390/net/qeth_core_main.c
index e89f38c3117606dd8d4a83226c44baf2e4f22bb1,18ddb249c91791a14a18dede561a8ffa308d70de..f54bec54d677635154f190fc73e26f896d17bd34
--- 1/drivers/s390/net/qeth_core_main.c
--- 2/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@@ -20,9 -20,9 +20,10 @@@
  #include <linux/kthread.h>
  #include <linux/slab.h>
  #include <net/iucv/af_iucv.h>
+ #include <net/dsfield.h>
  
  #include <asm/ebcdic.h>
 +#include <asm/chpid.h>
  #include <asm/io.h>
  #include <asm/sysinfo.h>
  #include <asm/compat.h>

diff --cc drivers/staging/et131x/et131x.c
Simple merge

diff --cc drivers/staging/netlogic/xlr_net.c
Simple merge

diff --cc drivers/staging/rtl8821ae/core.c
Simple merge

diff --cc drivers/usb/gadget/u_ether.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/seccomp.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/ipv4/inetpeer.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge