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

Conflicts:
	arch/mips/bcm47xx/setup.c
	arch/um/include/asm/Kbuild

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc arch/mips/bcm47xx/setup.c
index 12d77e9c2cb49233500e3398e226b949095e2720,9057728ac56b4cfa2130b122f2130df966ca7275..025be218ea1518bebfac47c2ec2cef514fff4e83
--- 1/arch/mips/bcm47xx/setup.c
--- 2/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@@ -26,10 -26,11 +26,13 @@@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
 +#include "bcm47xx_private.h"
 +
  #include <linux/export.h>
  #include <linux/types.h>
+ #include <linux/ethtool.h>
+ #include <linux/phy.h>
+ #include <linux/phy_fixed.h>
  #include <linux/ssb/ssb.h>
  #include <linux/ssb/ssb_embedded.h>
  #include <linux/bcma/bcma_soc.h>
@@@ -229,34 -226,14 +232,40 @@@ void __init plat_mem_setup(void
        _machine_halt = bcm47xx_machine_halt;
        pm_power_off = bcm47xx_machine_halt;
        bcm47xx_board_detect();
 +      mips_set_machine_name(bcm47xx_board_get_name());
  }
  
 +static int __init bcm47xx_cpu_fixes(void)
 +{
 +      switch (bcm47xx_bus_type) {
 +#ifdef CONFIG_BCM47XX_SSB
 +      case BCM47XX_BUS_TYPE_SSB:
 +              /* Nothing to do */
 +              break;
 +#endif
 +#ifdef CONFIG_BCM47XX_BCMA
 +      case BCM47XX_BUS_TYPE_BCMA:
 +              /* The BCM4706 has a problem with the CPU wait instruction.
 +               * When r4k_wait or r4k_wait_irqoff is used will just hang and
 +               * not return from a msleep(). Removing the cpu_wait
 +               * functionality is a workaround for this problem. The BCM4716
 +               * does not have this problem.
 +               */
 +              if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
 +                      cpu_wait = NULL;
 +              break;
 +#endif
 +      }
 +      return 0;
 +}
 +arch_initcall(bcm47xx_cpu_fixes);
 +
+ static struct fixed_phy_status bcm47xx_fixed_phy_status __initdata = {
+       .link   = 1,
+       .speed  = SPEED_100,
+       .duplex = DUPLEX_FULL,
+ };
+ 
  static int __init bcm47xx_register_bus_complete(void)
  {
        switch (bcm47xx_bus_type) {
@@@ -271,9 -248,7 +280,10 @@@
                break;
  #endif
        }
 +      bcm47xx_buttons_register();
 +      bcm47xx_leds_register();
 +
+       fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
        return 0;
  }
  device_initcall(bcm47xx_register_bus_complete);

diff --cc arch/um/include/asm/Kbuild
index fb3a6cc2301570b7c87e13e155d7247c76c94d6a,75de4abe4f94af1f716d4cc29b381bf07342ca95..0edaa478ca07f1a730cc669a3d06323667bfe0e0
--- 1/arch/um/include/asm/Kbuild
--- 2/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@@ -4,4 -4,4 +4,5 @@@ generic-y += ftrace.h pci.h io.h param.
  generic-y += switch_to.h clkdev.h
  generic-y += trace_clock.h
  generic-y += preempt.h
 +generic-y += barrier.h
+ generic-y += hash.h

diff --cc arch/xtensa/include/asm/Kbuild
Simple merge

diff --cc drivers/net/can/mscan/mpc5xxx_can.c
Simple merge

diff --cc drivers/net/ethernet/8390/hydra.c
Simple merge

diff --cc drivers/net/ethernet/8390/zorro8390.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc include/uapi/linux/pci_regs.h
Simple merge

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

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

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

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