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

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
	net/batman-adv/translation-table.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.c
index c136230d50bb125e6ca1f4de21ae72485e0dbec2,01ee9cc417b2ff96bc8fc83d02f5bc28c3e453a8..4ea2bdc852f806756698a04309b905a1b77cc8c3
--- 1/drivers/net/ethernet/freescale/fec.c
--- 2/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1032,10 -1040,14 +1041,14 @@@ static int fec_enet_mii_init(struct pla
         * mdio interface in board design, and need to be configured by
         * fec0 mii_bus.
         */
 -      if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {
 +      if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
                /* fec1 uses fec0 mii_bus */
-               fep->mii_bus = fec0_mii_bus;
-               return 0;
+               if (mii_cnt && fec0_mii_bus) {
+                       fep->mii_bus = fec0_mii_bus;
+                       mii_cnt++;
+                       return 0;
+               }
+               return -ENOENT;
        }
  
        fep->mii_timeout = 0;

diff --cc drivers/net/ethernet/micrel/ks8842.c
Simple merge

diff --cc drivers/net/ethernet/natsemi/macsonic.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
Simple merge

diff --cc net/batman-adv/translation-table.c
index 5f09a578d49d00d86dc78d73af89588c85c79371,cc87acf0243106dd5e110ad920c8e17d4640760b..dc0779b9e597d31c371caa7fef79913444f1f331
--- 1/net/batman-adv/translation-table.c
--- 2/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -245,12 -242,10 +242,12 @@@ void tt_local_add(struct net_device *so
        if (tt_global_entry) {
                /* This node is probably going to update its tt table */
                tt_global_entry->orig_node->tt_poss_change = true;
 -              /* The global entry has to be marked as PENDING and has to be
 +              /* The global entry has to be marked as ROAMING and has to be
                 * kept for consistency purpose */
-               tt_global_entry->flags |= TT_CLIENT_ROAM;
 -              tt_global_entry->common.flags |= TT_CLIENT_PENDING;
++              tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 +              tt_global_entry->roam_at = jiffies;
 +
-               send_roam_adv(bat_priv, tt_global_entry->addr,
+               send_roam_adv(bat_priv, tt_global_entry->common.addr,
                              tt_global_entry->orig_node);
        }
  out:
@@@ -704,21 -668,9 +671,21 @@@ void tt_global_del(struct bat_priv *bat
  
        if (tt_global_entry->orig_node == orig_node) {
                if (roaming) {
 -                      tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 -                      tt_global_entry->roam_at = jiffies;
 -                      goto out;
 +                      /* if we are deleting a global entry due to a roam
 +                       * event, there are two possibilities:
 +                       * 1) the client roamed from node A to node B => we mark
 +                       *    it with TT_CLIENT_ROAM, we start a timer and we
 +                       *    wait for node B to claim it. In case of timeout
 +                       *    the entry is purged.
 +                       * 2) the client roamed to us => we can directly delete
 +                       *    the global entry, since it is useless now. */
 +                      tt_local_entry = tt_local_hash_find(bat_priv,
-                                                       tt_global_entry->addr);
++                                                      tt_global_entry->common.addr);
 +                      if (!tt_local_entry) {
-                               tt_global_entry->flags |= TT_CLIENT_ROAM;
++                              tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 +                              tt_global_entry->roam_at = jiffies;
 +                              goto out;
 +                      }
                }
                _tt_global_del(bat_priv, tt_global_entry, message);
        }

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

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

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

diff --cc net/mac80211/agg-tx.c
Simple merge

diff --cc net/nfc/nci/core.c
Simple merge

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

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

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

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