Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jul 2, 2015
  1. Merge tag 'devicetree-for-linus' of git://…

    Pull devicetree updates from Grant Likely:
     "A whole lot of bug fixes.
      Nothing stands out here except the ability to enable CONFIG_OF on
      every architecture, and an import of a newer version of dtc"
    * tag 'devicetree-for-linus' of git:// (22 commits)
      of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh
      of/irq: Fix pSeries boot failure
      Documentation: DT: Fix a typo in the filename "lantiq,<chip>-pinumx.txt"
      of: define of_find_node_by_phandle for !CONFIG_OF
      of/address: use atomic allocation in pci_register_io_range()
      of: Add vendor prefix for Zodiac Inflight Innovations
      dt/fdt: add empty versions of early_init_dt_*_memory_arch
      of: clean-up unnecessary libfdt include paths
      of: make unittest select OF_EARLY_FLATTREE instead of depend on it
      of: make CONFIG_OF user selectable
      MIPS: prepare for user enabling of CONFIG_OF
      of/fdt: fix argument name and add comments of unflatten_dt_node()
      of: return NUMA_NO_NODE from fallback of_node_to_nid()
      tps6507x.txt: Remove executable permission
      of/overlay: Grammar s/an negative/a negative/
      of/fdt: Make fdt blob input parameters of unflatten functions const
      of: add helper function to retrive match data
      of: Grammar s/property exist/property exists/
      of: Move OF flags to be visible even when !CONFIG_OF
      scripts/dtc: Update to upstream version 9d3649bd3be245c9
  2. Merge git://

    Pull watchdog updates from Wim Van Sebroeck:
     "This contains:
       - new driver for ST's LPC Watchdog
       - new driver for Conexant Digicolor CX92755 SoC
       - new driver for DA9062 watchdog
       - Addition of the watchdog registration deferral mechanism
       - several improvements on omap_wdt
       - several improvements and reboot-support for imgpdc_wdt
       - max63xx_wdt improvements
       - imx2_wdt improvements
       - dw_wdt improvements
       - and other small improvements and fixes"
    * git:// (37 commits)
      watchdog: omap_wdt: early_enable module parameter
      watchdog: gpio_wdt: Add option for early registration
      watchdog: watchdog_core: Add watchdog registration deferral mechanism
      watchdog: max63xx: dynamically allocate device
      watchdog: imx2_wdt: Disable previously acquired clock on error path
      watchdog: imx2_wdt: Check for clk_prepare_enable() error
      watchdog: hpwdt: Add support for WDIOC_SETOPTIONS
      watchdog: docs: omap_wdt also understands nowayout
      watchdog: omap_wdt: implement get_timeleft
      watchdog: da9062: DA9062 watchdog driver
      watchdog: imx2_wdt: set watchdog parent device
      watchdog: mena21_wdt: Fix possible NULL pointer dereference
      watchdog: dw_wdt: keepalive the watchdog at write time
      watchdog: dw_wdt: No need for a spinlock
      watchdog: imx2_wdt: also set wdog->timeout to new_timeout
      watchdog: Allow compile test of GPIO consumers if !GPIOLIB
      watchdog: cadence: Add dependency on HAS_IOMEM
      watchdog: max63xx_wdt: Constify platform_device_id
      watchdog: MAX63XX_WATCHDOG does not depend on ARM
      watchdog: imgpdc: Add some documentation about the timeout
  3. Merge tag 'clk-for-linus-4.2' of git://…

    Pull clock framework updates from Michael Turquette:
     "The changes to the common clock framework for 4.2 are dominated by new
      drivers and updates to existing ones, as usual.
      There are some fixes to the framework itself and several cleanups for
      sparse warnings, etc"
    * tag 'clk-for-linus-4.2' of git:// (135 commits)
      clk: stm32: Add clock driver for STM32F4[23]xxx devices
      dt-bindings: Document the STM32F4 clock bindings
      cpufreq: exynos: remove Exynos4210 specific cpufreq driver support
      ARM: Exynos: switch to using generic cpufreq driver for Exynos4210
      clk: samsung: exynos4: add cpu clock configuration data and instantiate cpu clock
      clk: samsung: add infrastructure to register cpu clocks
      clk: add CLK_RECALC_NEW_RATES clock flag for Exynos cpu clock support
      doc: dt: add documentation for lpc1850-ccu clk driver
      clk: add lpc18xx ccu clk driver
      doc: dt: add documentation for lpc1850-cgu clk driver
      clk: add lpc18xx cgu clk driver
      clk: keystone: add support for post divider register for main pll
      clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED
      clk: cygnus: remove Cygnus dummy clock binding
      clk: cygnus: add clock support for Broadcom Cygnus
      clk: Change bcm clocks build dependency
      clk: iproc: add initial common clock support
      clk: iproc: define Broadcom iProc clock binding
      MAINTAINERS: update email for Michael Turquette
      clk: meson: add some error handling in meson_clk_register_cpu()
  4. Merge branch 'for-next' of git://…

    Pull LED subsystem updates from Bryan Wu:
     "In this cycle, we finished to merge patches for LED Flash class
      Other than that we have some bug fixes and new drivers for LED
    * 'for-next' of git:// (33 commits)
      leds:lp55xx: fix firmware loading error
      leds: fix max77693-led build errors
      leds: fix aat1290 build errors
      leds: aat1290: pass flags parameter to devm_gpiod_get
      leds: ktd2692: pass flags parameter to devm_gpiod_get
      drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c
      leds: aat1290: add support for V4L2 Flash sub-device
      DT: aat1290: Document handling external strobe sources
      leds: max77693: add support for V4L2 Flash sub-device
      media: Add registration helpers for V4L2 flash sub-devices
      v4l: async: Add a pointer to of_node to struct v4l2_subdev, match it
      Documentation: leds: Add description of v4l2-flash sub-device
      leds: add BCM6358 LED driver
      leds: add DT binding for BCM6358 LED controller
      leds: fix brightness changing when software blinking is active
      Documentation: leds-lp5523: describe master fader attributes
      leds: lp5523: add master_fader support
      leds: leds-gpio: Allow compile test if !GPIOLIB
      leds: leds-gpio: Add missing #include <linux/of.h>
      gpiolib: Add missing dummies for the unified device properties interface
  5. Merge tag 'platform-drivers-x86-v4.2-1' of git://…

    Pull x86 platform driver updates from Darren Hart:
     "Fairly routine update for platform-drivers-x86.
      Mostly fixes and cleanups, with a significant refactoring of toshiba*
      drivers.  Includes the addition of the dell-rbtn driver.
       - fan control
       - add Dell airplane mode switch driver
       - platform rfkill fixes, and regression fix
       - handle missing _STA correctly
       - rafactor bluetooth support
       - haps documentation
       - driver cleanup
       - Use acpi_video_unregister_backlight instead of
         acpi_video_unregister in serveral drivers.
       - Orphan msi-wmi.
    * tag 'platform-drivers-x86-v4.2-1' of git:// (24 commits)
      MAINTAINERS: Orphan x86 driver msi-wmi
      ideapad: fix software rfkill setting
      dell-laptop: Use dell-rbtn instead i8042 filter when possible
      dell-rbtn: Export notifier for other kernel modules
      dell-rbtn: Dell Airplane Mode Switch driver
      samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister
      asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister
      apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister
      pvpanic: handle missing _STA correctly
      ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked
      asus-wmi: add fan control
      Documentation/ABI: Add file describing the sysfs entries for toshiba_haps
      toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros
      toshiba_haps: Replace sscanf with kstrtoint
      toshiba_acpi: Bump driver version to 0.22
      toshiba_acpi: Remove TOS_FAILURE check from some functions
      toshiba_acpi: Comments cleanup
      toshiba_acpi: Rename hci_{read, write}1 functions
      toshiba_acpi: Remove no longer needed hci_{read, write}2 functions
      toshiba_bluetooth: Change BT status message to debug
  6. Merge branch 'akpm' (patches from Andrew)

    Merge third patchbomb from Andrew Morton:
     - the rest of MM
     - scripts/gdb updates
     - ipc/ updates
     - lib/ updates
     - MAINTAINERS updates
     - various other misc things
    * emailed patches from Andrew Morton <>: (67 commits)
      genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
      genalloc: rename dev_get_gen_pool() to gen_pool_get()
      x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit
      MAINTAINERS: add zpool
      MAINTAINERS: BCACHE: Kent Overstreet has changed email address
      MAINTAINERS: move Jens Osterkamp to CREDITS
      MAINTAINERS: remove unused nbd.h pattern
      MAINTAINERS: update brcm gpio filename pattern
      MAINTAINERS: update brcm dts pattern
      MAINTAINERS: update sound soc intel patterns
      MAINTAINERS: remove website for paride
      MAINTAINERS: update Emulex ocrdma email addresses
      bcache: use kvfree() in various places
      libcxgbi: use kvfree() in cxgbi_free_big_mem()
      target: use kvfree() in session alloc and free
      IB/ehca: use kvfree() in ipz_queue_{cd}tor()
      drm/nouveau/gem: use kvfree() in u_free()
      drm: use kvfree() in drm_free_large()
      cxgb4: use kvfree() in t4_free_mem()
      cxgb3: use kvfree() in cxgb_free_mem()
