1. 14 Dec, 2012 7 commits
    • Jon Hunter's avatar
      ARM: OMAP2420: Fix ethernet support for OMAP2420 H4 · 86c35960
      Jon Hunter authored
      Ethernet is not currently working on the OMAP2420 H4 board. In commit
      f6049312 (ARM: OMAP: abstract debug card setup (smc, leds)) the function
      h4_init_smc91x() that initialised the ethernet controller was renamed to
      h4_init_debug() but was never called when initialising the board.
      
      Adding a call to h4_init_debug() fixes ethernet support, however,
      instead of using the legacy H4 code migrate the H4 to use the
      gpmc_smc91x_init() function instead and remove the legacy H4 code.
      Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      86c35960
    • Oleg Matcovschi's avatar
      OMAP2+: mux: Fixed gpio mux mode analysis · 421e8450
      Oleg Matcovschi authored
      OMAP_MODE_GPIO() macro verified only OMAP_MUX_MODE4.
      It is not correct for following platforms:
          2430 - gpio mux mode 3
          44xx - gpio mux mode 3
          54xx - gpio mux mode 6
      
      Patch reserves first 3 bits in partition flags for storing gpio mux
      mode in same format as stored in control pad register.
      Modified OMAP_MODE_GPIO() macro to handle all possible cases of gpio mux mode.
      Modified omap_mux_init() flags of omap34xx to include OMAP_MUX_GPIO_IN_MODE4.
      Signed-off-by: default avatarOleg Matcovschi <oleg.matcovschi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      421e8450
    • Tomi Valkeinen's avatar
      OMAP: board-files: fix i2c_bus for tfp410 · ca2e16fa
      Tomi Valkeinen authored
      The i2c handling in tfp410 driver, which handles converting parallel RGB
      to DVI, was changed in 958f2717
      (OMAPDSS: TFP410: pdata rewrite). The patch changed what value the
      driver considers as invalid/undefined.  Before the patch, 0 was the
      invalid value, but as 0 is a valid bus number, the patch changed this to
      -1.
      
      However, the fact was missed that many board files do not define the bus
      number at all, thus it's left to 0. This causes the driver to fail to
      get the i2c bus, exiting from the driver's probe with an error, meaning
      that the DVI output does not work for those boards.
      
      This patch fixes the issue by changing the i2c_bus number field in the
      driver's platform data from u16 to int, and setting the bus number to -1
      in the board files for the boards that did not define the bus. The
      exception is devkit8000, for which the bus is set to 1, which is the
      correct bus for that board.
      
      The bug exists in v3.5+ kernels.
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      Reported-by: default avatarThomas Weber <thomas@tomweber.eu>
      Cc: Thomas Weber <thomas@tomweber.eu>
      Cc: <stable@vger.kernel.org> # v3.5+
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      ca2e16fa
    • Tony Lindgren's avatar
      Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into... · bce9e90f
      Tony Lindgren authored
      Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window
      
      Pull timer fixes from Jon Hunter <jon-hunter@ti.com>:
      
      Fixes for a few timer warnings observed with different kernel
      configurations for OMAP2+ devices.
      
      I have dropped the patch to fix a build error for OMAP4 in the
      timer code as Olof already has this fix merged.
      bce9e90f
    • Vaibhav Hiremath's avatar
      ARM: OMAP2+: Fix sparse warnings in timer.c · bf85f205
      Vaibhav Hiremath authored
      Sparse generates the following warnings when compiling mach-omap2/timer.c.
      
        CHECK   arch/arm/mach-omap2/timer.c
        arch/arm/mach-omap2/timer.c:193:13: warning: symbol 'omap_dmtimer_init'
        was not declared. Should it be static?
        arch/arm/mach-omap2/timer.c:213:12: warning: symbol
        'omap_dm_timer_get_errata' was not declared. Should it be static?
      
      Add static to function declaration to fix warnings.
      Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
      Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
      bf85f205
    • Jon Hunter's avatar
      ARM: AM335x: Fix warning in timer.c · e0c3e27c
      Jon Hunter authored
      When compiling the kernel with configuration options ...
      
       # CONFIG_ARCH_OMAP2 is not set
       # CONFIG_ARCH_OMAP3 is not set
       # CONFIG_ARCH_OMAP4 is not set
       # CONFIG_SOC_OMAP5 is not set
       CONFIG_SOC_AM33XX=y
      
       ... the following build warning is seen.
      
        CC      arch/arm/mach-omap2/timer.o
        arch/arm/mach-omap2/timer.c:395:19: warning: ‘omap2_sync32k_clocksource_init’
        	defined but not used [-Wunused-function]
      
      This issue was introduced by commit 6f80b3bb (ARM: OMAP2+: timer: remove
      CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no
      longer referenced by the timer initialisation function for the AM335x
      device as it has no 32k-sync timer.
      
      Fix this by adding the "__maybe_unused" compiler directive to the
      omap2_sync32k_clocksource_init() function to indicate that this function
      may be used for certain configurations.
      
      Cc: Igor Grinberg <grinberg@compulab.co.il>
      Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
      e0c3e27c
    • Jon Hunter's avatar
      ARM: OMAP2+: Fix realtime_counter_init warning in timer.c · 34cceb74
      Jon Hunter authored
      In commit fa6d79d2 (ARM: OMAP: Add initialisation for the real-time
      counter), the function realtime_counter_init() was added. However, if
      the kernel configuration option CONFIG_SOC_OMAP5 is not selected then
      the following compiler warning is observed.
      
        CC      arch/arm/mach-omap2/timer.o
        arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’
        defined but not used [-Wunused-function]
      
      Commit fa6d79d2 also introduced the kernel configuration option
      CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the
      a stub function for realtime_counter_init() is defined.
      
      For non-OMAP5 devices, there is no realtime counter and so
      realtime_counter_init() function and stub function are not used for
      these devices. Therefore, fix this warning by only allowing the kernel
      configuration option CONFIG_SOC_HAS_REALTIME_COUNTER to be enabled for
      OMAP5 devices.
      
      Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
      Reported-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
      Acked-by Santosh Shilimkar <santosh.shilimkar@ti.com>
      34cceb74
  2. 13 Dec, 2012 8 commits
    • Linus Torvalds's avatar
      Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 698d6012
      Linus Torvalds authored
      Pull ARM SoC driver specific changes from Olof Johansson:
       "A collection of mostly SoC-specific driver updates:
         - a handful of pincontrol and setup changes
         - new drivers for hwmon and reset controller for vexpress
         - timing support updates for OMAP (gpmc and other interfaces)
         - plus a collection of smaller cleanups"
      
      * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        ARM: ux500: fix pin warning
        ARM: OMAP2+: tusb6010: generic timing calculation
        ARM: OMAP2+: smc91x: generic timing calculation
        ARM: OMAP2+: onenand: generic timing calculation
        ARM: OMAP2+: gpmc: generic timing calculation
        ARM: OMAP2+: gpmc: handle additional timings
        ARM: OMAP2+: nand: remove redundant rounding
        gpio: samsung: use pr_* instead of printk
        ARM: ux500: fixup magnetometer pins
        ARM: ux500: add STM pin configuration
        ARM: ux500: 8500: add pinctrl support for uart1 and uart2
        ARM: ux500: cosmetic fixups for uart0
        gpio: samsung: Fix input mode setting function for GPIO int
        ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
        ARM: ux500: 8500: define SDI sleep states
        ARM: vexpress: Reset driver
        ARM: ux500: 8500: update SKE keypad pinctrl table
        hwmon: Versatile Express hwmon driver
        ARM: ux500: delete duplicate macro
        ARM: ux500: 8500: add IDLE pin configuration for SPI
        ...
      698d6012
    • Linus Torvalds's avatar
      Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · a11da7df
      Linus Torvalds authored
      Pull ARM SoC power management and clock changes from Olof Johansson:
       "This branch contains a largeish set of updates of power management and
        clock setup.  The bulk of it is for OMAP/AM33xx platforms, but also a
        few around hotplug/suspend/resume on Exynos.
      
        It includes a split-up of some of the OMAP clock data into separate
        files which adds to the diffstat, but gross delta is fairly reasonable."
      
      * tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
        ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
        ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
        watchdog: OMAP: fixup for ARM multiplatform support
        ARM: EXYNOS: Add flush_cache_all in suspend finisher
        ARM: EXYNOS: Remove scu_enable from cpuidle
        ARM: EXYNOS: Fix soft reboot hang after suspend/resume
        ARM: EXYNOS: Add support for rtc wakeup
        ARM: EXYNOS: fix the hotplug for Cortex-A15
        ARM: OMAP2+: omap_device: Correct resource handling for DT boot
        ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
        ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
        ARM: OMAP2+: PRM: initialize some PRM functions early
        ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
        ARM: OMAP4: USB: power down MUSB PHY during boot
        ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP2xxx: clock: drop obsolete clock data
        ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
        ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
        ARM: AM33xx: clock: drop obsolete clock data
        ARM: OMAP3xxx: clk: drop obsolete clock data
        ...
      a11da7df
    • Linus Torvalds's avatar
      Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b8edf848
      Linus Torvalds authored
      Pull ARM SoC multiplatform conversion patches from Olof Johansson:
       "Here are more patches in the progression towards multiplatform, sparse
        irq conversions in particular.
      
        Tegra has a handful of cleanups and general groundwork, but is not
        quite there yet on full enablement.
      
        Platforms that are enabled through this branch are VT8500 and Zynq.
        Note that i.MX was converted in one of the earlier cleanup branches as
        well (before we started a separate topic for multiplatform).  And both
        new platforms for this merge window, sunxi and bcm, were merged with
        multiplatform support enabled."
      
      Fix up conflicts mostly as per Olof.
      
      * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
        ARM: zynq: Remove all unused mach headers
        ARM: zynq: add support for ARCH_MULTIPLATFORM
        ARM: zynq: make use of debug_ll_io_init()
        ARM: zynq: remove TTC early mapping
        ARM: tegra: move debug-macro.S to include/debug
        ARM: tegra: don't include iomap.h from debug-macro.S
        ARM: tegra: decouple uncompress.h and debug-macro.S
        ARM: tegra: simplify DEBUG_LL UART selection options
        ARM: tegra: select SPARSE_IRQ
        ARM: tegra: enhance timer.c to get IO address from device tree
        ARM: tegra: enhance timer.c to get IRQ info from device tree
        ARM: timer: fix checkpatch warnings
        ARM: tegra: add TWD to device tree
        ARM: tegra: define DT bindings for and instantiate RTC
        ARM: tegra: define DT bindings for and instantiate timer
        clocksource/mtu-nomadik: use apb_pclk
        clk: ux500: Register mtu apb_pclocks
        ARM: plat-nomadik: convert platforms to SPARSE_IRQ
        mfd/db8500-prcmu: use the irq_domain_add_simple()
        mfd/ab8500-core: use irq_domain_add_simple()
        ...
      b8edf848
    • Linus Torvalds's avatar
      Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · db5b0ae0
      Linus Torvalds authored
      Pull ARM SoC device tree conversions and enablement from Olof Johansson:
       "Continued device tree conversion and enablement across a number of
        platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
        smaller series as well.
      
        ux500 has seen continued conversion for platforms.  Several platforms
        have seen pinctrl-via-devicetree conversions for simpler
        multiplatform.  Tegra is adding data for new devices/drivers, and
        Exynos has a bunch of new bindings and devices added as well.
      
        So, pretty much the same progression in the right direction as the
        last few releases."
      
      Fix up conflicts as per Olof.
      
      * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
        ARM: ux500: Rename dbx500 cpufreq code to be more generic
        ARM: dts: add missing ux500 device trees
        ARM: ux500: Stop registering the PCM driver from platform code
        ARM: ux500: Move board specific GPIO info out to subordinate DTS files
        ARM: ux500: Disable the MMCI gpio-regulator by default
        ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
        ARM: Kirkwood: Add support LED of OpenBlocks A6
        ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
        ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
        ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
        ARM: kirkwood: Add support DT of second I2C bus
        ARM: kirkwood: Convert mplcec4 board to pinctrl
        ARM: Kirkwood: Convert km_kirkwood to pinctrl
        ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
        ARM: Kirkwood: Convert IX2-200 to pinctrl.
        ARM: Kirkwood: Convert lsxl boards to pinctrl.
        ARM: Kirkwood: Convert ib62x0 to pinctrl.
        ARM: Kirkwood: Convert GoFlex Net to pinctrl.
        ARM: Kirkwood: Convert dreamplug to pinctrl.
        ARM: Kirkwood: Convert dockstar to pinctrl.
        ...
      db5b0ae0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 6be35c70
      Linus Torvalds authored
      Pull networking changes from David Miller:
      
      1) Allow to dump, monitor, and change the bridge multicast database
         using netlink.  From Cong Wang.
      
      2) RFC 5961 TCP blind data injection attack mitigation, from Eric
         Dumazet.
      
      3) Networking user namespace support from Eric W. Biederman.
      
      4) tuntap/virtio-net multiqueue support by Jason Wang.
      
      5) Support for checksum offload of encapsulated packets (basically,
         tunneled traffic can still be checksummed by HW).  From Joseph
         Gasparakis.
      
      6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
         Daniel Borkmann.
      
      7) Bridge port parameters over netlink and BPDU blocking support
         from Stephen Hemminger.
      
      8) Improve data access patterns during inet socket demux by rearranging
         socket layout, from Eric Dumazet.
      
      9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
         Jon Maloy.
      
      10) Update TCP socket hash sizing to be more in line with current day
          realities.  The existing heurstics were choosen a decade ago.
          From Eric Dumazet.
      
      11) Fix races, queue bloat, and excessive wakeups in ATM and
          associated drivers, from Krzysztof Mazur and David Woodhouse.
      
      12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
          in VXLAN driver, from David Stevens.
      
      13) Add "oops_only" mode to netconsole, from Amerigo Wang.
      
      14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
          allow DCB netlink to work on namespaces other than the initial
          namespace.  From John Fastabend.
      
      15) Support PTP in the Tigon3 driver, from Matt Carlson.
      
      16) tun/vhost zero copy fixes and improvements, plus turn it on
          by default, from Michael S. Tsirkin.
      
      17) Support per-association statistics in SCTP, from Michele
          Baldessari.
      
      And many, many, driver updates, cleanups, and improvements.  Too
      numerous to mention individually.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
        net/mlx4_en: Add support for destination MAC in steering rules
        net/mlx4_en: Use generic etherdevice.h functions.
        net: ethtool: Add destination MAC address to flow steering API
        bridge: add support of adding and deleting mdb entries
        bridge: notify mdb changes via netlink
        ndisc: Unexport ndisc_{build,send}_skb().
        uapi: add missing netconf.h to export list
        pkt_sched: avoid requeues if possible
        solos-pci: fix double-free of TX skb in DMA mode
        bnx2: Fix accidental reversions.
        bna: Driver Version Updated to 3.1.2.1
        bna: Firmware update
        bna: Add RX State
        bna: Rx Page Based Allocation
        bna: TX Intr Coalescing Fix
        bna: Tx and Rx Optimizations
        bna: Code Cleanup and Enhancements
        ath9k: check pdata variable before dereferencing it
        ath5k: RX timestamp is reported at end of frame
        ath9k_htc: RX timestamp is reported at end of frame
        ...
      6be35c70
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121212' of... · e37aa63e
      Linus Torvalds authored
      Merge tag 'for-linus-20121212' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300
      
      Pull MN10300 changes from David Howells:
       "miscellaneous MN10300 arch patches.  I've based it on top of Al Viro's
        signal tree - so these patches should be pulled after that."
      
      * tag 'for-linus-20121212' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-mn10300:
        MN10300: Use asm-generic/pci_iomap.h
        MN10300: Get rid of unused variable from ASB2305 PCI code
        MN10300: ASB2305 PCI code needs linux/irq.h
        mn10300/mm/fault.c: Port OOM changes to do_page_fault
        MN10300: Handle cacheable PCI regions in pci_iomap()
        MN10300: fix debug polling in ttySM driver
        MN10300: ttySM: clean up unnecessary casting
        MN10300: fix SMP synchronization between txdma and serial driver
        MN10300: fix serial port vdma irq setup for SMP
        MN10300: cleanup IRQ affinity setting
        MN10300: ttySM: Use memory barriers correctly in circular buffer logic
      e37aa63e
    • Olof Johansson's avatar
      ARM: arm-soc: Merge branch 'next/pm2' into next/pm · 9c7466b2
      Olof Johansson authored
      Another smaller branch merged into next/pm before pull request.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9c7466b2
    • Olof Johansson's avatar
      ARM: arm-soc: Merge branch 'next/clk' into next/pm · 4a76411e
      Olof Johansson authored
      Merge together a couple of the smaller pm/clock branches into one.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4a76411e
  3. 12 Dec, 2012 25 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 9977d9b3
      Linus Torvalds authored
      Pull big execve/kernel_thread/fork unification series from Al Viro:
       "All architectures are converted to new model.  Quite a bit of that
        stuff is actually shared with architecture trees; in such cases it's
        literally shared branch pulled by both, not a cherry-pick.
      
        A lot of ugliness and black magic is gone (-3KLoC total in this one):
      
         - kernel_thread()/kernel_execve()/sys_execve() redesign.
      
           We don't do syscalls from kernel anymore for either kernel_thread()
           or kernel_execve():
      
           kernel_thread() is essentially clone(2) with callback run before we
           return to userland, the callbacks either never return or do
           successful do_execve() before returning.
      
           kernel_execve() is a wrapper for do_execve() - it doesn't need to
           do transition to user mode anymore.
      
           As a result kernel_thread() and kernel_execve() are
           arch-independent now - they live in kernel/fork.c and fs/exec.c
           resp.  sys_execve() is also in fs/exec.c and it's completely
           architecture-independent.
      
         - daemonize() is gone, along with its parts in fs/*.c
      
         - struct pt_regs * is no longer passed to do_fork/copy_process/
           copy_thread/do_execve/search_binary_handler/->load_binary/do_coredump.
      
         - sys_fork()/sys_vfork()/sys_clone() unified; some architectures
           still need wrappers (ones with callee-saved registers not saved in
           pt_regs on syscall entry), but the main part of those suckers is in
           kernel/fork.c now."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits)
        do_coredump(): get rid of pt_regs argument
        print_fatal_signal(): get rid of pt_regs argument
        ptrace_signal(): get rid of unused arguments
        get rid of ptrace_signal_deliver() arguments
        new helper: signal_pt_regs()
        unify default ptrace_signal_deliver
        flagday: kill pt_regs argument of do_fork()
        death to idle_regs()
        don't pass regs to copy_process()
        flagday: don't pass regs to copy_thread()
        bfin: switch to generic vfork, get rid of pointless wrappers
        xtensa: switch to generic clone()
        openrisc: switch to use of generic fork and clone
        unicore32: switch to generic clone(2)
        score: switch to generic fork/vfork/clone
        c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone()
        take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h
        mn10300: switch to generic fork/vfork/clone
        h8300: switch to generic fork/vfork/clone
        tile: switch to generic clone()
        ...
      
      Conflicts:
      	arch/microblaze/include/asm/Kbuild
      9977d9b3
    • Linus Torvalds's avatar
      Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · cf4af012
      Linus Torvalds authored
      Pull ARM SoC board updates from Olof Johansson:
       "This branch contains a set of various board updates for ARM platforms.
      
        A few shmobile platforms that are stale have been removed, some
        defconfig updates for various boards selecting new features such as
        pinctrl subsystem support, and various updates enabling peripherals,
        etc."
      
      Fix up conflicts mostly as per Olof.
      
      * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
        ARM: S3C64XX: Add dummy supplies for Glenfarclas LDOs
        ARM: S3C64XX: Add registration of WM2200 Bells device on Cragganmore
        ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
        ARM: Dove: update defconfig
        ARM: Kirkwood: update defconfig for new boards
        arm: orion5x: add DT related options in defconfig
        arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
        arm: orion5x: basic Device Tree support
        arm: orion5x: mechanical defconfig update
        ARM: kirkwood: Add support for the MPL CEC4
        arm: kirkwood: add support for ZyXEL NSA310
        ARM: Kirkwood: new board USI Topkick
        ARM: kirkwood: use gpio-fan DT binding on lsxl
        ARM: Kirkwood: add Netspace boards to defconfig
        ARM: kirkwood: DT board setup for Network Space Mini v2
        ARM: kirkwood: DT board setup for Network Space Lite v2
        ARM: kirkwood: DT board setup for Network Space v2 and parents
        leds: leds-ns2: add device tree binding
        ARM: Kirkwood: Enable the second I2C bus
        ARM: mmp: select pinctrl driver
        ...
      cf4af012
    • Linus Torvalds's avatar
      Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d027db13
      Linus Torvalds authored
      Pull ARM SoC updates from Olof Johansson:
       "This contains the bulk of new SoC development for this merge window.
      
        Two new platforms have been added, the sunxi platforms (Allwinner A1x
        SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
        series of ARMv7 platforms from them, where the hope is that we can
        keep the platform code generic enough to have them all share one mach
        directory.  The new Broadcom platform is contributed by Christian
        Daudt.
      
        Highbank has grown support for Calxeda's next generation of hardware,
        ECX-2000.
      
        clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
        also taken on maintainership of the platform.
      
        Beyond this there has been a bunch of work from a number of people on
        converting more platforms to IRQ domains, pinctrl conversion, cleanup
        and general feature enablement across most of the active platforms."
      
      Fix up trivial conflicts as per Olof.
      
      * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
        mfd: vexpress-sysreg: Remove LEDs code
        irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
        clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
        irq: versatile: delete dangling variable
        ARM: sunxi: add missing include for mdelay()
        ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
        ARM: dts: add node for PL330 MDMA1 controller for exynos4
        ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
        ARM: EXYNOS: add UART3 to DEBUG_LL ports
        ARM: S3C24XX: Add clkdev entry for camif-upll clock
        ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
        ARM: sunxi: Add missing sun4i.dtsi file
        pinctrl: samsung: Do not initialise statics to 0
        ARM i.MX6: remove gate_mask from pllv3
        ARM i.MX6: Fix ethernet PLL clocks
        ARM i.MX6: rename PLLs according to datasheet
        ARM i.MX6: Add pwm support
        ARM i.MX51: Add pwm support
        ARM i.MX53: Add pwm support
        ARM: mx5: Replace clk_register_clkdev with clock DT lookup
        ...
      d027db13
    • Linus Torvalds's avatar
      Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d01e4afd
      Linus Torvalds authored
      Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
       "Cleanup patches for various ARM platforms and some of their associated
        drivers.  There's also a branch in here that enables Freescale i.MX to
        be part of the multiplatform support -- the first "big" SoC that is
        moved over (more multiplatform work comes in a separate branch later
        during the merge window)."
      
      Conflicts fixed as per Olof, including a silent semantic one in
      arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
      omap3xxx_restart(), and a new user of the old name was added).
      
      * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
        ARM: omap: fix typo on timer cleanup
        ARM: EXYNOS: Remove unused regs-mem.h file
        ARM: EXYNOS: Remove unused non-dt support for dwmci controller
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: OMAP3: cm-t3517: use GPTIMER for system clock
        ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
        ARM: SAMSUNG: use devm_ functions for ADC driver
        ARM: EXYNOS: no duplicate mask/unmask in eint0_15
        ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
        ARM: EXYNOS: Remove i2c0 resource information and setting of device names
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
        ARM: integrator: use BUG_ON where possible
        ARM: integrator: push down SC dependencies
        ARM: integrator: delete static UART1 mapping
        ARM: integrator: delete SC mapping on the CP
        ARM: integrator: remove static CP syscon mapping
        ARM: integrator: remove static AP syscon mapping
        ...
      d01e4afd
    • Linus Torvalds's avatar
      Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8287361a
      Linus Torvalds authored
      Pull ARM SoC Header cleanups from Olof Johansson:
       "This is a collection of header file cleanups, mostly for OMAP and
        AT91, that keeps moving the platforms in the direction of
        multiplatform by removing the need for mach-dependent header files
        used in drivers and other places."
      
      Fix up mostly trivial conflicts as per Olof.
      
      * tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
        ARM: OMAP2+: Move iommu/iovmm headers to platform_data
        ARM: OMAP2+: Make some definitions local
        ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
        ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
        ARM: OMAP2+: Move iopgtable header to drivers/iommu/
        ARM: OMAP: Merge iommu2.h into iommu.h
        atmel: move ATMEL_MAX_UART to platform_data/atmel.h
        ARM: OMAP: Remove omap_init_consistent_dma_size()
        arm: at91: move at91rm9200 rtc header in drivers/rtc
        arm: at91: move reset controller header to arm/arm/mach-at91
        arm: at91: move pit define to the driver
        arm: at91: move at91_shdwc.h to arch/arm/mach-at91
        arm: at91: move board header to arch/arm/mach-at91
        arn: at91: move at91_tc.h to arch/arm/mach-at91
        arm: at91 move at91_aic.h to arch/arm/mach-at91
        arm: at91 move board.h to arch/arm/mach-at91
        arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
        arm: at91: drop machine defconfig
        ARM: OMAP: Remove NEED_MACH_GPIO_H
        ARM: OMAP: Remove unnecessary mach and plat includes
        ...
      8287361a
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2989950c
      Linus Torvalds authored
      Pull ARM SoC Non-critical bug fixes from Olof Johansson:
       "Simple bug fixes that were not considered important enough for
        inclusion into 3.7, especially those that arrived late during the
        merge window.
      
        There's also a MAINTAINERS update for the Renesas platforms in here,
        marking Simon Horman as a maintainer and changing the git url to his
        tree."
      
      * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        Update ARM/SHMOBILE section of MAINTAINERS
        ARM: Fix Kconfig symbols typo for LEDS
        ARM: pxa: add dummy SA1100 rtc clock in pxa25x
        ARM: pxa: fix pxa25x gpio wakeup setting
        ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
        ARM: cns3xxx: drop unnecessary symbol selection
        ARM: vexpress: fix ll debug code when building multiplatform
        ARM: OMAP4: retrigger localtimers after re-enabling gic
        ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
        ARM: OMAP4: PM: add errata support
        ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init()
        ARM: davinci: uncompress.h: bail out if uart not initialized
        ARM: davinci: serial.h: fix uart number in the comment
        ARM: davinci: dm644x evm: move pointer dereference below NULL check
        ARM: vexpress: Make the debug UART detection more specific
      2989950c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · b1286f4e
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Here's the updates for ARM for this merge window, which cover quite a
        variety of areas.
      
        There's a bunch of patch series from Will tackling various bugs like
        the PROT_NONE handling, ASID allocation, cluster boot protocol and
        ASID TLB tagging updates.
      
        We move to a build-time sorted exception table rather than doing the
        sorting at run-time, add support for the secure computing filter, and
        some updates to the perf code.  We also have sorted out the placement
        of some headers, fixed some build warnings, fixed some hotplug
        problems with the per-cpu TWD code."
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (73 commits)
        ARM: 7594/1: Add .smp entry for REALVIEW_EB
        ARM: 7599/1: head: Remove boot-time HYP mode check for v5 and below
        ARM: 7598/1: net: bpf_jit_32: fix sp-relative load/stores offsets.
        ARM: 7595/1: syscall: rework ordering in syscall_trace_exit
        ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep
        ARM: 7597/1: net: bpf_jit_32: fix kzalloc gfp/size mismatch.
        ARM: 7593/1: nommu: do not enable DCACHE_WORD_ACCESS when !CONFIG_MMU
        ARM: 7592/1: nommu: prevent generation of kernel unaligned memory accesses
        ARM: 7591/1: nommu: Enable the strict alignment (CR_A) bit only if ARCH < v6
        ARM: 7590/1: /proc/interrupts: limit the display of IPIs to online CPUs only
        ARM: 7587/1: implement optimized percpu variable access
        ARM: 7589/1: integrator: pass the lm resource to amba
        ARM: 7588/1: amba: create a resource parent registrator
        ARM: 7582/2: rename kvm_seq to vmalloc_seq so to avoid confusion with KVM
        ARM: 7585/1: kernel: fix nr_cpu_ids check in DT logical map init
        ARM: 7584/1: perf: fix link error when CONFIG_HW_PERF_EVENTS is not selected
        ARM: gic: use a private mapping for CPU target interfaces
        ARM: kernel: add logical mappings look-up
        ARM: kernel: add cpu logical map DT init in setup_arch
        ARM: kernel: add device tree init map function
        ...
      b1286f4e
    • Yan Burman's avatar
      net/mlx4_en: Add support for destination MAC in steering rules · 520dfe3a
      Yan Burman authored
      Implement destination MAC rule extension for L3/L4 rules in
      flow steering. Usefull for vSwitch/macvlan configurations.
      Signed-off-by: default avatarYan Burman <yanb@mellanox.com>
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      520dfe3a
    • Yan Burman's avatar
      net/mlx4_en: Use generic etherdevice.h functions. · c402b947
      Yan Burman authored
      Get rid of full_mac, zero_mac in favour of
      is_zero_ether_addr and is_broadcast_ether_addr.
      Signed-off-by: default avatarYan Burman <yanb@mellanox.com>
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c402b947
    • Yan Burman's avatar
      net: ethtool: Add destination MAC address to flow steering API · d4676eac
      Yan Burman authored
      Add ability to specify destination MAC address for L3/L4 flow spec
      in order to be able to specify action for different VM's under vSwitch
      configuration. This change is transparent to older userspace.
      Signed-off-by: default avatarYan Burman <yanb@mellanox.com>
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d4676eac
    • Cong Wang's avatar
      bridge: add support of adding and deleting mdb entries · cfd56754
      Cong Wang authored
      This patch implents adding/deleting mdb entries via netlink.
      Currently all entries are temp, we probably need a flag to distinguish
      permanent entries too.
      
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Cc: Stephen Hemminger <shemminger@vyatta.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Thomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cfd56754
    • Cong Wang's avatar
      bridge: notify mdb changes via netlink · 37a393bc
      Cong Wang authored
      As Stephen mentioned, we need to monitor the mdb
      changes in user-space, so add notifications via netlink too.
      
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Cc: Stephen Hemminger <shemminger@vyatta.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Thomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      37a393bc
    • YOSHIFUJI Hideaki's avatar
      ndisc: Unexport ndisc_{build,send}_skb(). · fd0ea7db
      YOSHIFUJI Hideaki authored
      These symbols were exported for bonding device by commit 305d552a
      ("bonding: send IPv6 neighbor advertisement on failover").
      
      It bacame obsolete by commit 7c899432 ("bonding, ipv4, ipv6, vlan: Handle
      NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS") and removed by
      commit 4f5762ec ("bonding: Remove obsolete source file 'bond_ipv6.c'").
      Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fd0ea7db
    • stephen hemminger's avatar
      uapi: add missing netconf.h to export list · 895464fa
      stephen hemminger authored
      Add netconf.h for use by iproute2.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      895464fa
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 6facac1a
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "This includes a set of misc.  cifs fixes (most importantly some byte
        range lock related write fixes from Pavel, and some ACL and idmap
        related fixes from Jeff) but also includes the SMB2.02 dialect
        enablement, and a key fix for SMB3 mounts.
      
        Default authentication upgraded to ntlmv2 for cifs (it was already
        ntlmv2 for smb2)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (43 commits)
        CIFS: Fix write after setting a read lock for read oplock files
        cifs: parse the device name into UNC and prepath
        cifs: fix up handling of prefixpath= option
        cifs: clean up handling of unc= option
        cifs: fix SID binary to string conversion
        fix "disabling echoes and oplocks" on SMB2 mounts
        Do not send SMB2 signatures for SMB3 frames
        cifs: deal with id_to_sid embedded sid reply corner case
        cifs: fix hardcoded default security descriptor length
        cifs: extra sanity checking for cifs.idmap keys
        cifs: avoid extra allocation for small cifs.idmap keys
        cifs: simplify id_to_sid and sid_to_id mapping code
        CIFS: Fix possible data coherency problem after oplock break to None
        CIFS: Do not permit write to a range mandatory locked with a read lock
        cifs: rename cifs_readdir_lookup to cifs_prime_dcache and make it void return
        cifs: Add CONFIG_CIFS_DEBUG and rename use of CIFS_DEBUG
        cifs: Make CIFS_DEBUG possible to undefine
        SMB3 mounts fail with access denied to some servers
        cifs: Remove unused cEVENT macro
        cifs: always zero out smb_vol before parsing options
        ...
      6facac1a
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.8-rc1' of git://oss.sgi.com/xfs/xfs · 3f1c64f4
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "There is plenty going on, including the cleanup of xfssyncd, metadata
        verifiers, CRC infrastructure for the log, tracking of inodes with
        speculative allocation, a cleanup of xfs_fs_subr.c, fixes for
        XFS_IOC_ZERO_RANGE, and important fix related to log replay (only
        update the last_sync_lsn when a transaction completes), a fix for
        deadlock on AGF buffers, documentation and comment updates, and a few
        more cleanups and fixes.
      
        Details:
         - remove the xfssyncd mess
         - only update the last_sync_lsn when a transaction completes
         - zero allocation_args on the kernel stack
         - fix AGF/alloc workqueue deadlock
         - silence uninitialised f.file warning
         - Update inode alloc comments
         - Update mount options documentation
         - report projid32bit feature in geometry call
         - speculative preallocation inode tracking
         - fix attr tree double split corruption
         - fix broken error handling in xfs_vm_writepage
         - drop buffer io reference when a bad bio is built
         - add more attribute tree trace points
         - growfs infrastructure changes for 3.8
         - fs/xfs/xfs_fs_subr.c die die die
         - add CRC infrastructure
         - add CRC checks to the log
         - Remove description of nodelaylog mount option from xfs.txt
         - inode allocation should use unmapped buffers
         - byte range granularity for XFS_IOC_ZERO_RANGE
         - fix direct IO nested transaction deadlock
         - fix stray dquot unlock when reclaiming dquots
         - fix sparse reported log CRC endian issue"
      
      Fix up trivial conflict in fs/xfs/xfs_fsops.c due to the same patch
      having been applied twice (commits eaef8543 and 1375cb65: "xfs:
      growfs: don't read garbage for new secondary superblocks") with later
      updates to the affected code in the XFS tree.
      
      * tag 'for-linus-v3.8-rc1' of git://oss.sgi.com/xfs/xfs: (78 commits)
        xfs: fix sparse reported log CRC endian issue
        xfs: fix stray dquot unlock when reclaiming dquots
        xfs: fix direct IO nested transaction deadlock.
        xfs: byte range granularity for XFS_IOC_ZERO_RANGE
        xfs: inode allocation should use unmapped buffers.
        xfs: Remove the description of nodelaylog mount option from xfs.txt
        xfs: add CRC checks to the log
        xfs: add CRC infrastructure
        xfs: convert buffer verifiers to an ops structure.
        xfs: connect up write verifiers to new buffers
        xfs: add pre-write metadata buffer verifier callbacks
        xfs: add buffer pre-write callback
        xfs: Add verifiers to dir2 data readahead.
        xfs: add xfs_da_node verification
        xfs: factor and verify attr leaf reads
        xfs: factor dir2 leaf read
        xfs: factor out dir2 data block reading
        xfs: factor dir2 free block reading
        xfs: verify dir2 block format buffers
        xfs: factor dir2 block read operations
        ...
      3f1c64f4
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 22a40fd9
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This set fixes some conditions in which value blocks are invalidated,
        and includes two trivial cleanups."
      
      * tag 'dlm-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: fix lvb invalidation conditions
        fs/dlm: remove CONFIG_EXPERIMENTAL
        dlm: remove unused variable in *dlm_lowcomms_get_buffer()
      22a40fd9
    • Linus Torvalds's avatar
      Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · d206e090
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "A lot of activities on cgroup side.  The big changes are focused on
        making cgroup hierarchy handling saner.
      
         - cgroup_rmdir() had peculiar semantics - it allowed cgroup
           destruction to be vetoed by individual controllers and tried to
           drain refcnt synchronously.  The vetoing never worked properly and
           caused good deal of contortions in cgroup.  memcg was the last
           reamining user.  Michal Hocko removed the usage and cgroup_rmdir()
           path has been simplified significantly.  This was done in a
           separate branch so that the memcg people can base further memcg
           changes on top.
      
         - The above allowed cleaning up cgroup lifecycle management and
           implementation of generic cgroup iterators which are used to
           improve hierarchy support.
      
         - cgroup_freezer updated to allow migration in and out of a frozen
           cgroup and handle hierarchy.  If a cgroup is frozen, all descendant
           cgroups are frozen.
      
         - netcls_cgroup and netprio_cgroup updated to handle hierarchy
           properly.
      
         - Various fixes and cleanups.
      
         - Two merge commits.  One to pull in memcg and rmdir cleanups (needed
           to build iterators).  The other pulled in cgroup/for-3.7-fixes for
           device_cgroup fixes so that further device_cgroup patches can be
           stacked on top."
      
      Fixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to
      commit bea8c150 ("memcg: fix hotplugged memory zone oops") in master
      touching code close to commit 2ef37d3f ("memcg: Simplify
      mem_cgroup_force_empty_list error handling") in for-3.8)
      
      * 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (65 commits)
        cgroup: update Documentation/cgroups/00-INDEX
        cgroup_rm_file: don't delete the uncreated files
        cgroup: remove subsystem files when remounting cgroup
        cgroup: use cgroup_addrm_files() in cgroup_clear_directory()
        cgroup: warn about broken hierarchies only after css_online
        cgroup: list_del_init() on removed events
        cgroup: fix lockdep warning for event_control
        cgroup: move list add after list head initilization
        netprio_cgroup: allow nesting and inherit config on cgroup creation
        netprio_cgroup: implement netprio[_set]_prio() helpers
        netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx
        netprio_cgroup: reimplement priomap expansion
        netprio_cgroup: shorten variable names in extend_netdev_table()
        netprio_cgroup: simplify write_priomap()
        netcls_cgroup: move config inheritance to ->css_online() and remove .broken_hierarchy marking
        cgroup: remove obsolete guarantee from cgroup_task_migrate.
        cgroup: add cgroup->id
        cgroup, cpuset: remove cgroup_subsys->post_clone()
        cgroup: s/CGRP_CLONE_CHILDREN/CGRP_CPUSET_CLONE_CHILDREN/
        cgroup: rename ->create/post_create/pre_destroy/destroy() to ->css_alloc/online/offline/free()
        ...
      d206e090
    • Linus Torvalds's avatar
      Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · fef3ff2e
      Linus Torvalds authored
      Pull percpu changes from Tejun Heo:
       "Nothing exciting here either.  Joonsoo's is almost cosmetic.  Cyrill's
        patch fixes "percpu_alloc" early kernel param handling so that the
        kernel doesn't crash when the parameter is specified w/o any argument."
      
      * 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        mm, percpu: Make sure percpu_alloc early parameter has an argument
        percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree()
      fef3ff2e
    • Linus Torvalds's avatar
      Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · e7b55b8f
      Linus Torvalds authored
      Pull workqueue changes from Tejun Heo:
       "Nothing exciting.  Just two trivial changes."
      
      * 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: add WARN_ON_ONCE() on CPU number to wq_worker_waking_up()
        workqueue: trivial fix for return statement in work_busy()
      e7b55b8f
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 50851c62
      Linus Torvalds authored
      Pull thermal management update from Zhang Rui:
       "Highlights:
      
         - Introduction of thermal policy support, together with three new
           thermal governors, including step_wise, user_space, fire_share.
      
         - Introduction of ST-Ericsson db8500_thermal driver and ST-Ericsson
           db8500_cpufreq_cooling driver.
      
         - Thermal Kconfig file and Makefile refactor.
      
         - Fixes for generic thermal layer, generic cpucooling, rcar thermal
           driver and Exynos thermal driver."
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
        Thermal: Fix DEFAULT_THERMAL_GOVERNOR
        Thermal: fix a NULL pointer dereference when generic thermal layer is built as a module
        thermal: rcar: add rcar_zone_to_priv() macro
        thermal: rcar: fixup the unit of temperature
        thermal: cpu cooling: allow module builds
        thermal: cpu cooling: use const parameter while registering
        Thermal: Add ST-Ericsson DB8500 thermal properties and platform data.
        Thermal: Add ST-Ericsson DB8500 thermal driver.
        drivers/thermal/Makefile refactor
        Exynos: Add missing dependency
        Refactor drivers/thermal/Kconfig
        thermal: cpu_cooling: Make 'notify_device' static
        Thermal: Remove the cooling_cpufreq_list.
        Thermal: fix bug of counting cpu frequencies.
        Thermal: add indent for code alignment.
        thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()
        thermal: user_space: Add missing static storage class specifiers
        thermal: fair_share: Add missing static storage class specifiers
        thermal: step_wise: Add missing static storage class specifiers
        Thermal: Fix oops and unlocking in thermal_sys.c
        ...
      50851c62
    • Linus Torvalds's avatar
      Merge tag 'regmap-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 99b8f42e
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Quite a few enhancements this time around, helpers and diagnostics for
        the most part which is good to see:
      
         - Addition of table based lookups for the register access checks from
           Davide Ciminaghi, making life easier for drivers with big blocks of
           similar registers.
         - Allow drivers to get the irqdomain for regmap irq_chips, allowing
           the domain to be used with other APIs.
         - Debug improvements for paged register maps.
         - Performance improvments for some of the diagnostic infrastructure,
           very helpful for devices with large register maps."
      
      * tag 'regmap-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: debugfs: Cache offsets of valid regions for dump
        regmap: debugfs: Factor out initial seek
        regmap: debugfs: Avoid overflows for very small reads
        regmap: Cache register and value sizes for debugfs
        regmap: introduce tables for readable/writeable/volatile/precious checks
        regmap: core: Report registers in hex when we can't cache
        regmap: Fix printing of size_t variable
        regmap: make lock/unlock functions customizable
        regmap: silence GCC warning
        regmap: Split raw writes that cross window boundaries
        regmap: Make return code checks consistent
        regmap: Factor range lookup out of page selection
        regmap: Provide debugfs read of register ranges
        regmap: Factor out debugfs register read
        regmap: Allow ranges to be named
        regmap: When we sanity check during range adds say what errors we find
        regmap: Rename n_ranges to num_ranges
        regmap: irq: Allow users to retrieve the irq_domain
      99b8f42e
    • Linus Torvalds's avatar
      Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · 139353ff
      Linus Torvalds authored
      Pull ACPI5 error injection fix from Tony Luck:
       "Trivial fix for error injection code using ACPI5 version of EINJ"
      
      * tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        ACPI, APEI, EINJ: Add missed ACPI5 support for error trigger table
      139353ff
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore_mevent' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 251a8cfe
      Linus Torvalds authored
      Pull pstore fixes from Tony Luck:
       "Patch series to allow EFI variable backend to pstore to hold multiple
        records."
      
      * tag 'please-pull-pstore_mevent' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        efi_pstore: Add a format check for an existing variable name at erasing time
        efi_pstore: Add a format check for an existing variable name at reading time
        efi_pstore: Add a sequence counter to a variable name
        efi_pstore: Add ctime to argument of erase callback
        efi_pstore: Remove a logic erasing entries from a write callback to hold multiple logs
        efi_pstore: Add a logic erasing entries to an erase callback
        efi_pstore: Check remaining space with QueryVariableInfo() before writing data
      251a8cfe
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 70f2836d
      Linus Torvalds authored
      Pull ia64 fix from Tony Luck:
       "Miscellaneous ia64 fix for 3.8.  Just need to avoid a pending
        namespace collision from other work being merged."
      
      * tag 'please-pull-misc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] Resolve name space collision for cache_show()
      70f2836d