1. 04 Jun, 2014 22 commits
    • Naoya Horiguchi's avatar
      hugetlb: restrict hugepage_migration_support() to x86_64 · c177c81e
      Naoya Horiguchi authored
      
      
      Currently hugepage migration is available for all archs which support
      pmd-level hugepage, but testing is done only for x86_64 and there're
      bugs for other archs.  So to avoid breaking such archs, this patch
      limits the availability strictly to x86_64 until developers of other
      archs get interested in enabling this feature.
      
      Simply disabling hugepage migration on non-x86_64 archs is not enough to
      fix the reported problem where sys_move_pages() hits the BUG_ON() in
      follow_page(FOLL_GET), so let's fix this by checking if hugepage
      migration is supported in vma_migratable().
      Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Reported-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      Tested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: David Miller <davem@davemloft.net>
      Cc: <stable@vger.kernel.org>	[3.12+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c177c81e
    • Hugh Dickins's avatar
      mm: fix sleeping function warning from __put_anon_vma · 7f39dda9
      Hugh Dickins authored
      Trinity reports BUG:
      
        sleeping function called from invalid context at kernel/locking/rwsem.c:47
        in_atomic(): 0, irqs_disabled(): 0, pid: 5787, name: trinity-c27
      
      __might_sleep < down_write < __put_anon_vma < page_get_anon_vma <
      migrate_pages < compact_zone < compact_zone_order < try_to_compact_pages ..
      
      Right, since conversion to mutex then rwsem, we should not put_anon_vma()
      from inside an rcu_read_lock()ed section: fix the two places that did so.
      And add might_sleep() to anon_vma_free(), as suggested by Peter Zijlstra.
      
      Fixes: 88c22088
      
       ("mm: optimize page_lock_anon_vma() fast-path")
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7f39dda9
    • Andi Kleen's avatar
      MAINTAINERS: pass on hwpoison maintainership to Naoya Horiguchi · f9625c48
      Andi Kleen authored
      
      
      Horiguchi-san has done most of the work on hwpoison in the last years
      and he also does most of the reviewing.  So I'm passing on the hwpoison
      maintainership to him.
      Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
      Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f9625c48
    • Joe Perches's avatar
      MAINTAINERS: add Joe as the get_maintainer.pl maintainer · f8f1ec73
      Joe Perches authored
      
      
      Might as well be the get_maintainer maintainer...
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f8f1ec73
    • Konstantin Khlebnikov's avatar
      tools/vm/page-types.c: catch sigbus if raced with truncate · 1d46598b
      Konstantin Khlebnikov authored
      
      
      Recently added page-cache dumping is known to be a little bit racy.
      But after race with truncate it just dies due to unhandled SIGBUS
      when it tries to poke pages beyond the new end of file.
      This patch adds handler for SIGBUS which skips the rest of the file.
      Signed-off-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
      Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1d46598b
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-3.16' of... · d2705064
      Linus Torvalds authored
      Merge tag 'devicetree-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next
      
      Pull DeviceTree updates from Rob Herring:
       - Another round of clean-up of FDT related code in architecture code.
         This removes knowledge of internal FDT details from most
         architectures except powerpc.
       - Conversion of kernel's custom FDT parsing code to use libfdt.
       - DT based initialization for generic serial earlycon.  The
         introduction of generic serial earlycon support went in through the
         tty tree.
       - Improve the platform device naming for DT probed devices to ensure
         unique naming and use parent names instead of a global index.
       - Fix a race condition in of_update_property.
       - Unify the various linker section OF match tables and fix several
         function prototype errors.
       - Update platform_get_irq_byname to work in deferred probe cases.
       - 2 binding doc updates
      
      * tag 'devicetree-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (58 commits)
        of: handle NULL node in next_child iterators
        of/irq: provide more wrappers for !CONFIG_OF
        devicetree: bindings: Document micrel vendor prefix
        dt: bindings: dwc2: fix required value for the phy-names property
        of_pci_irq: kill useless variable in of_irq_parse_pci()
        of/irq: do irq resolution in platform_get_irq_byname()
        of: Add a testcase for of_find_node_by_path()
        of: Make of_find_node_by_path() handle /aliases
        of: Create unlocked version of for_each_child_of_node()
        lib: add glibc style strchrnul() variant
        of: Handle memory@0 node on PPC32 only
        pci/of: Remove dead code
        of: fix race between search and remove in of_update_property()
        of: Use NULL for pointers
        of: Stop naming platform_device using dcr address
        of: Ensure unique names without sacrificing determinism
        tty/serial: pl011: add DT based earlycon support
        of/fdt: add FDT serial scanning for earlycon
        of/fdt: add FDT address translation support
        serial: earlycon: add DT support
        ...
      d2705064
    • Linus Torvalds's avatar
      Merge tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into next · b77279bc
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "At this time, majority of changes come from ASoC world while we got a
        few new drivers in other places for FireWire and USB.  There have been
        lots of ASoC core cleanups / refactoring, but very little visible to
        external users.
      
        ASoC:
         - Support for specifying aux CODECs in DT
         - Removal of the deprecated mux and enum macros
         - More moves towards full componentisation
         - Removal of some unused I/O code
         - Lots of cleanups, fixes and enhancements to the davinci, Freescale,
           Haswell and Realtek drivers
         - Several drivers exposed directly in Kconfig for use with
           simple-card
         - GPIO descriptor support for jacks
         - More updates and fixes to the Freescale SSI, Intel and rsnd drivers
         - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651
           and ST STA350, Analog Devices ADAU1361, ADAU1381, ADAU1761 and
           ADAU1781, and Realtek RT5677
      
        HD-audio:
         - Clean up Dell headset quirks
         - Noise fixes for Dell and Sony laptops
         - Thinkpad T440 dock fix
         - Realtek codec updates (ALC293,ALC233,ALC3235)
         - Tegra HD-audio HDMI support
      
        FireWire-audio:
         - FireWire audio stack enhancement (AMDTP, MIDI), support for
           incoming isochronous stream and duplex streams with timestamp
           synchronization
         - BeBoB-based devices support
         - Fireworks-based device support
      
        USB-audio:
         - Behringer BCD2000 USB device support
      
        Misc:
         - Clean up of a few old drivers, atmel, fm801, etc"
      
      * tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (480 commits)
        ASoC: Fix wrong argument for card remove callbacks
        ASoC: free jack GPIOs before the sound card is freed
        ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation
        ASoC: cache: Fix error code when not using ASoC level cache
        ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
        ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
        ALSA: firewire-lib: Use IEC 61883-6 compliant labels for Raw Audio data
        ASoC: add RT5677 CODEC driver
        ASoC: intel: The Baytrail/MAX98090 driver depends on I2C
        ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support
        ASoC: rt5640: Add the function of the PLL clock calculation to RL6231 shared support
        ASoC: rt5640: Add RL6231 class device shared support for RT5640, RT5645 and RT5651
        ASoC: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        ASoC: Add helper functions to cast from DAPM context to CODEC/platform
        ALSA: bebob: sizeof() vs ARRAY_SIZE() typo
        ASoC: wm9713: correct mono out PGA sources
        ALSA: synth: emux: soundfont.c: Cleaning up memory leak
        ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320
        ASoC: fsl-ssi: Use regmap
        ASoC: fsl-ssi: reorder and document fsl_ssi_private
        ...
      b77279bc
    • Linus Torvalds's avatar
      Merge tag 'fbdev-omap-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into next · 15b58830
      Linus Torvalds authored
      Pull omap fbdev changes from Tomi Valkeinen:
       - DT support for the panel drivers that were still missing it
       - TI AM43xx support
       - TI OMAP5 support
      
      * tag 'fbdev-omap-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (46 commits)
        OMAPDSS: move 'compatible' converter to omapdss driver
        OMAPDSS: HDMI: fix devm_ioremap_resource error checks
        OMAPDSS: HDMI: remove unused defines
        OMAPDSS: HDMI: cleanup WP ioremaps
        OMAPDSS: panel NEC-NL8048HL11 DT support
        Doc/DT: Add DT binding documentation for TPO td043mtea1 panel
        OMAPDSS: Panel TPO-TD043MTEA1 DT support
        Doc/DT: Add DT binding documentation for SHARP LS037V7DW01
        OMAPDSS: panel sharp-ls037v7dw01 DT support
        OMAPDSS: panel-sharp-ls037v7dw01: update to use gpiod
        Doc/DT: Add binding doc for lgphilips,lb035q02.txt
        OMAPDSS: panel-lgphilips-lb035q02: Add DT support
        OMAPDSS: panel-lgphilips-lb035q02: use gpiod for enable gpio
        OMAPDSS: hdmi5_core: Fix compilation with OMAP5_DSS_HDMI_AUDIO
        OMAPDSS: panel-dpi: enable-gpio
        OMAPDSS: Fix writes to DISPC_POL_FREQ
        Doc/DT: Add OMAP5 DSS DT bindings
        OMAPDSS: HDMI: cleanup ioremaps
        OMAPDSS: HDMI: Add OMAP5 HDMI support
        OMAPDSS: HDMI: PLL changes for OMAP5
        ...
      15b58830
    • Linus Torvalds's avatar
      Merge tag 'fbdev-main-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into next · d55696af
      Linus Torvalds authored
      Pull main fbdev changes from Tomi Valkeinen:
       "Mainly fixes and small improvements.  The biggest change seems to be
        backlight control support for mx3fb"
      
      * tag 'fbdev-main-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (31 commits)
        drivers/video/fbdev/fb-puv3.c: Add header files for function unifb_mmap
        video: fbdev: s3fb.c: Fix for possible null pointer dereference
        video: fbdev: grvga.c: Fix for possible null pointer dereference
        matroxfb: perform a dummy read of M_STATUS
        video: of: display_timing: fix default native-mode setting
        video: delete unneeded call to platform_get_drvdata
        video: mx3fb: Add backlight control support
        video: omap: delete support for early fbmem allocation
        video: of: display_timing: remove two unsafe error messages
        fbdev: fbmem: remove positive test on unsigned values
        fbcon: Fix memory leak in con2fb_release_oldinfo()
        video: Kconfig: Add a dependency to the Goldfish framebuffer driver
        video: exynos: Add a dependency to the menu
        video: mx3fb: Use devm_kzalloc
        video/nuc900: allow modular build
        video: atmel needs FB_BACKLIGHT
        video: export fb_prepare_logo
        video/mbx: fix building debugfs support
        video/omap: fix modular build
        video: clarify I2C dependencies
        ...
      d55696af
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.16-rc1' of... · 4dc4226f
      Linus Torvalds authored
      Merge tag 'pm+acpi-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into next
      
      Pull ACPI and power management updates from Rafael Wysocki:
       "ACPICA is the leader this time (63 commits), followed by cpufreq (28
        commits), devfreq (15 commits), system suspend/hibernation (12
        commits), ACPI video and ACPI device enumeration (10 commits each).
      
        We have no major new features this time, but there are a few
        significant changes of how things work.  The most visible one will
        probably be that we are now going to create platform devices rather
        than PNP devices by default for ACPI device objects with _HID.  That
        was long overdue and will be really necessary to be able to use the
        same drivers for the same hardware blocks on ACPI and DT-based systems
        going forward.  We're not expecting fallout from this one (as usual),
        but it's something to watch nevertheless.
      
        The second change having a chance to be visible is that ACPI video
        will now default to using native backlight rather than the ACPI
        backlight interface which should generally help systems with broken
        Win8 BIOSes.  We're hoping that all problems with the native backlight
        handling that we had previously have been addressed and we are in a
        good enough shape to flip the default, but this change should be easy
        enough to revert if need be.
      
        In addition to that, the system suspend core has a new mechanism to
        allow runtime-suspended devices to stay suspended throughout system
        suspend/resume transitions if some extra conditions are met
        (generally, they are related to coordination within device hierarchy).
        However, enabling this feature requires cooperation from the bus type
        layer and for now it has only been implemented for the ACPI PM domain
        (used by ACPI-enumerated platform devices mostly today).
      
        Also, the acpidump utility that was previously shipped as a separate
        tool will now be provided by the upstream ACPICA along with the rest
        of ACPICA code, which will allow it to be more up to date and better
        supported, and we have one new cpuidle driver (ARM clps711x).
      
        The rest is improvements related to certain specific use cases,
        cleanups and fixes all over the place.
      
        Specifics:
      
         - ACPICA update to upstream version 20140424.  That includes a number
           of fixes and improvements related to things like GPE handling,
           table loading, headers, memory mapping and unmapping, DSDT/SSDT
           overriding, and the Unload() operator.  The acpidump utility from
           upstream ACPICA is included too.  From Bob Moore, Lv Zheng, David
           Box, David Binderman, and Colin Ian King.
      
         - Fixes and cleanups related to ACPI video and backlight interfaces
           from Hans de Goede.  That includes blacklist entries for some new
           machines and using native backlight by default.
      
         - ACPI device enumeration changes to create platform devices rather
           than PNP devices for ACPI device objects with _HID by default.  PNP
           devices will still be created for the ACPI device object with
           device IDs corresponding to real PNP devices, so that change should
           not break things left and right, and we're expecting to see more
           and more ACPI-enumerated platform devices in the future.  From
           Zhang Rui and Rafael J Wysocki.
      
         - Updates for the ACPI LPSS (Low-Power Subsystem) driver allowing it
           to handle system suspend/resume on Asus T100 correctly.  From
           Heikki Krogerus and Rafael J Wysocki.
      
         - PM core update introducing a mechanism to allow runtime-suspended
           devices to stay suspended over system suspend/resume transitions if
           certain additional conditions related to coordination within device
           hierarchy are met.  Related PM documentation update and ACPI PM
           domain support for the new feature.  From Rafael J Wysocki.
      
         - Fixes and improvements related to the "freeze" sleep state.  They
           affect several places including cpuidle, PM core, ACPI core, and
           the ACPI battery driver.  From Rafael J Wysocki and Zhang Rui.
      
         - Miscellaneous fixes and updates of the ACPI core from Aaron Lu,
           Bjørn Mork, Hanjun Guo, Lan Tianyu, and Rafael J Wysocki.
      
         - Fixes and cleanups for the ACPI processor and ACPI PAD (Processor
           Aggregator Device) drivers from Baoquan He, Manuel Schölling, Tony
           Camuso, and Toshi Kani.
      
         - System suspend/resume optimization in the ACPI battery driver from
           Lan Tianyu.
      
         - OPP (Operating Performance Points) subsystem updates from Chander
           Kashyap, Mark Brown, and Nishanth Menon.
      
         - cpufreq core fixes, updates and cleanups from Srivatsa S Bhat,
           Stratos Karafotis, and Viresh Kumar.
      
         - Updates, fixes and cleanups for the Tegra, powernow-k8, imx6q,
           s5pv210, nforce2, and powernv cpufreq drivers from Brian Norris,
           Jingoo Han, Paul Bolle, Philipp Zabel, Stratos Karafotis, and
           Viresh Kumar.
      
         - intel_pstate driver fixes and cleanups from Dirk Brandewie, Doug
           Smythies, and Stratos Karafotis.
      
         - Enabling the big.LITTLE cpufreq driver on arm64 from Mark Brown.
      
         - Fix for the cpuidle menu governor from Chander Kashyap.
      
         - New ARM clps711x cpuidle driver from Alexander Shiyan.
      
         - Hibernate core fixes and cleanups from Chen Gang, Dan Carpenter,
           Fabian Frederick, Pali Rohár, and Sebastian Capella.
      
         - Intel RAPL (Running Average Power Limit) driver updates from Jacob
           Pan.
      
         - PNP subsystem updates from Bjorn Helgaas and Fabian Frederick.
      
         - devfreq core updates from Chanwoo Choi and Paul Bolle.
      
         - devfreq updates for exynos4 and exynos5 from Chanwoo Choi and
           Bartlomiej Zolnierkiewicz.
      
         - turbostat tool fix from Jean Delvare.
      
         - cpupower tool updates from Prarit Bhargava, Ramkumar Ramachandra
           and Thomas Renninger.
      
         - New ACPI ec_access.c tool for poking at the EC in a safe way from
           Thomas Renninger"
      
      * tag 'pm+acpi-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (187 commits)
        ACPICA: Namespace: Remove _PRP method support.
        intel_pstate: Improve initial busy calculation
        intel_pstate: add sample time scaling
        intel_pstate: Correct rounding in busy calculation
        intel_pstate: Remove C0 tracking
        PM / hibernate: fixed typo in comment
        ACPI: Fix x86 regression related to early mapping size limitation
        ACPICA: Tables: Add mechanism to control early table checksum verification.
        ACPI / scan: use platform bus type by default for _HID enumeration
        ACPI / scan: always register ACPI LPSS scan handler
        ACPI / scan: always register memory hotplug scan handler
        ACPI / scan: always register container scan handler
        ACPI / scan: Change the meaning of missing .attach() in scan handlers
        ACPI / scan: introduce platform_id device PNP type flag
        ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list
        ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
        ACPI / PNP: use device ID list for PNPACPI device enumeration
        ACPI / scan: .match() callback for ACPI scan handlers
        ACPI / battery: wakeup the system only when necessary
        power_supply: allow power supply devices registered w/o wakeup source
        ...
      4dc4226f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid into next · d6b92c2c
      Linus Torvalds authored
      Pull HID patches from Jiri Kosina:
       - RMI driver for Synaptics touchpads, by Benjamin Tissoires, Andrew
         Duggan and Jiri Kosina
       - cleanup of hid-sony driver and improved support for Sixaxis and
         Dualshock 4, by Frank Praznik
       - other usual small fixes and support for new device IDs
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
        HID: thingm: thingm_fwinfo[] doesn't need to be global
        HID: core: add two new usages for digitizer
        HID: hid-sensor-hub: new device id and quirk for STM Sensor hub
        HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard
        HID: hid-sensor-hub: Set report quirk for Microsoft Surface
        HID: debug: add labels for HID Sensor Usages
        HID: uhid: Use kmemdup instead of kmalloc + memcpy
        HID: rmi: do not handle touchscreens through hid-rmi
        HID: quirk for Saitek RAT7 and MMO7 mices' mode button
        HID: core: fix validation of report id 0
        HID: rmi: fix masks for x and w_x data
        HID: rmi: fix wrong struct field name
        HID: rmi: do not fetch more than 16 bytes in a query
        HID: rmi: check for the existence of some optional queries before reading query 12
        HID: i2c-hid: hid report descriptor retrieval changes
        HID: add missing hid usages
        HID: hid-sony - allow 3rd party INTEC controller to turn off all leds
        HID: sony: Add blink support to the Sixaxis and DualShock 4 LEDs
        HID: sony: Initialize the controller LEDs with a device ID value
        HID: sony: Use the controller Bluetooth MAC address as the unique value in the battery name string
        ...
      d6b92c2c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next · 1aacb90e
      Linus Torvalds authored
      Pull trivial tree changes from Jiri Kosina:
       "Usual pile of patches from trivial tree that make the world go round"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
        staging: go7007: remove reference to CONFIG_KMOD
        aic7xxx: Remove obsolete preprocessor define
        of: dma: doc fixes
        doc: fix incorrect formula to calculate CommitLimit value
        doc: Note need of bc in the kernel build from 3.10 onwards
        mm: Fix printk typo in dmapool.c
        modpost: Fix comment typo "Modules.symvers"
        Kconfig.debug: Grammar s/addition/additional/
        wimax: Spelling s/than/that/, wording s/destinatary/recipient/
        aic7xxx: Spelling s/termnation/termination/
        arm64: mm: Remove superfluous "the" in comment
        of: Spelling s/anonymouns/anonymous/
        dma: imx-sdma: Spelling s/determnine/determine/
        ath10k: Improve grammar in comments
        ath6kl: Spelling s/determnine/determine/
        of: Improve g...
      1aacb90e
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into next · b05d59df
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "At over 200 commits, covering almost all supported architectures, this
        was a pretty active cycle for KVM.  Changes include:
      
         - a lot of s390 changes: optimizations, support for migration, GDB
           support and more
      
         - ARM changes are pretty small: support for the PSCI 0.2 hypercall
           interface on both the guest and the host (the latter acked by
           Catalin)
      
         - initial POWER8 and little-endian host support
      
         - support for running u-boot on embedded POWER targets
      
         - pretty large changes to MIPS too, completing the userspace
           interface and improving the handling of virtualized timer hardware
      
         - for x86, a larger set of changes is scheduled for 3.17.  Still, we
           have a few emulator bugfixes and support for running nested
           fully-virtualized Xen guests (para-virtualized Xen guests have
           always worked).  And some optimizations too.
      
        The only missing architecture here is ia64.  It's not a coincidence
        that support for KVM on ia64 is scheduled for removal in 3.17"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (203 commits)
        KVM: add missing cleanup_srcu_struct
        KVM: PPC: Book3S PR: Rework SLB switching code
        KVM: PPC: Book3S PR: Use SLB entry 0
        KVM: PPC: Book3S HV: Fix machine check delivery to guest
        KVM: PPC: Book3S HV: Work around POWER8 performance monitor bugs
        KVM: PPC: Book3S HV: Make sure we don't miss dirty pages
        KVM: PPC: Book3S HV: Fix dirty map for hugepages
        KVM: PPC: Book3S HV: Put huge-page HPTEs in rmap chain for base address
        KVM: PPC: Book3S HV: Fix check for running inside guest in global_invalidates()
        KVM: PPC: Book3S: Move KVM_REG_PPC_WORT to an unused register number
        KVM: PPC: Book3S: Add ONE_REG register names that were missed
        KVM: PPC: Add CAP to indicate hcall fixes
        KVM: PPC: MPIC: Reset IRQ source private members
        KVM: PPC: Graciously fail broken LE hypercalls
        PPC: ePAPR: Fix hypercall on LE guest
        KVM: PPC: BOOK3S: Remove open coded make_dsisr in alignment handler
        KVM: PPC: BOOK3S: Always use the saved DAR value
        PPC: KVM: Make NX bit available with magic page
        KVM: PPC: Disable NX for old magic page using guests
        KVM: PPC: BOOK3S: HV: Add mixed page-size support for guest
        ...
      b05d59df
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next · daf342af
      Linus Torvalds authored
      Pull jfs changes from Dave Kleikamp.
      
      * tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy:
        fs/jfs/super.c: convert simple_str to kstr
        fs/jfs/jfs_dmap.c: replace min/casting by min_t
        fs/jfs/super.c: remove 0 assignment to static + code clean-up
        fs/jfs/jfs_logmgr.c: remove NULL assignment on static
        JFS: Check for NULL before calling posix_acl_equiv_mode()
        fs/jfs/jfs_inode.c: atomically set inode->i_flags
      daf342af
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of... · ba1bdefe
      Linus Torvalds authored
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw into next
      
      Pull gfs2 updates from Steven Whitehouse:
       "This must be about the smallest merge window patch set ever for GFS2.
        It is probably also the first one without a single patch from me.
        That is down to a combination of factors, and I have some things in
        the works that are not quite ready yet, that I hope to put in next
        time around.
      
        Returning to what is here this time...  we have 3 patches which fix
        various warnings.  Two are bug fixes (for quotas and also a rare
        recovery race condition).  The final patch, from Ben Marzinski, is an
        important change in the freeze code which has been in progress for
        some time.  This removes the need to take and drop the transaction
        lock for every single transaction, when the only time it was used, was
        at file system freeze time.  Ben's patch integrates the freeze
        operation into the journal flush code as an alternative with lower
        overheads and also lands up resolving some difficult to fix races at
        the same time"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Prevent recovery before the local journal is set
        GFS2: fs/gfs2/file.c: kernel-doc warning fixes
        GFS2: fs/gfs2/bmap.c: kernel-doc warning fixes
        GFS2: remove transaction glock
        GFS2: lops.c: replace 0 by NULL for pointers
        GFS2: quotas not being refreshed in gfs2_adjust_quota
      ba1bdefe
    • Linus Torvalds's avatar
      Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next · 74efa045
      Linus Torvalds authored
      Pull file locking changes from Jeff Layton:
       "Pretty quiet on the file-locking related front this cycle.  Just some
        small cleanups and the addition of some tracepoints in the lease
        handling code"
      
      * tag 'locks-v3.16' of git://git.samba.org/jlayton/linux:
        locks: add some tracepoints in the lease handling code
        fs/locks.c: replace seq_printf by seq_puts
        locks: ensure that fl_owner is always initialized properly in flock and lease codepaths
      74efa045
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of... · 1b363609
      Linus Torvalds authored
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 into next
      
      Pull firewire updates from Stefan Richter:
       "IEEE 1394 (FireWire) subsystem changes: One optimization for some VIA
        controllers, one fix, one kconfig brushup"
      
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk
        firewire: Use COMPILE_TEST for build testing
        firewire: net: fix NULL derefencing in fwnet_probe()
      1b363609
    • Thomas Gleixner's avatar
      clocksource: versatile: Use sched_clock_register() · 1605abff
      Thomas Gleixner authored
      
      
      The newly merged versatile sched clock support uses a deprecated
      interface.  Of course that patch got routed through the ARM tree instead
      of going through the relevant maintainer tree.
      
      Use the proper interface so we can get rid of the cruft.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1605abff
    • Jiri Kosina's avatar
      Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and... · beea3f4a
      Jiri Kosina authored
      Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus
      beea3f4a
    • Jiri Kosina's avatar
      Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus · af5666e0
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-sensor-hub.c
      af5666e0
    • Florian Fainelli's avatar
      of: handle NULL node in next_child iterators · 43cb4367
      Florian Fainelli authored
      
      
      Add an early check for the node argument in __of_get_next_child and
      of_get_next_available_child() to avoid dereferencing a NULL node pointer
      a few lines after.
      
      CC: Daniel Mack <zonque@gmail.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
      43cb4367
    • Arnd Bergmann's avatar
      of/irq: provide more wrappers for !CONFIG_OF · 64c5c759
      Arnd Bergmann authored
      The pci-rcar driver is enabled for compile tests, and this has
      now shown that the driver cannot build without CONFIG_OF,
      following the inclusion of f8f2fe73
      
       "PCI: rcar: Use new OF
      interrupt mapping when possible":
      
      drivers/built-in.o: In function `rcar_pci_map_irq':
      :(.text+0x1cc7c): undefined reference to `of_irq_parse_and_map_pci'
      pci/host/pcie-rcar.c: In function 'pci_dma_range_parser_init':
      pci/host/pcie-rcar.c:875:2: error: implicit declaration of function 'of_n_addr_cells' [-Werror=implicit-function-declaration]
      
      As pointed out by Ben Dooks and Geert Uytterhoeven, this is actually
      supposed to build fine, which we can achieve if we make the
      declaration of of_irq_parse_and_map_pci conditional on CONFIG_OF
      and provide an empty inline function otherwise, as we do for
      a lot of other of interfaces.
      
      This lets us build the rcar_pci driver again without CONFIG_OF
      for build testing. All platforms using this driver select OF,
      so this doesn't change anything for the users.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: devicetree@vger.kernel.org
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Grant Likely <grant.likely@linaro.org>
      Cc: Lucas Stach <l.stach@pengutronix.de>
      Cc: Bjorn Helgaas <bhelgaas@google.com>
      Cc: Magnus Damm <damm@opensource.se>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Ben Dooks <ben.dooks@codethink.co.uk>
      Cc: linux-pci@vger.kernel.org
      Cc: linux-sh@vger.kernel.org
      [robh: drop wrappers for of_n_addr_cells and of_n_size_cells which are
      low-level functions that should not be used for !OF]
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      64c5c759
  2. 03 Jun, 2014 18 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 3de0ef8d
      Linus Torvalds authored
      Pull x86/UV changes from Ingo Molnar:
       "Continued updates for SGI UV 3 hardware support"
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/UV: Fix conditional in gru_exit()
        x86/UV: Set n_lshift based on GAM_GR_CONFIG MMR for UV3
      3de0ef8d
    • Linus Torvalds's avatar
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 06b77b97
      Linus Torvalds authored
      Pull x86 RAS changes from Ingo Molnar:
       "Improve mcheck device initialization and bootstrap robustness"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mce: Panic when a core has reached a timeout
        x86/mce: Improve mcheck_init_device() error handling
      06b77b97
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of... · 4aef77b2
      Linus Torvalds authored
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 IOSF platform updates from Ingo Molnar:
       "IOSF (Intel OnChip System Fabric) updates:
      
         - generalize the IOSF interface to allow mixed mode drivers: non-IOSF
           drivers to utilize of IOSF features on IOSF platforms.
      
         - add 'Quark X1000' IOSF/MBI support
      
         - clean up BayTrail and Quark PCI ID enumeration"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, iosf: Add PCI ID macros for better readability
        x86, iosf: Add Quark X1000 PCI ID
        x86, iosf: Added Quark MBI identifiers
        x86, iosf: Make IOSF driver modular and usable by more drivers
      4aef77b2
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · e0d23cdc
      Linus Torvalds authored
      Pull x86 mm update from Ingo Molnar:
      
       - speed up 256 GB PCI BAR ioremap()s
      
       - speed up PTE swapout page reclaim case
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, ioremap: Speed up check for RAM pages
        x86/mm: In the PTE swapout page reclaim case clear the accessed bit instead of flushing the TLB
      e0d23cdc
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of... · c33c4054
      Linus Torvalds authored
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 microcode changes from Ingo Molnar:
       "A microcode-debugging boot flag plus related refactoring"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode: Add a disable chicken bit
        x86, boot: Carve out early cmdline parsing function
      c33c4054
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of... · e30c631b
      Linus Torvalds authored
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 irq cleanup from Ingo Molnar:
       "A single, trivial cleanup"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Clean up VECTOR_UNDEFINED and VECTOR_RETRIGGERED definition
      e30c631b
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of... · 33ef765e
      Linus Torvalds authored
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 build cleanups from Ingo Molnar:
       "Two small build related cleanups"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/build: Supress realmode.bin is up to date message
        compiler-intel.h: Remove duplicate definition
      33ef765e
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of... · e7a38766
      Linus Torvalds authored
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 boot changes from Ingo Molnar:
       "Two small cleanups"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Remove misc.h inclusion from compressed/string.c
        x86, boot: Do not include boot.h in string.c
      e7a38766
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 3d1a3bda
      Linus Torvalds authored
      Pull x86 asm cleanups from Ingo Molnar:
       "A handful of entry_64.S cleanups"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64, entry: Merge paranoidzeroentry_ist into idtentry
        x86_64, entry: Merge most 64-bit asm entry macros
        x86_64, entry: Add missing 'DEFAULT_FRAME 0' entry annotations
      3d1a3bda
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-tools' and 'pm-tools' · 2e30baad
      Rafael J. Wysocki authored
      * acpi-tools:
        ACPI / tools: Introduce ec_access.c - tool to access the EC
      
      * pm-tools:
        cpupower: Remove mc and smt power aware scheduler info/settings
        cpupower: cpupower info -b should return 0 on success, not the perf bias value
        cpupower: If root, try to load msr driver on x86 if /dev/cpu/0/msr is not available
        cpupower: Install recently added cpupower-idle-{set, info} manpages
        cpupower: Introduce idle state disable-by-latency and enable-all
        cpupower: Remove all manpages on make uninstall
        cpupower: Remove dead link to homepage, and update the targets built.
        cpupower: Rename cpufrequtils -> cpupower, and libcpufreq -> libcpupower.
        PM / tools: cpupower: add option to display values without round offs
        tools / power: turbostat: Drop temperature checks
      2e30baad
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-cpufreq' · 057beb1d
      Rafael J. Wysocki authored
      * pm-cpufreq: (28 commits)
        cpufreq: handle calls to ->target_index() in separate routine
        cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
        cpufreq: intel_pstate: Remove unused member name of cpudata
        cpufreq: Break out early when frequency equals target_freq
        cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
        cpufreq: imx6q: Remove unused include
        cpufreq: imx6q: Drop devm_clk/regulator_get usage
        cpufreq: powernow-k8: Suppress checkpatch warnings
        cpufreq: powernv: make local function static
        cpufreq: Enable big.LITTLE cpufreq driver on arm64
        cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
        intel_pstate: Add CPU IDs for Broadwell processors
        cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
        PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
        PM / OPP: Remove cpufreq wrapper dependency on internal data organization
        cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
        intel_pstate: Remove sample parameter in intel_pstate_calc_busy
        cpufreq: Kconfig: Fix spelling errors
        cpufreq: Make linux-pm@vger.kernel.org official mailing list
        cpufreq: exynos: Use dev_err/info function instead of pr_err/info
        ...
      057beb1d
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-devfreq' · 42a09284
      Rafael J. Wysocki authored
      * pm-devfreq:
        PM / devfreq: remove checks for CONFIG_EXYNOS_ASV
        PM / devfreq: exynos5: Use devm_devfreq_* function using device resource management
        PM / devfreq: exynos4: Use devm_devfreq_* function using device resource management
        PM / devfreq: Add devm_devfreq_{register,unregister}_opp_notfier function
        PM / devfreq: Add resource-managed function for devfreq device
        PM / devfreq: Fix devfreq_remove_device() to improve the sequence of resource free
        PM / devfreq: exynos: make more PPMU code common
        PM / devfreq: exynos5: introduce struct busfreq_ppmu_data
        PM / devfreq: exynos4: introduce struct busfreq_ppmu_data
        PM / devfreq: exynos4: use common PPMU code
        PM / devfreq: exynos5: Add CONFIG_PM_OPP dependency to fix probe fail
        PM / devfreq: exynos5: Use SIMPLE_DEV_PM_OPS macro
        PM / devfreq: exynos4: Add CONFIG_PM_OPP dependency to fix probe fail
        PM / devfreq: exynos4: Use SIMPLE_DEV_PM_OPS macro
        PM / devfreq: exynos4: Fix bug of resource leak and code clean on probe()
      42a09284
    • Rafael J. Wysocki's avatar
      Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp' · cd0c5bd3
      Rafael J. Wysocki authored
      * pnp:
        MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer
        PNP / resources: remove positive test on unsigned values
      
      * powercap:
        powercap / RAPL: add new CPU IDs
        powercap / RAPL: further relax energy counter checks
      
      * pm-runtime:
        PM / runtime: Update documentation to reflect the current code flow
      
      * pm-opp:
        PM / OPP: discard duplicate OPPs
        PM / OPP: Make OPP invisible to users in Kconfig
        PM / OPP: fix incorrect OPP count handling in of_init_opp_table
      cd0c5bd3
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-thermal' · e81a0e77
      Rafael J. Wysocki authored
      * acpi-thermal:
        ACPI / thermal: Use acpi_bus_attach_private_data() to attach private data
      e81a0e77
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-video' · d9bd4493
      Rafael J. Wysocki authored
      * acpi-video:
        ACPI / video: Add 4 new models to the use_native_backlight DMI list
        ACPI / video: Add use native backlight quirk for the ThinkPad W530
        ACPI / video: Unregister the backlight device if a raw one shows up later
        backlight: Add backlight device (un)registration notification
        nouveau: Don't check acpi_video_backlight_support() before registering backlight
        acer-wmi: Add Aspire 5741 to video_vendor_dmi_table
        acer-wmi: Switch to acpi_video_unregister_backlight
        ACPI / video: Add an acpi_video_unregister_backlight function
        ACPI / video: Don't register acpi_video_resume notifier without backlight devices
        ACPI / video: change acpi-video brightness_switch_enabled default to 0
      d9bd4493
    • Rafael J. Wysocki's avatar
      Merge branch 'acpica' · 0e36d43c
      Rafael J. Wysocki authored
      * acpica: (63 commits)
        ACPICA: Namespace: Remove _PRP method support.
        ACPI: Fix x86 regression related to early mapping size limitation
        ACPICA: Tables: Add mechanism to control early table checksum verification.
        ACPICA: acpidump: Fix repetitive table dump in -n mode.
        ACPI: Clean up acpi_os_map/unmap_memory() to eliminate __iomem.
        ACPICA: Clean up redudant definitions already defined elsewhere
        ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of <asm/acpi.h>
        ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h>
        ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages.
        ACPICA: Update version to 20140424.
        ACPICA: Comment/format update, no functional change.
        ACPICA: Events: Update GPE handling and initialization code.
        ACPICA: Remove extraneous error message for large number of GPEs.
        ACPICA: Tables: Remove old mechanism to validate if XSDT contains NULL entries.
        ACPICA: Tables: Add new mechanism to skip NULL entries in RSDT and XSDT.
        ACPICA: acpidump: Add support to force using RSDT.
        ACPICA: Back port of improvements on exception code.
        ACPICA: Back port of _PRP update.
        ACPICA: acpidump: Fix truncated RSDP signature validation.
        ACPICA: Linux header: Add support for stubbed externals.
        ...
      0e36d43c
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-enumeration' · b04c58b1
      Rafael J. Wysocki authored
      * acpi-enumeration:
        ACPI / scan: use platform bus type by default for _HID enumeration
        ACPI / scan: always register ACPI LPSS scan handler
        ACPI / scan: always register memory hotplug scan handler
        ACPI / scan: always register container scan handler
        ACPI / scan: Change the meaning of missing .attach() in scan handlers
        ACPI / scan: introduce platform_id device PNP type flag
        ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list
        ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
        ACPI / PNP: use device ID list for PNPACPI device enumeration
        ACPI / scan: .match() callback for ACPI scan handlers
      b04c58b1
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-lpss' · 864e055f
      Rafael J. Wysocki authored
      * acpi-lpss:
        ACPI / LPSS: support for fractional divider clock
        ACPI / LPSS: custom power domain for LPSS
      864e055f