Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits)
  arch/tile: support newer binutils assembler shift semantics
  arch/tile: fix deadlock bugs in rwlock implementation
  drivers/edac: provide support for tile architecture
  tile on-chip network driver: sync up with latest fixes
  arch/tile: support 4KB page size as well as 64KB
  arch/tile: add some more VMSPLIT options and use consistent naming
  arch/tile: fix some comments and whitespace
  arch/tile: export some additional module symbols
  arch/tile: enhance existing finv_buffer_remote() routine
  arch/tile: fix two bugs in the backtracer code
  arch/tile: use extended assembly to inline __mb_incoherent()
  arch/tile: use a cleaner technique to enable interrupt for cpu_idle()
  arch/tile: sync up with <arch/sim.h> and <arch/sim_def.h> changes
  arch/tile: fix reversed test of strict_strtol() return value
  arch/tile: avoid a simulator warning during bootup
  arch/tile: export <asm/hardwall.h> to userspace
  arch/tile: warn and retry if an IPI is not accepted by the target cpu
  arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls
  arch/tile: fix __ndelay etc to work better
  arch/tile: bug fix: exec'ed task thought it was still single-stepping
  ...

Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu
alignment vs section naming convention fix)

diff --cc MAINTAINERS
index 6e696bd37cf99c1886331901da7b54f27b27afec,338629e2224dd67fb32d21ba0adbdc4302db8a1f..7d6e12dbdffaefd25c8feb379eebffbcef83d391
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6125,8 -6095,9 +6125,9 @@@ M:      Chris Metcalf <cmetcalf@tilera.com
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/char/hvc_tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
  F:    drivers/net/tile/
+ F:    drivers/edac/tile_edac.c
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <chessman@tux.org>

diff --cc arch/tile/kernel/vmlinux.lds.S
index c6ce378e067877ef59cd4eb662fed82f3bbcda93,4e211c1bf50035ce35257c3a9d981cf64e5a45d4..38f64fafdc10a9d8a3271a50d333b9787074ce19
--- 1/arch/tile/kernel/vmlinux.lds.S
--- 2/arch/tile/kernel/vmlinux.lds.S
+++ b/arch/tile/kernel/vmlinux.lds.S
@@@ -59,11 -59,8 +59,8 @@@ SECTION
  
    . = ALIGN(PAGE_SIZE);
    VMLINUX_SYMBOL(_sinitdata) = .;
-   .init.page : AT (ADDR(.init.page) - LOAD_OFFSET) {
-     *(.init.page)
-   } :data =0
-   INIT_DATA_SECTION(16)
+   INIT_DATA_SECTION(16) :data =0
 -  PERCPU(PAGE_SIZE)
 +  PERCPU(L2_CACHE_BYTES, PAGE_SIZE)
    . = ALIGN(PAGE_SIZE);
    VMLINUX_SYMBOL(_einitdata) = .;