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

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

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

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

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 drivers/net/bonding/bond_sysfs.c
index 5a59b85cdfc23cffc898b6d25fdfbb474e0ed0ad,5f6babcfc26e6aa56881ef2dc24b1ed51e3d7539..39c4d8d610746b02095cc41fca2f50683bb40490
--- 1/drivers/net/bonding/bond_sysfs.c
--- 2/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@@ -362,10 -534,24 +362,10 @@@ static ssize_t bonding_show_min_links(s
  {
        struct bonding *bond = to_bond(d);
  
-       return sprintf(buf, "%d\n", bond->params.min_links);
+       return sprintf(buf, "%u\n", bond->params.min_links);
  }
 -
 -static ssize_t bonding_store_min_links(struct device *d,
 -                                     struct device_attribute *attr,
 -                                     const char *buf, size_t count)
 -{
 -      struct bonding *bond = to_bond(d);
 -      int ret;
 -
 -      ret = bond_opt_tryset_rtnl(bond, BOND_OPT_MINLINKS, (char *)buf);
 -      if (!ret)
 -              ret = count;
 -
 -      return ret;
 -}
  static DEVICE_ATTR(min_links, S_IRUGO | S_IWUSR,
 -                 bonding_show_min_links, bonding_store_min_links);
 +                 bonding_show_min_links, bonding_sysfs_store_option);
  
  static ssize_t bonding_show_ad_select(struct device *d,
                                      struct device_attribute *attr,

diff --cc drivers/net/can/c_can/c_can_pci.c
index 7ab384f59e7ef622d324401d1f89d68b2a4a06c3,fe5f6303b58400fb69913229c20da6a2f2a5d303..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
@@@ -115,11 -84,13 +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/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/ich8lan.c
index a2901139b209ffb4269cc50bbad867a70a03ee8d,f0bbd4246d71d857eba4c439cac33e0c8a930864..5f55395616612d843b10a9b7f6ad0345f15344fb
--- 1/drivers/net/ethernet/intel/e1000e/ich8lan.c
--- 2/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@@ -1318,11 -1331,13 +1331,14 @@@ static s32 e1000_check_for_copper_link_
         * aggressive resulting in many collisions. To avoid this, increase
         * the IPG and reduce Rx latency in the PHY.
         */
-       if ((hw->mac.type == e1000_pch2lan) && link) {
+       if (((hw->mac.type == e1000_pch2lan) ||
+            (hw->mac.type == e1000_pch_lpt)) && link) {
                u32 reg;
 +
                reg = er32(STATUS);
                if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) {
+                       u16 emi_addr;
+ 
                        reg = er32(TIPG);
                        reg &= ~E1000_TIPG_IPGT_MASK;
                        reg |= 0xFF;

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

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/port.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

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

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/recv.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00mac.c
Simple merge

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

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

diff --cc include/net/cfg80211.h
Simple merge

diff --cc kernel/audit.c
Simple merge

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

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

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

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

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

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

diff --cc net/ipv6/ip6_fib.c
Simple merge

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

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

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

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

diff --cc net/netlink/af_netlink.c
index 92f4b6915e8989ee6cb504dd3c84d505bd12b395,81dca96d2be682afde14169615b50fb73626c662..e0ccd84d4d6781ab761349e0ac913f6ddc3e8994
--- 1/net/netlink/af_netlink.c
--- 2/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@@ -1445,8 -1492,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
index 1a4a2026778791ffffca1bbad8d72cf6faa1c0ed,bdbdb1a7920af99c1829ae62716caddafb114fef..45527e6b52dbf396cbb7415bb0613152a8320096
--- 1/net/sched/cls_api.c
--- 2/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@@ -134,8 -134,7 +134,8 @@@ static int tc_ctl_tfilter(struct sk_buf
        int err;
        int tp_created = 0;
  
 -      if ((n->nlmsg_type != RTM_GETTFILTER) && !netlink_capable(skb, CAP_NET_ADMIN))
 +      if ((n->nlmsg_type != RTM_GETTFILTER) &&
-           !ns_capable(net->user_ns, CAP_NET_ADMIN))
++          !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
  
  replay:

diff --cc net/sched/sch_api.c
index 86f8edfd6b8ae96886cd4c1d63936c4146252e40,400769014bbde8d4e9032600524e97f549dcff31..fd14df56e5ffdc2d96d61abbe55b2607c95179c5
--- 1/net/sched/sch_api.c
--- 2/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@@ -1084,8 -1084,7 +1084,8 @@@ static int tc_get_qdisc(struct sk_buff 
        struct Qdisc *p = NULL;
        int err;
  
 -      if ((n->nlmsg_type != RTM_GETQDISC) && !netlink_capable(skb, CAP_NET_ADMIN))
 +      if ((n->nlmsg_type != RTM_GETQDISC) &&
-           !ns_capable(net->user_ns, CAP_NET_ADMIN))
++          !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
  
        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
@@@ -1152,7 -1151,7 +1152,7 @@@ static int tc_modify_qdisc(struct sk_bu
        struct Qdisc *q, *p;
        int err;
  
-       if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
 -      if (!netlink_capable(skb, CAP_NET_ADMIN))
++      if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
  
  replay:
@@@ -1491,8 -1490,7 +1491,8 @@@ static int tc_ctl_tclass(struct sk_buf
        u32 qid;
        int err;
  
 -      if ((n->nlmsg_type != RTM_GETTCLASS) && !netlink_capable(skb, CAP_NET_ADMIN))
 +      if ((n->nlmsg_type != RTM_GETTCLASS) &&
-           !ns_capable(net->user_ns, CAP_NET_ADMIN))
++          !netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN))
                return -EPERM;
  
        err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);

diff --cc net/sctp/protocol.c
Simple merge

diff --cc net/wireless/scan.c
index 0f5da18cc6193b648a4a05f19aa6fe7627f5adbf,88f108edfb586ef3b2d17d15cf66b00da84f93f0..e7329bb6a323c95d0a3297f9fc928780f9bc7f66
--- 1/net/wireless/scan.c
--- 2/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@@ -284,14 -284,22 +284,22 @@@ void cfg80211_sched_scan_results(struc
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_results);
  
- void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy)
  {
 -      struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
 +      struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
  
+       ASSERT_RTNL();
+ 
        trace_cfg80211_sched_scan_stopped(wiphy);
  
-       rtnl_lock();
        __cfg80211_stop_sched_scan(rdev, true);
+ }
+ EXPORT_SYMBOL(cfg80211_sched_scan_stopped_rtnl);
+ 
+ void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ {
+       rtnl_lock();
+       cfg80211_sched_scan_stopped_rtnl(wiphy);
        rtnl_unlock();
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_stopped);

diff --cc net/wireless/sme.c
Simple merge