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

Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_sysfs.c
Simple merge

diff --cc drivers/net/can/c_can/c_can_pci.c
index fe5f6303b58400fb69913229c20da6a2f2a5d303,7ab384f59e7ef622d324401d1f89d68b2a4a06c3..58f71e1fcc4e7bb48de89b13ec56dd6f95755dd6
--- 1/drivers/net/can/c_can/c_can_pci.c
--- 2/drivers/net/can/c_can/c_can_pci.c
+++ b/drivers/net/can/c_can/c_can_pci.c
@@@ -84,13 -115,11 +115,14 @@@ static int c_can_pci_probe(struct pci_d
                goto out_disable_device;
        }
  
 -      pci_set_master(pdev);
 -      pci_enable_msi(pdev);
 +      ret = pci_enable_msi(pdev);
 +      if (!ret) {
 +              dev_info(&pdev->dev, "MSI enabled\n");
 +              pci_set_master(pdev);
 +      }
  
-       addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
+       addr = pci_iomap(pdev, c_can_pci_data->bar,
+                        pci_resource_len(pdev, c_can_pci_data->bar));
        if (!addr) {
                dev_err(&pdev->dev,
                        "device has no PCI memory resources, "

diff --cc drivers/net/ethernet/altera/altera_msgdma.c
Simple merge

diff --cc drivers/net/ethernet/altera/altera_sgdma.c
Simple merge

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

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

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

diff --cc kernel/audit.c
Simple merge

diff --cc net/netfilter/nfnetlink.c
Simple merge

diff --cc net/netlink/af_netlink.c
index 81dca96d2be682afde14169615b50fb73626c662,92f4b6915e8989ee6cb504dd3c84d505bd12b395..e0ccd84d4d6781ab761349e0ac913f6ddc3e8994
--- 1/net/netlink/af_netlink.c
--- 2/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@@ -1492,8 -1445,8 +1510,8 @@@ static int netlink_bind(struct socket *
                return -EINVAL;
  
        /* Only superuser is allowed to listen multicasts */
-       if (nladdr->nl_groups) {
+       if (groups) {
 -              if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV))
 +              if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))
                        return -EPERM;
                err = netlink_realloc_groups(sk);
                if (err)

diff --cc net/sched/cls_api.c
Simple merge