Commits on Jul 1, 2015
  1. Merge branch 'timers-urgent-for-linus' of git://…

    Pull timer fixes from Thomas Gleixner:
     "This contains:
       - a build regression fix introduced by the timeconst move
       - a hotplug regression fix introduced by the timer wheel diet
       - a cpu hotplug bug fix for the exynos clocksource driver"
    * 'timers-urgent-for-linus' of git://
      time: Remove development rules from Kbuild/Makefile
      timer: Fix hotplug regression
      clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier
  2. Merge branch 'irq-urgent-for-linus' of git://…

    Pull irq fixes from Thomas Gleixner:
     "This contains:
       - a series of fixes for interrupt drivers to prevent a potential race
         when installing a chained interrupt handler
       - a fix for cpumask pointer misuse
       - a fix for using the wrong interrupt number from struct irq_data
       - removal of unused code and outdated comments
       - a few new helper functions which allow us to cleanup the interrupt
         handling code further in 4.3
       I decided against doing the cleanup at the end of this merge window
       and rather do the preparatory steps for 4.3, so we can run the final
       ABI change at the end of the 4.3 merge window with less risk"
    * 'irq-urgent-for-linus' of git:// (26 commits)
      ARM/LPC32xx: Use irq not hwirq for __irq_set_handler_locked()
      genirq: Implement irq_set_handler_locked()/irq_set_chip_handler_name_locked()
      genirq: Introduce helper irq_desc_get_irq()
      genirq: Remove irq_node()
      genirq: Clean up outdated comments related to include/linux/irqdesc.h
      mn10300: Fix incorrect use of irq_data->affinity
      MIPS/ralink: Fix race in installing chained IRQ handler
      MIPS/pci: Fix race in installing chained IRQ handler
      MIPS/ath25: Fix race in installing chained IRQ handler
      MIPS/ath25: Fix race in installing chained IRQ handler
      m68k/psc: Fix race in installing chained IRQ handler
      avr32/at32ap: Fix race in installing chained IRQ handler
      sh/intc: Fix race in installing chained IRQ handler
      sh/intc: Fix potential race in installing chained IRQ handler
      pinctrl/sun4i: Fix race in installing chained IRQ handler
      pinctrl/samsung: Fix race in installing chained IRQ handler
      pinctrl/samsung: Fix race in installing chained IRQ handler
      pinctrl/exynos: Fix race in installing chained IRQ handler
      pinctrl/st: Fix race in installing chained IRQ handler
      pinctrl/adi2: Fix race in installing chained IRQ handler
  3. Merge git://

    Pull crypto fixes from Herbert Xu:
     "This fixes the aesni setkey error and removes a couple of unnecessary
      NULL checks in the Intel qat driver"
    * git://
      crypto: aesni - fix failing setkey for rfc4106-gcm-aesni
      crypto: qat - Deletion of unnecessary checks before two function calls
  4. Merge git://

    Pull networking fixes from David Miller:
     1) mlx4 driver bug fixes (TX queue wakeups, csum complete indications)
        from Ido Shamay, Eran Ben Elisha, and Or Gerlitz.
     2) Missing unlock in error path of PTP support in renesas driver, from
        Dan Carpenter.
     3) Add Vitesse 8641 phy IDs to vitesse PHY driver, from Shaohui Xie.
     4) Bnx2x driver bug fixes (linearization of encap packets, scratchpad
        parity error notifications, flow-control and speed settings) from
        Yuval Mintz, Manish Chopra, Shahed Shaikh, and Ariel Elior.
     5) ipv6 extension header parsing in the igb chip has a HW errata,
        disable it.  Frm Todd Fujinaka.
     6) Fix PCI link state locking issue in e1000e driver, from Yanir
     7) Cure panics during MTU change in i40e, from Mitch Williams.
     8) Don't leak promisc refs in DSA slave driver, from Gilad Ben-Yossef.
     9) Add missing HAS_DMA dep to VIA Rhine driver, from Geery
    10) Make sure DMA map/unmap calls are symmetric in bnx2x driver, from
        Michal Schmidt.
    11) Workaround for MDIO access problems in bcm7xxx devices, from FLorian
    12) Fix races in SCTP protocol between OTTB responses and route
        removals, from Alexander Sverdlin.
    13) Fix jumbo frame checksum issue with some mvneta devices, from Simon
    * git:// (58 commits)
      sock_diag: don't broadcast kernel sockets
      net: mvneta: disable IP checksum with jumbo frames for Armada 370
      ARM: mvebu: update Ethernet compatible string for Armada XP
      net: mvneta: introduce compatible string "marvell, armada-xp-neta"
      api: fix compatibility of linux/in.h with netinet/in.h
      net: icplus: fix typo in constant name
      sis900: Trivial: Fix typos in enums
      stmmac: Trivial: fix typo in constant name
      sctp: Fix race between OOTB responce and route removal
      net-Liquidio: Delete unnecessary checks before the function call "vfree"
      vmxnet3: Bump up driver version number
      amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation
      net: phy: mdio-bcm-unimac: workaround initial read failures for integrated PHYs
      net: bcmgenet: workaround initial read failures for integrated PHYs
      net: phy: bcm7xxx: workaround MDIO management controller initial read
      bnx2x: fix DMA API usage
      net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA
      net/phy: tune get_phy_c45_ids to support more c45 phy
      bnx2x: fix lockdep splat
      net: fec: don't access RACC register when not available
  5. Merge tag 'iommu-fixes-v4.2' of git://…

    Pul IOMMU fixes from Joerg Roedel:
     "Four fixes have queued up to fix regressions introduced after v4.1:
       - Don't fail IOMMU driver initialization when the add_device
         call-back returns -ENODEV, as that just means that the device is
         not translated by the IOMMU.  This is pretty common on ARM.
       - Two fixes for the ARM-SMMU driver for a wrong feature check and to
         remove a redundant NULL check.
       - A fix for the AMD IOMMU driver to fix a boot panic on systems where
         the BIOS requests Unity Mappings in the IVRS table"
    * tag 'iommu-fixes-v4.2' of git://
      iommu/amd: Introduce protection_domain_init() function
      iommu/arm-smmu: Delete an unnecessary check before the function call "free_io_pgtable_ops"
      iommu/arm-smmu: Fix broken ATOS check
      iommu: Ignore -ENODEV errors from add_device call-back
  6. Merge tag 'sound-fix-4.2-rc1' of git://…

    Pull sound fixes from Takashi Iwai:
     "Here are a bunch of small fixes, mostly for HD-audio quirks, in
      addition to a few regression fixes and trivial cleanups"
    * tag 'sound-fix-4.2-rc1' of git://
      ALSA: Fix uninintialized error return
      ALSA: hda: Delete an unnecessary check before the function call "snd_info_free_entry"
      ALSA: hda - Add a fixup for Dell E7450
      ALSA: hda - Fix the dock headphone output on Fujitsu Lifebook E780
      ALSA: hda - Add headset support to Acer Aspire V5
      ALSA: hda - restore the MIC FIXUP for some Dell machines
      ALSA: jack: Fix endless loop at unique index detection
      ALSA: hda - set proper caps for newer AMD hda audio in KB/KV
      ALSA: hda - Disable widget power-save for VIA codecs
      ALSA: hda - Fix Dock Headphone on Thinkpad X250 seen as a Line Out
  7. Add __init attribute to new_kmalloc_cache

    Christoph Lameter authored committed
    Avoid the warning:
      WARNING: mm/built-in.o(.text.unlikely+0xc22): Section mismatch in reference from the function .new_kmalloc_cache() to the variable .init.rodata:kmalloc_info
      The function .new_kmalloc_cache() references
      the variable __initconst kmalloc_info.
    Signed-off-by: Christoph Lameter <>
    Reported-by: Stephen Rothwell <>
    Tested-by: Geert Uytterhoeven <>
    Signed-off-by: Linus Torvalds <>
  8. Merge tag 'pm+acpi-4.2-rc1-2' of git://…

    Pull power management and ACPI fixes from Rafael Wysocki:
     "These are fixes that didn't make it to the previous PM+ACPI pull
      request or are fixing issues introduced by it.
       - Fix a recently added memory leak in an error path in the ACPI
         resources management code (Dan Carpenter)
       - Fix a build warning triggered by an ACPI video header function that
         should be static inline (Borislav Petkov)
       - Change names of helper function converting struct fwnode_handle
         pointers to either struct device_node or struct acpi_device
         pointers so they don't conflict with local variable names
         (Alexander Sverdlin)
       - Make the hibernate core re-enable nonboot CPUs on failures to
         disable them as expected (Vitaly Kuznetsov)
       - Increase the default timeout of the device suspend watchdog to
         prevent it from triggering too early on some systems (Takashi Iwai)
       - Prevent the cpuidle powernv driver from registering idle states
         which leads to boot hangs (Preeti U Murthy)"
    * tag 'pm+acpi-4.2-rc1-2' of git://
      tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode
      PM / sleep: Increase default DPM watchdog timeout to 60
      PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
      ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node()
      ACPI / video: Inline acpi_video_set_dmi_backlight_type
      ACPI / resources: free memory on error in add_region_before()
  9. Merge tag 'for-linus-4.2-rc0-tag' of git://…

    Pull xen updates from David Vrabel:
     "Xen features and cleanups for 4.2-rc0:
       - add "make xenconfig" to assist in generating configs for Xen guests
       - preparatory cleanups necessary for supporting 64 KiB pages in ARM
       - automatically use hvc0 as the default console in ARM guests"
    * tag 'for-linus-4.2-rc0-tag' of git://
      block/xen-blkback: s/nr_pages/nr_segs/
      block/xen-blkfront: Remove invalid comment
      block/xen-blkfront: Remove unused macro MAXIMUM_OUTSTANDING_BLOCK_REQS
      arm/xen: Drop duplicate define mfn_to_virt
      xen/grant-table: Remove unused macro SPP
      xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
      xen: Include xen/page.h rather than asm/xen/page.h
      kconfig: add xenconfig defconfig helper
      kconfig: clarify kvmconfig is for kvm
      xen/pcifront: Remove usage of struct timeval
      xen/tmem: use BUILD_BUG_ON() in favor of BUG_ON()
      hvc_xen: avoid uninitialized variable warning
      xenbus: avoid uninitialized variable warning
      xen/arm: allow console=hvc0 to be omitted for guests
      arm,arm64/xen: move Xen initialization earlier
      arm/xen: Correctly check if the event channel interrupt is present
  10. Merge tag 'modules-next-for-linus' of git://…

    Pull module updates from Rusty Russell:
     "Main excitement here is Peter Zijlstra's lockless rbtree optimization
      to speed module address lookup.  He found some abusers of the module
      lock doing that too.
      A little bit of parameter work here too; including Dan Streetman's
      breaking up the big param mutex so writing a parameter can load
      another module (yeah, really).  Unfortunately that broke the usual
      suspects, !CONFIG_MODULES and !CONFIG_SYSFS, so those fixes were
      appended too"
    * tag 'modules-next-for-linus' of git:// (26 commits)
      modules: only use mod->param_lock if CONFIG_MODULES
      param: fix module param locks when !CONFIG_SYSFS.
      rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE()
      module: add per-module param_lock
      module: make perm const
      params: suppress unused variable error, warn once just in case code changes.
      modules: clarify CONFIG_MODULE_COMPRESS help, suggest 'N'.
      kernel/module.c: avoid ifdefs for sig_enforce declaration
      kernel/workqueue.c: remove ifdefs over wq_power_efficient
      kernel/params.c: export param_ops_bool_enable_only
      kernel/params.c: generalize bool_enable_only
      kernel/module.c: use generic module param operaters for sig_enforce
      kernel/params: constify struct kernel_param_ops uses
      sysfs: tightened sysfs permission checks
      module: Rework module_addr_{min,max}
      module: Use __module_address() for module_address_lookup()
      module: Make the mod_tree stuff conditional on PERF_EVENTS || TRACING
      module: Optimize __module_address() using a latched RB-tree
      rbtree: Implement generic latch_tree
      seqlock: Introduce raw_read_seqcount_latch()
  11. Merge tag 'arc-4.2-rc1' of git://…

    Pull ARC architecture updates from Vineet Gupta:
     - support for HS38 cores based on ARCv2 ISA
         ARCv2 is the next generation ISA from Synopsys and basis for the
         HS3{4,6,8} families of processors which retain the traditional ARC mantra of
         low power and configurability and are now more performant and feature rich.
         HS38x is a 10 stage pipeline core which supports MMU (with huge pages) and
         SMP (upto 4 cores) among other features.
     - support for ARC SDP (Software Development platform): Main Board + CPU Cards
        = AXS101: CPU Card with ARC700 in silicon @ 700 MHz
        = AXS103: CPU Card with HS38x in FPGA
     - refactoring of ARCompact port to accomodate new ARCv2 ISA
     - misc updates/cleanups
    * tag 'arc-4.2-rc1' of git:// (72 commits)
      ARC: Fix build failures for ARCompact in linux-next after ARCv2 support
      ARCv2: Allow older gcc to cope with new regime of ARCv2/ARCompact support
      ARCv2: [vdk] dts files and defconfig for HS38 VDK
      ARCv2: [axs103] Support ARC SDP FPGA platform for HS38x cores
      ARC: [axs101] Prepare for AXS103
      ARCv2: [nsim*hs*] Support simulation platforms for HS38x cores
      ARCv2: All bits in place, allow ARCv2 builds
      ARCv2: SLC: Handle explcit flush for DMA ops (w/o IO-coherency)
      ARCv2: STAR 9000837815 workaround hardware exclusive transactions livelock
      ARC: Reduce bitops lines of code using macros
      ARCv2: barriers
      arch: conditionally define smp_{mb,rmb,wmb}
      ARC: add smp barriers around atomics per Documentation/atomic_ops.txt
      ARC: add compiler barrier to LLSC based cmpxchg
      ARCv2: SMP: intc: IDU 2nd level intc for dynamic IRQ distribution
      ARCv2: SMP: clocksource: Enable Global Real Time counter
      ARCv2: SMP: ARConnect debug/robustness
      ARCv2: SMP: Support ARConnect (MCIP) for Inter-Core-Interrupts et al
      ARC: make plat_smp_ops weak to allow over-rides
      ARCv2: clocksource: Introduce 64bit local RTC counter
  12. watchdog: omap_wdt: early_enable module parameter

    Lars Poeschel authored Wim Van Sebroeck committed
    Add a early_enable module parameter to the omap_wdt that starts the
    watchdog on module insertion. The default value is 0 which does not
    start the watchdog - which also does not change the behavior if the
    parameter is not given.
    Signed-off-by: Lars Poeschel <>
    Reviewed-by: Guenter Roeck <>
    Signed-off-by: Wim Van Sebroeck <>
  13. time: Remove development rules from Kbuild/Makefile

    Thomas Gleixner authored
    time.o gets rebuilt unconditionally due to a leftover Makefile rule
    which was placed there for development purposes.
    Remove it along with the commented out always rule in the toplevel
    Kbuild file.
    Fixes: 0a22798 'time: Move timeconst.h into include/generated'
    Reported-by; Stephen Boyd <>
    Signed-off-by: Thomas Gleixner <>
    Cc: Nicholas Mc Guire <>
  14. @joergroedel

    iommu/amd: Introduce protection_domain_init() function

    joergroedel authored
    This function contains the common parts between the
    initialization of dma_ops_domains and usual protection
    domains. This also fixes a long-standing bug which was
    uncovered by recent changes, in which the api_lock was not
    initialized for dma_ops_domains.
    Reported-by: George Wang <>
    Tested-by: George Wang <>
    Signed-off-by: Joerg Roedel <>
  15. Merge git://

    Pull arch/tile updates from Chris Metcalf:
     "These are a grab bag of changes to improve debugging and respond to a
      variety of issues raised on LKML over the last couple of months"
    * git://
      tile: avoid a "label not used" warning in do_page_fault()
      tile: vdso: use raw_read_seqcount_begin() in vdso
      tile: force CONFIG_TILEGX if ARCH != tilepro
      tile: improve stack backtrace
      tile: fix "odd fault" warning for stack backtraces
      tile: set up initial stack top to honor STACK_TOP_DELTA
      tile: support delivering NMIs for multicore backtrace
      drivers/tty/hvc/hvc_tile.c: properly return -EAGAIN
      tile: add <asm/word-at-a-time.h> and enable support functions
      tile: use READ_ONCE() in arch_spin_is_locked()
      tile: modify arch_spin_unlock_wait() semantics
  16. Merge branch 'for-linus' of git://…

    Pull more s390 updates from Martin Schwidefsky:
     "There is one larger patch for the AP bus code to make it work with the
      longer reset periods of the latest crypto cards.
      A new default configuration, a naming cleanup for SMP and a few fixes"
    * 'for-linus' of git://
      s390/kdump: fix compile for !SMP
      s390/kdump: fix nosmt kernel parameter
      s390: new default configuration
      s390/smp: cleanup core vs. cpu in the SCLP interface
      s390/smp: fix sigp cpu detection loop
      s390/zcrypt: Fixed reset and interrupt handling of AP queues
      s390/kdump: fix REGSET_VX_LOW vector register ELF notes
      s390/bpf: Fix backward jumps
  17. Merge branch 'for-next' of git://

    Pull CIFS/SMB3 updates from Steve French:
     "Includes two bug fixes, as well as (minimal) support for the new
      protocol dialect (SMB3.1.1), and support for two ioctls including
      reflink (duplicate extents) file copy and set integrity"
    * 'for-next' of git://
      cifs: Unset CIFS_MOUNT_POSIX_PATHS flag when following dfs mounts
      Update negotiate protocol for SMB3.11 dialect
      Add ioctl to set integrity
      Add Get/Set Integrity Information structure definitions
      Add reflink copy over SMB3.11 with new FSCTL_DUPLICATE_EXTENTS
      Add SMB3.11 mount option synonym for new dialect
      add struct FILE_STANDARD_INFO
      Make dialect negotiation warning message easier to read
      Add defines and structs for smb3.1 dialect
      Allow parsing vers=3.11 on cifs mount
      client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set
  18. Merge tag 'xfs-for-linus-4.2-rc1' of git://…

    Pul xfs updates from Dave Chinner:
     "There's a couple of small API changes to the core DAX code which
      required small changes to the ext2 and ext4 code bases, but otherwise
      everything is within the XFS codebase.
      This update contains:
       - A new sparse on-disk inode record format to allow small extents to
         be used for inode allocation when free space is fragmented.
       - DAX support.  This includes minor changes to the DAX core code to
         fix problems with lock ordering and bufferhead mapping abuse.
       - transaction commit interface cleanup
       - removal of various unnecessary XFS specific type definitions
       - cleanup and optimisation of freelist preparation before allocation
       - various minor cleanups
       - bug fixes for
    	- transaction reservation leaks
    	- incorrect inode logging in unwritten extent conversion
    	- mmap lock vs freeze ordering
    	- remote symlink mishandling
    	- attribute fork removal issues"
    * tag 'xfs-for-linus-4.2-rc1' of git:// (49 commits)
      xfs: don't truncate attribute extents if no extents exist
      xfs: clean up XFS_MIN_FREELIST macros
      xfs: sanitise error handling in xfs_alloc_fix_freelist
      xfs: factor out free space extent length check
      xfs: xfs_alloc_fix_freelist() can use incore perag structures
      xfs: remove xfs_caddr_t
      xfs: use void pointers in log validation helpers
      xfs: return a void pointer from xfs_buf_offset
      xfs: remove inst_t
      xfs: remove __psint_t and __psunsigned_t
      xfs: fix remote symlinks on V5/CRC filesystems
      xfs: fix xfs_log_done interface
      xfs: saner xfs_trans_commit interface
      xfs: remove the flags argument to xfs_trans_cancel
      xfs: pass a boolean flag to xfs_trans_free_items
      xfs: switch remaining xfs_trans_dup users to xfs_trans_roll
      xfs: check min blks for random debug mode sparse allocations
      xfs: fix sparse inodes 32-bit compile failure
      xfs: add initial DAX support
      xfs: add DAX IO path support
  19. Merge branch 'for-linus-4.2' of git://…

    Pull btrfs updates from Chris Mason:
     "Outside of our usual batch of fixes, this integrates the subvolume
      quota updates that Qu Wenruo from Fujitsu has been working on for a
      few releases now.  He gets an extra gold star for making btrfs smaller
      this time, and fixing a number of quota corners in the process.
      Dave Sterba tested and integrated Anand Jain's sysfs improvements.
      Outside of exporting a symbol (ack'd by Greg) these are all internal
      to btrfs and it's mostly cleanups and fixes.  Anand also attached some
      of our sysfs objects to our internal device management structs instead
      of an object off the super block.  It will make device management
      easier overall and it's a better fit for how the sysfs files are used.
      None of the existing sysfs files are moved around.
      Thanks for all the fixes everyone"
    * 'for-linus-4.2' of git:// (87 commits)
      btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
      Btrfs: Check if kobject is initialized before put
      lib: export symbol kobject_move()
      Btrfs: sysfs: add support to show replacing target in the sysfs
      Btrfs: free the stale device
      Btrfs: use received_uuid of parent during send
      Btrfs: fix use-after-free in btrfs_replay_log
      btrfs: wait for delayed iputs on no space
      btrfs: qgroup: Make snapshot accounting work with new extent-oriented qgroup.
      btrfs: qgroup: Add the ability to skip given qgroup for old/new_roots.
      btrfs: ulist: Add ulist_del() function.
      btrfs: qgroup: Cleanup the old ref_node-oriented mechanism.
      btrfs: qgroup: Switch self test to extent-oriented qgroup mechanism.
      btrfs: qgroup: Switch to new extent-oriented qgroup mechanism.
      btrfs: qgroup: Switch rescan to new mechanism.
      btrfs: qgroup: Add new qgroup calculation function btrfs_qgroup_account_extents().
      btrfs: backref: Add special time_seq == (u64)-1 case for btrfs_find_all_roots().
      btrfs: qgroup: Add new function to record old_roots.
      btrfs: qgroup: Record possible quota-related extent for qgroup.
      btrfs: qgroup: Add function qgroup_update_counters().
  20. Merge branch 'for-linus' of git://

    Pull more block layer patches from Jens Axboe:
     "A few later arrivers that I didn't fold into the first pull request,
      so we had a chance to run some testing.  This contains:
       - NVMe:
            - Set of fixes from Keith
            - 4.4 and earlier gcc build fix from Andrew
       - small set of xen-blk{back,front} fixes from Bob Liu.
       - warnings fix for bogus inline statement in I_BDEV() from Geert.
       - error code fixup for SG_IO ioctl from Paolo Bonzini"
    * 'for-linus' of git://
      drivers/block/nvme-core.c: fix build with gcc-4.4.4
      bdi: Remove "inline" keyword from exported I_BDEV() implementation
      block: fix bogus EFAULT error from SG_IO ioctl
      NVMe: Fix filesystem deadlock on removal
      NVMe: Failed controller initialization fixes
      NVMe: Unify controller probe and resume
      NVMe: Don't use fake status on cancelled command
      NVMe: Fix device cleanup on initialization failure
      drivers: xen-blkfront: only talk_to_blkback() when in XenbusStateInitialising
      xen/block: add multi-page ring support
      driver: xen-blkfront: move talk_to_blkback to a more suitable place
      drivers: xen-blkback: delay pending_req allocation to connect_ring
  21. genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()

    Vladimir Zapolskiy authored committed
    To be consistent with other kernel interface namings, rename
    of_get_named_gen_pool() to of_gen_pool_get().  In the original function
    name "_named" suffix references to a device tree property, which contains
    a phandle to a device and the corresponding device driver is assumed to
    register a gen_pool object.
    Due to a weak relation and to avoid any confusion (e.g.  in future
    possible scenario if gen_pool objects are named) the suffix is removed.
    [ crypto/marvell/cesa - fix up for of_get_named_gen_pool() rename]
    Signed-off-by: Vladimir Zapolskiy <>
    Cc: Nicolas Ferre <>
    Cc: Philipp Zabel <>
    Cc: Shawn Guo <>
    Cc: Sascha Hauer <>
    Cc: Alexandre Belloni <>
    Cc: Russell King <>
    Cc: Mauro Carvalho Chehab <>
    Cc: Vinod Koul <>
    Cc: Takashi Iwai <>
    Cc: Jaroslav Kysela <>
    Signed-off-by: Stephen Rothwell <>
    Cc: Herbert Xu <>
    Cc: Boris BREZILLON <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  22. genalloc: rename dev_get_gen_pool() to gen_pool_get()

    Vladimir Zapolskiy authored committed
    To be consistent with other genalloc interface namings, rename
    dev_get_gen_pool() to gen_pool_get().  The original omitted "dev_" prefix
    is removed, since it points to argument type of the function, and so it
    does not bring any useful information.
    [ update arch/arm/mach-socfpga/pm.c]
    Signed-off-by: Vladimir Zapolskiy <>
    Acked-by: Nicolas Ferre <>
    Cc: Philipp Zabel <>
    Cc: Shawn Guo <>
    Cc: Sascha Hauer <>
    Cc: Alexandre Belloni <>
    Cc: Russell King <>
    Cc: Mauro Carvalho Chehab <>
    Cc: Vinod Koul <>
    Cc: Takashi Iwai <>
    Cc: Jaroslav Kysela <>
    Cc: Mark Brown <>
    Cc: Nicolas Ferre <>
    Cc: Alan Tull <>
    Cc: Dinh Nguyen <>
    Cc: Kevin Hilman <>
    Cc: Stephen Rothwell <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  23. @joshtriplett

    x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit

    joshtriplett authored committed
    For 32-bit userspace on a 64-bit kernel, this requires modifying
    stub32_clone to actually swap the appropriate arguments to match
    CONFIG_CLONE_BACKWARDS, rather than just leaving the C argument for tls
    Patch co-authored by Josh Triplett and Thiago Macieira.
    Signed-off-by: Josh Triplett <>
    Acked-by: Andy Lutomirski <>
    Cc: Ingo Molnar <>
    Cc: "H. Peter Anvin" <>
    Cc: Peter Zijlstra <>
    Cc: Thomas Gleixner <>
    Cc: Thiago Macieira <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  24. @ddstreet

    MAINTAINERS: add zpool

    ddstreet authored committed
    Add entry for zpool to MAINTAINERS file.
    Signed-off-by: Dan Streetman <>
    Cc: Seth Jennings <>
    Cc: Minchan Kim <>
    Cc: Nitin Gupta <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  25. @JoePerches

    MAINTAINERS: BCACHE: Kent Overstreet has changed email address

    JoePerches authored committed
    Kent's email address in MAINTAINERS seems to be invalid.
    This was his last sign-off address, so use that if appropriate.
    Fix the S: status entry while there.
    Signed-off-by: Joe Perches <>
    Acked-by: Kent Overstreet <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  26. @JoePerches

    MAINTAINERS: move Jens Osterkamp to CREDITS

    JoePerches authored committed
    Jens' email address bounces, so move his name and entry to CREDITS.
    Signed-off-by: Joe Perches <>
    Cc: Ishizaki Kou <>
    Cc: Jens Osterkamp <>
    Cc: Benjamin Herrenschmidt <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  27. @JoePerches

    MAINTAINERS: remove unused nbd.h pattern

    JoePerches authored committed
    Commit 13e71d6 ("nbd: Remove kernel internal header") deleted the
    file, remove the pattern.
    Signed-off-by: Joe Perches <>
    Acked-by: Markus Pargmann <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  28. @JoePerches

    MAINTAINERS: update brcm gpio filename pattern

    JoePerches authored committed
    Commit 23a71fd ("dt-bindings: brcm: rationalize Broadcom
    documentation naming") renamed the file, update the pattern.
    Signed-off-by: Joe Perches <>
    Acked-by: Scott Branden <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  29. @JoePerches

    MAINTAINERS: update brcm dts pattern

    JoePerches authored committed
    Commit 8c0b9ee ("MIPS: Move device-trees into vendor
    sub-directories") moved the files, update the pattern.
    Signed-off-by: Joe Perches <>
    Cc: Andrew Bresticker <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
Something went wrong with that request. Please try again.