1. 17 Dec, 2015 2 commits
  2. 08 Dec, 2015 1 commit
  3. 02 Dec, 2015 7 commits
  4. 19 Nov, 2015 1 commit
  5. 07 Nov, 2015 4 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 6f1da317
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "Highlights:
      
         - Intel Skylake Win8 precision touchpads support fixes/improvements
           from Mika Westerberg
      
         - Lenovo Yoga 2 quirk from Ritesh Raj Sarraf
      
         - potential uninitialized buffer access fix in HID core from Richard
           Purdie
      
         - Wacom Intuos and Wacom Cintiq 2 support improvements from Jason
           Gerecke and Ping Cheng
      
         - initiation of sysfs deprecation process for most of the roccat
           drivers, from the roccat support maintiner Stefan Achatz
      
         - quite a few device ID / quirk additions and small fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
        HID: logitech: Add support for G29
        HID: logitech: Simplify wheel detection scheme
        HID: wacom: Call 'wacom_query_tablet_data' only after 'hid_hw_start'
        HID: wacom: Fix ABS_MISC reporting for Cintiq Companion 2
        HID: wacom: Remove useless conditions from 'wacom_query_tablet_data'
        HID: wacom: fix Intuos wireless report id issue
        HID: fix some indenting issues
        HID: wacom: Expect 'touch_max' touches if HID_DG_CONTACTCOUNT not present
        HID: wacom: Tie cached HID_DG_CONTACTCOUNT indices to report ID
        HID: roccat: Fixed resubmit: Deprecating most Roccat sysfs attributes
        HID: wacom: Report full pressure range for Intuos, Cintiq 13HD Touch
        HID: wacom: Add support for Cintiq Companion 2
        HID: multitouch: Fetch feature reports on demand for Win8 devices
        HID: sensor-hub: Add quirk for Lenovo Yoga 2 with ITE Chips
        HID: usbhid: Fix for the WiiU adapter from Mayflash
        HID: corsair: boolify struct k90_led.removed
        HID: corsair: Add Corsair Vengeance K90 driver
        HID: hid-input: allow input_configured callback return errors
        HID: multitouch: Add suffix for HID_DG_TOUCHPAD
        HID: i2c-hid: Fill in physical device providing HID functionality
        ...
      6f1da317
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 99aaa9c6
      Linus Torvalds authored
      Pull livepatching fix from Jiri Kosina:
       "A fix for a kernel oops in case CONFIG_DEBUG_SET_MODULE_RONX is unset
        (as in such case it's possible for module struct to share a page with
        executable text, which is currently not being handled with grace) from
        Josh Poimboeuf"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: Fix crash with !CONFIG_DEBUG_SET_MODULE_RONX
      99aaa9c6
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 27eb427b
      Linus Torvalds authored
      Pull btrfs updates from Chris Mason:
       "We have a lot of subvolume quota improvements in here, along with big
        piles of cleanups from Dave Sterba and Anand Jain and others.
      
        Josef pitched in a batch of allocator fixes based on production use
        here at FB.  We found that mount -o ssd_spread greatly improved our
        performance on hardware raid5/6, but it exposed some CPU bottlenecks
        in the allocator.  These patches make a huge difference"
      
      * 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (100 commits)
        Btrfs: fix hole punching when using the no-holes feature
        Btrfs: find_free_extent: Do not erroneously skip LOOP_CACHING_WAIT state
        btrfs: Fix a data space underflow warning
        btrfs: qgroup: Fix a rebase bug which will cause qgroup double free
        btrfs: qgroup: Fix a race in delayed_ref which leads to abort trans
        btrfs: clear PF_NOFREEZE in cleaner_kthread()
        btrfs: qgroup: Don't copy extent buffer to do qgroup rescan
        btrfs: add balance filters limits, stripes and usage to supported mask
        btrfs: extend balance filter usage to take minimum and maximum
        btrfs: add balance filter for stripes
        btrfs: extend balance filter limit to take minimum and maximum
        btrfs: fix use after free iterating extrefs
        btrfs: check unsupported filters in balance arguments
        Btrfs: fix regression running delayed references when using qgroups
        Btrfs: fix regression when running delayed references
        Btrfs: don't do extra bitmap search in one bit case
        Btrfs: keep track of largest extent in bitmaps
        Btrfs: don't keep trying to build clusters if we are fragmented
        Btrfs: cut down on loops through the allocator
        Btrfs: don't continue setting up space cache when enospc
        ...
      27eb427b
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 71300980
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Add support for the CSUM_SEED feature which will allow future
        userspace utilities to change the file system's UUID without rewriting
        all of the file system metadata.
      
        A number of miscellaneous fixes, the most significant of which are in
        the ext4 encryption support.  Anyone wishing to use the encryption
        feature should backport all of the ext4 crypto patches up to 4.4 to
        get fixes to a memory leak and file system corruption bug.
      
        There are also cleanups in ext4's feature test macros and in ext4's
        sysfs support code"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (26 commits)
        fs/ext4: remove unnecessary new_valid_dev check
        ext4: fix abs() usage in ext4_mb_check_group_pa
        ext4: do not allow journal_opts for fs w/o journal
        ext4: explicit mount options parsing cleanup
        ext4, jbd2: ensure entering into panic after recording an error in superblock
        [PATCH] fix calculation of meta_bg descriptor backups
        ext4: fix potential use after free in __ext4_journal_stop
        jbd2: fix checkpoint list cleanup
        ext4: fix xfstest generic/269 double revoked buffer bug with bigalloc
        ext4: make the bitmap read routines return real error codes
        jbd2: clean up feature test macros with predicate functions
        ext4: clean up feature test macros with predicate functions
        ext4: call out CRC and corruption errors with specific error codes
        ext4: store checksum seed in superblock
        ext4: reserve code points for the project quota feature
        ext4: promote ext4 over ext2 in the default probe order
        jbd2: gate checksum calculations on crc driver presence, not sb flags
        ext4: use private version of page_zero_new_buffers() for data=journal mode
        ext4 crypto: fix bugs in ext4_encrypted_zeroout()
        ext4 crypto: replace some BUG_ON()'s with error checks
        ...
      71300980
  6. 06 Nov, 2015 25 commits
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · 9cf5c095
      Linus Torvalds authored
      Pull asm-generic cleanups from Arnd Bergmann:
       "The asm-generic changes for 4.4 are mostly a series from Christoph
        Hellwig to clean up various abuses of headers in there.  The patch to
        rename the io-64-nonatomic-*.h headers caused some conflicts with new
        users, so I added a workaround that we can remove in the next merge
        window.
      
        The only other patch is a warning fix from Marek Vasut"
      
      * tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h
        asm-generic: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
        gpio-mxc: stop including <asm-generic/bug>
        n_tracesink: stop including <asm-generic/bug>
        n_tracerouter: stop including <asm-generic/bug>
        mlx5: stop including <asm-generic/kmap_types.h>
        hifn_795x: stop including <asm-generic/kmap_types.h>
        drbd: stop including <asm-generic/kmap_types.h>
        move count_zeroes.h out of asm-generic
        move io-64-nonatomic*.h out of asm-generic
      9cf5c095
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 22402cd0
      Linus Torvalds authored
      Pull tracking updates from Steven Rostedt:
       "Most of the changes are clean ups and small fixes.  Some of them have
        stable tags to them.  I searched through my INBOX just as the merge
        window opened and found lots of patches to pull.  I ran them through
        all my tests and they were in linux-next for a few days.
      
        Features added this release:
        ----------------------------
      
         - Module globbing.  You can now filter function tracing to several
           modules.  # echo '*:mod:*snd*' > set_ftrace_filter (Dmitry Safonov)
      
         - Tracer specific options are now visible even when the tracer is not
           active.  It was rather annoying that you can only see and modify
           tracer options after enabling the tracer.  Now they are in the
           options/ directory even when the tracer is not active.  Although
           they are still only visible when the tracer is active in the
           trace_options file.
      
         - Trace options are now per instance (although some of the tracer
           specific options are global)
      
         - New tracefs file: set_event_pid.  If any pid is added to this file,
           then all events in the instance will filter out events that are not
           part of this pid.  sched_switch and sched_wakeup events handle next
           and the wakee pids"
      
      * tag 'trace-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (68 commits)
        tracefs: Fix refcount imbalance in start_creating()
        tracing: Put back comma for empty fields in boot string parsing
        tracing: Apply tracer specific options from kernel command line.
        tracing: Add some documentation about set_event_pid
        ring_buffer: Remove unneeded smp_wmb() before wakeup of reader benchmark
        tracing: Allow dumping traces without tracking trace started cpus
        ring_buffer: Fix more races when terminating the producer in the benchmark
        ring_buffer: Do no not complete benchmark reader too early
        tracing: Remove redundant TP_ARGS redefining
        tracing: Rename max_stack_lock to stack_trace_max_lock
        tracing: Allow arch-specific stack tracer
        recordmcount: arm64: Replace the ignored mcount call into nop
        recordmcount: Fix endianness handling bug for nop_mcount
        tracepoints: Fix documentation of RCU lockdep checks
        tracing: ftrace_event_is_function() can return boolean
        tracing: is_legal_op() can return boolean
        ring-buffer: rb_event_is_commit() can return boolean
        ring-buffer: rb_per_cpu_empty() can return boolean
        ring_buffer: ring_buffer_empty{cpu}() can return boolean
        ring-buffer: rb_is_reader_page() can return boolean
        ...
      22402cd0
    • Jiri Kosina's avatar
      Merge branches 'for-4.3/upstream-fixes', 'for-4.4/corsair',... · d64e19db
      Jiri Kosina authored
      Merge branches 'for-4.3/upstream-fixes', 'for-4.4/corsair', 'for-4.4/dragonrise', 'for-4.4/i2c-hid', 'for-4.4/logitech', 'for-4.4/microsoft', 'for-4.4/multitouch', 'for-4.4/roccat-sysfs-deprecation', 'for-4.4/upstream' and 'for-4.4/wacom' into for-linus
      d64e19db
    • Linus Torvalds's avatar
      Merge tag 'for-v4.4-important-fix' of... · 7c623cac
      Linus Torvalds authored
      Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
      
      Pull power supply fix from Sebastian Reichel:
       "Just a single revert for a patch, that I should not have queued.
      
        Detailed description is inside the patch.  It's totally my fault, that
        this happened, sorry about that :("
      
      * tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        Revert "ARM: dts: twl4030: Add iio properties for bci subnode"
      7c623cac
    • Simon Wood's avatar
      HID: logitech: Add support for G29 · 29fae1c8
      Simon Wood authored
      At present the G29 is mis-identified as a DFGT, this patch ensures
      that the wheel is correctly detected and allows setting the LEDs and
      turning range via the '/sys' interface.
      
      This wheel can also emulate other types of Logitech wheels.
      Signed-off-by: default avatarSimon Wood <simon@mungewell.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      29fae1c8
    • Simon Wood's avatar
      HID: logitech: Simplify wheel detection scheme · bbec1bd0
      Simon Wood authored
      Simplfy how hid-logitech driver detects the native mode of the wheel,
      done by looking at the USB-ID revision and comparing bit mask.
      Signed-off-by: default avatarSimon Wood <simon@mungewell.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      bbec1bd0
    • Sebastian Reichel's avatar
      Revert "ARM: dts: twl4030: Add iio properties for bci subnode" · 829a7da0
      Sebastian Reichel authored
      This reverts commit af19161a,
      which breaks the omap3 device tree build due to a wrong reference.
      
      I accidently queued this change via the power supply subsystem while
      telling Marek at the same time, that it should go through Tony.
      Following that I did miss Stephen's messages about the build failure in
      linux-next and since he switched to merging an older snapshot nobody
      else noticed the problem in my tree. I didn't notice myself, since I
      did not build any device tree files assuming none have changed by me.
      Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
      Reported-by: default avatarFelipe Balbi <balbi@ti.com>
      Tested-by: default avatarFelipe Balbi <balbi@ti.com>
      Acked-by: default avatarFelipe Balbi <balbi@ti.com>
      Tested-by: default avatarKevin Hilman <khilman@linaro.org>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      829a7da0
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 9bbd4b9f
      Linus Torvalds authored
      Pull DeviceTree updates from Rob Herring:
       "A fairly large (by DT standards) pull request this time with the
        majority being some overdue moving DT binding docs around to
        consolidate similar bindings.
      
         - DT binding doc consolidation moving similar bindings to common
           locations.  The majority of these are display related which were
           scattered in video/, fb/, drm/, gpu/, and panel/ directories.
      
         - Add new config option, CONFIG_OF_ALL_DTBS, to enable building all
           dtbs in the tree for most arches with dts files (except powerpc for
           now).
      
         - OF_IRQ=n fixes for user enabled CONFIG_OF.
      
         - of_node_put ref counting fixes from Julia Lawall.
      
         - Common DT binding for wakeup-source and deprecation of all similar
           bindings.
      
         - DT binding for PXA LCD controller.
      
         - Allow ignoring failed PCI resource translations in order to ignore
           64-bit addresses on non-LPAE 32-bit kernels.
      
         - Support setting the NUMA node from DT instead of only from parent
           device.
      
         - Couple of earlycon DT parsing fixes for address and options"
      
      * tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
        MAINTAINERS: update DT binding doc locations
        devicetree: add Sigma Designs vendor prefix
        of: simplify arch_find_n_match_cpu_physical_id() function
        Documentation: arm: Fixed typo in socfpga fpga mgr example
        Documentation: devicetree: fix reference to legacy wakeup properties
        Documentation: devicetree: standardize/consolidate on "wakeup-source" property
        drivers: of: removing assignment of 0 to static variable
        xtensa: enable building of all dtbs
        mips: enable building of all dtbs
        metag: enable building of all dtbs
        metag: use common make variables for dtb builds
        h8300: enable building of all dtbs
        arm64: enable building of all dtbs
        arm: enable building of all dtbs
        arc: enable building of all dtbs
        arc: use common make variables for dtb builds
        of: add config option to enable building of all dtbs
        of/fdt: fix error checking for earlycon address
        of/overlay: add missing of_node_put
        of/platform: add missing of_node_put
        ...
      9bbd4b9f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 3e069ada
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Items of note:
      
         - evdev users can now limit or mask the kind of events they will
           receive.  This will allow applications such as power manager or
           network manager to only be woken when user presses special keys
           such as KEY_POWER or KEY_WIFI and not be bothered with ordinary
           key presses coming from keyboard
      
         - support for FocalTech FT6236 touchscreen controller
      
         - support for ROHM BU21023/24 touchscreen controller
      
         - edt-ft5x06 touchscreen driver got a face lift and can now be used
           with FT5506
      
         - support for Google Fiber TV Box remote controls
      
         - improvements in xpad driver (with more to come)
      
         - several parport-based drivers have been switched to the new device
           model
      
         - other miscellaneous driver improvements"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
        HID: hid-gfrm: avoid warning for input_configured API change
        HID: hid-input: allow input_configured callback return errors
        Input: evdev - fix bug in checking duplicate clock change request
        Input: add userio module
        Input: evdev - add event-mask API
        Input: snvs_pwrkey - remove duplicated semicolon
        HID: hid-gfrm: Google Fiber TV Box remote controls
        Input: e3x0-button - update Kconfig description
        Input: tegra-kbc - drop use of IRQF_NO_SUSPEND flag
        Input: tegra-kbc - enable support for the standard "wakeup-source" property
        Input: xen - check return value of xenbus_printf
        Input: hp_sdc_rtc - fix y2038 problem in proc_show
        Input: nomadik-ske-keypad - fix a trivial typo
        Input: xpad - fix clash of presence handling with LED setting
        Input: edt-ft5x06 - work around FT5506 firmware bug
        Input: edt-ft5x06 - add support for FT5506
        Input: edt-ft5x06 - add support for different max support points
        Input: edt-ft5x06 - use max support points to determine how much to read
        Input: rotary-encoder - add support for quarter-period mode
        Input: rotary-encoder - use of_property_read_bool
        ...
      3e069ada
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd · 02f0d3f7
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "Core:
      
         - WARN (in some cases) when a struct mtd_info is registered multiple
           times; in the past this was "supported", but it's still error prone
           for future development.  There's only one ugly case of this left in
           the tree (that we're aware of) and the owners are aware of the
           problems there.
      
         - fix potential deadlock in the blkdev removal path NOTE: the
           (potential) deadlock was introduced in a for-stable patch.  This
           one is also marked for -stable.
      
         - ioctl(BLKPG) compat_ioctl support; resolves issues with 32-bit user
           space vs 64-bit kernel space
      
         - Set MTD parent device correctly throughout the tree, so the tree
           structure appears correctly in sysfs; many drivers were missing
           this (soft) requirement
      
         - Move device tree partitions (ofpart) into a dedicated 'partitions'
           subnode; this helps to disambiguate whether a node is a partition
           or some other auxiliary data
      
         - Improve error handling for partitioning failures
      
        NAND:
      
         - General: Increase timeout period, for corner-case systems with
           less-than-accurate jiffies
      
         - Fix OF-based autoloading of several NAND drivers when built as
           modules
      
         - pxa3xx_nand:
            - Rework timing configuration to be more dynamic
            - Refactor PM support
      
         - brcmnand: prepare for NorthStar 2 support (ARM64, 16-bit NAND
           chips)
      
         - sunxi_nand: refactoring and a few bug fixes
      
         - vf610: new NAND driver
      
         - FSMC: add SW BCH support; support common NAND DT bindings
      
         - lpc32xx_slc: refactor and improve timing calculations logic
      
         - denali: support for rev 5.1
      
        SPI NOR:
      
         - Layering improvements
      
         - Added Winbond lock/unlock support
      
         - Added mtd_is_locked() (i.e., ioctl(MEMISLOCKED)) support
      
         - Increase full-chip-erase timeout linearly with flash size
      
         - fsl-quadspi: fix compile for non-ARM architectures
      
         - New flash support"
      
      * tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd: (169 commits)
        mtd: don't WARN about overloaded users of mtd->reboot_notifier.notifier_call
        mtd: nand: sunxi: avoid retrieving data before ECC pass
        mtd: nand: sunxi: fix sunxi_nfc_hw_ecc_read/write_chunk()
        mtd: blkdevs: fix potential deadlock + lockdep warnings
        mtd: ofpart: move ofpart partitions to a dedicated dt node
        doc: dt: mtd: support partitions in a special 'partitions' subnode
        mtd: brcmnand: Force 8bit mode before doing nand_scan_ident()
        mtd: brcmnand: factor out CFG and CFG_EXT bitfields
        mtd: mtdpart: Do not fail mtd probe when parsing partitions fails
        mtd: fsl-quadspi: fix macro collision problems with READ/WRITE
        mtd: warn when registering the same master many times
        mtd: fixup corner case error handling in mtd_device_parse_register()
        mtd: tests: Replace timeval with ktime_t
        mtd: fsmc_nand: Add BCH4 SW ECC support for SPEAr600
        mtd: nand: vf610_nfc: use nand_check_erased_ecc_chunk() helper
        mtd: nand: increase ready wait timeout and report timeouts
        mtd: docg3: off by one in doc_register_sysfs()
        mtd: pxa3xx_nand: clean up the pxa3xx timings
        mtd: pxa3xx_nand: rework flash detection and timing setup
        mtd: pxa3xx_nand: add helpers to setup the timings
        ...
      02f0d3f7
    • Linus Torvalds's avatar
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 2d49dcb9
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
      
       - a TI specific quirk to get CPU control working via remote master.
      
       - a new mailbox driver for an ST platform.
      
       - a generic test driver to aid new driver development.  And a couple of
         fixes to make that really clean.
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: mailbox-test: avoid reading iomem twice
        mailbox: Off by one in mbox_test_message_read()
        mailbox/omap: Add ti,mbox-send-noirq quirk to fix AM33xx CPU Idle
        mailbox: mailbox-test: Correctly repair Sparse warnings
        mailbox: Fix a couple of trivial static checker issues
        mailbox: Add generic mechanism for testing Mailbox Controllers
        mailbox: Add support for ST's Mailbox IP
        mailbox: dt: Supply bindings for ST's Mailbox IP
        PCC: fix dereference of ERR_PTR
      2d49dcb9
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 3c87b791
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Resource management:
         - Add support for Enhanced Allocation devices (Sean O. Stalley)
         - Add Enhanced Allocation register entries (Sean O. Stalley)
         - Handle IORESOURCE_PCI_FIXED when sizing resources (David Daney)
         - Handle IORESOURCE_PCI_FIXED when assigning resources (David Daney)
         - Handle Enhanced Allocation capability for SR-IOV devices (David Daney)
         - Clear IORESOURCE_UNSET when reverting to firmware-assigned address (Bjorn Helgaas)
         - Make Enhanced Allocation bitmasks more obvious (Bjorn Helgaas)
         - Expand Enhanced Allocation BAR output (Bjorn Helgaas)
         - Add of_pci_check_probe_only to parse "linux,pci-probe-only" (Marc Zyngier)
         - Fix lookup of linux,pci-probe-only property (Marc Zyngier)
         - Add sparc mem64 resource parsing for root bus (Yinghai Lu)
      
        PCI device hotplug:
         - pciehp: Queue power work requests in dedicated function (Guenter Roeck)
      
        Driver binding:
         - Add builtin_pci_driver() to avoid registration boilerplate (Paul Gortmaker)
      
        Virtualization:
         - Set SR-IOV NumVFs to zero after enumeration (Alexander Duyck)
         - Remove redundant validation of SR-IOV offset/stride registers (Alexander Duyck)
         - Remove VFs in reverse order if virtfn_add() fails (Alexander Duyck)
         - Reorder pcibios_sriov_disable() (Alexander Duyck)
         - Wait 1 second between disabling VFs and clearing NumVFs (Alexander Duyck)
         - Fix sriov_enable() error path for pcibios_enable_sriov() failures (Alexander Duyck)
         - Enable SR-IOV ARI Capable Hierarchy before reading TotalVFs (Ben Shelton)
         - Don't try to restore VF BARs (Wei Yang)
      
        MSI:
         - Don't alloc pcibios-irq when MSI is enabled (Joerg Roedel)
         - Add msi_controller setup_irqs() method for special multivector setup (Lucas Stach)
         - Export all remapped MSIs to sysfs attributes (Romain Bezut)
         - Disable MSI on SiS 761 (Ondrej Zary)
      
        AER:
         - Clear error status registers during enumeration and restore (Taku Izumi)
      
        Generic host bridge driver:
         - Fix lookup of linux,pci-probe-only property (Marc Zyngier)
         - Allow multiple hosts with different map_bus() methods (David Daney)
         - Pass starting bus number to pci_scan_root_bus() (David Daney)
         - Fix address window calculation for non-zero starting bus (David Daney)
      
        Altera host bridge driver:
         - Add msi.h to ARM Kbuild (Ley Foon Tan)
         - Add Altera PCIe host controller driver (Ley Foon Tan)
         - Add Altera PCIe MSI driver (Ley Foon Tan)
      
        APM X-Gene host bridge driver:
         - Remove msi_controller assignment (Duc Dang)
      
        Broadcom iProc host bridge driver:
         - Fix header comment "Corporation" misspelling (Florian Fainelli)
         - Fix code comment to match code (Ray Jui)
         - Remove unused struct iproc_pcie.irqs[] (Ray Jui)
         - Call pci_fixup_irqs() for ARM64 as well as ARM (Ray Jui)
         - Fix PCIe reset logic (Ray Jui)
         - Improve link detection logic (Ray Jui)
         - Update PCIe device tree bindings (Ray Jui)
         - Add outbound mapping support (Ray Jui)
      
        Freescale i.MX6 host bridge driver:
         - Return real error code from imx6_add_pcie_port() (Fabio Estevam)
         - Add PCIE_PHY_RX_ASIC_OUT_VALID definition (Fabio Estevam)
      
        Freescale Layerscape host bridge driver:
         - Remove ls_pcie_establish_link() (Minghuan Lian)
         - Ignore PCIe controllers in Endpoint mode (Minghuan Lian)
         - Factor out SCFG related function (Minghuan Lian)
         - Update ls_add_pcie_port() (Minghuan Lian)
         - Remove unused fields from struct ls_pcie (Minghuan Lian)
         - Add support for LS1043a and LS2080a (Minghuan Lian)
         - Add ls_pcie_msi_host_init() (Minghuan Lian)
      
        HiSilicon host bridge driver:
         - Add HiSilicon SoC Hip05 PCIe driver (Zhou Wang)
      
        Marvell MVEBU host bridge driver:
         - Return zero for reserved or unimplemented config space (Russell King)
         - Use exact config access size; don't read/modify/write (Russell King)
         - Use of_get_available_child_count() (Russell King)
         - Use for_each_available_child_of_node() to walk child nodes (Russell King)
         - Report full node name when reporting a DT error (Russell King)
         - Use port->name rather than "PCIe%d.%d" (Russell King)
         - Move port parsing and resource claiming to  separate function (Russell King)
         - Fix memory leaks and refcount leaks (Russell King)
         - Split port parsing and resource claiming from  port setup (Russell King)
         - Use gpio_set_value_cansleep() (Russell King)
         - Use devm_kcalloc() to allocate an array (Russell King)
         - Use gpio_desc to carry around gpio (Russell King)
         - Improve clock/reset handling (Russell King)
         - Add PCI Express root complex capability block (Russell King)
         - Remove code restricting accesses to slot 0 (Russell King)
      
        NVIDIA Tegra host bridge driver:
         - Wrap static pgprot_t initializer with __pgprot() (Ard Biesheuvel)
      
        Renesas R-Car host bridge driver:
         - Build pci-rcar-gen2.c only on ARM (Geert Uytterhoeven)
         - Build pcie-rcar.c only on ARM (Geert Uytterhoeven)
         - Make PCI aware of the I/O resources (Phil Edworthy)
         - Remove dependency on ARM-specific struct hw_pci (Phil Edworthy)
         - Set root bus nr to that provided in DT (Phil Edworthy)
         - Fix I/O offset for multiple host bridges (Phil Edworthy)
      
        ST Microelectronics SPEAr13xx host bridge driver:
         - Fix dw_pcie_cfg_read/write() usage (Gabriele Paoloni)
      
        Synopsys DesignWare host bridge driver:
         - Make "clocks" and "clock-names" optional DT properties (Bhupesh Sharma)
         - Use exact access size in dw_pcie_cfg_read() (Gabriele Paoloni)
         - Simplify dw_pcie_cfg_read/write() interfaces (Gabriele Paoloni)
         - Require config accesses to be naturally aligned (Gabriele Paoloni)
         - Make "num-lanes" an optional DT property (Gabriele Paoloni)
         - Move calculation of bus addresses to DRA7xx (Gabriele Paoloni)
         - Replace ARM pci_sys_data->align_resource with global function pointer (Gabriele Paoloni)
         - Factor out MSI msg setup (Lucas Stach)
         - Implement multivector MSI IRQ setup (Lucas Stach)
         - Make get_msi_addr() return phys_addr_t, not u32 (Lucas Stach)
         - Set up high part of MSI target address (Lucas Stach)
         - Fix PORT_LOGIC_LINK_WIDTH_MASK (Zhou Wang)
         - Revert "PCI: designware: Program ATU with untranslated address" (Zhou Wang)
         - Use of_pci_get_host_bridge_resources() to parse DT (Zhou Wang)
         - Make driver arch-agnostic (Zhou Wang)
      
        Miscellaneous:
         - Make x86 pci_subsys_init() static (Alexander Kuleshov)
         - Turn off Request Attributes to avoid Chelsio T5 Completion erratum (Hariprasad Shenai)"
      
      * tag 'pci-v4.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (94 commits)
        PCI: altera: Add Altera PCIe MSI driver
        PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver
        PCI: layerscape: Add ls_pcie_msi_host_init()
        PCI: layerscape: Add support for LS1043a and LS2080a
        PCI: layerscape: Remove unused fields from struct ls_pcie
        PCI: layerscape: Update ls_add_pcie_port()
        PCI: layerscape: Factor out SCFG related function
        PCI: layerscape: Ignore PCIe controllers in Endpoint mode
        PCI: layerscape: Remove ls_pcie_establish_link()
        PCI: designware: Make "clocks" and "clock-names" optional DT properties
        PCI: designware: Make driver arch-agnostic
        ARM/PCI: Replace pci_sys_data->align_resource with global function pointer
        PCI: designware: Use of_pci_get_host_bridge_resources() to parse DT
        Revert "PCI: designware: Program ATU with untranslated address"
        PCI: designware: Move calculation of bus addresses to DRA7xx
        PCI: designware: Make "num-lanes" an optional DT property
        PCI: designware: Require config accesses to be naturally aligned
        PCI: designware: Simplify dw_pcie_cfg_read/write() interfaces
        PCI: designware: Use exact access size in dw_pcie_cfg_read()
        PCI: spear: Fix dw_pcie_cfg_read/write() usage
        ...
      3c87b791
    • Linus Torvalds's avatar
      Merge tag 'sound-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0280d1a0
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "Here is the first batch of updates for sound system on 4.4-rc1.
      
        Again at this time, the update looks fairly calm; no big changes in
        either ALSA core or ASoC infrastructures, rather all small cleanups,
        in addition to the new stuff as usual.
      
        The biggest changes are about Firewire sound devices.  It gained lots
        of new device support, and MIDI functionality.  Also there are updates
        for a few still working-in-progress stuff (topology API and ASoC
        skylake), too.  But overall, this update should give no big surprise.
      
        Some highlights are below:
      
        Core:
         - A few more Kconfig items for tinification; it's marked as EXPERT,
           so normal user should't be bothered :)
         - Refactoring with a new PCM hw_constraint helper
         - Removal of unused transfer_ack_{begin,end} PCM callbacks
      
        Firewire:
         - Restructuring of code subtree, lots of refactoring
         - Support AMDTP variants
         - New driver for Digidesign 002/003 family
         - Adds support for TASCAM FireOne to ALSA OXFW driver
         - Add MIDI support to TASCAM and Digi00x devices
      
        HD-Audio:
         - Automated modalias generation for codec drivers, finally
         - Improvement on heuristics for setting mixer name
         - A few fixes for longstanding bugs on Creative CA0132 cards
         - Addition of audio rate callback with i915 communication
         - Fix suspend issue on recent Dell XPS
         - Intel Lewisburg controller support
      
        ASoC:
         - Updates to the topology userspace interface
         - Big updates to the Renesas support (rcar)
         - More updates for supporting Intel Sky Lake systems
         - New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
           Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825, Rockchip
           S/PDIF, and Atmel class D amplifier
      
        USB-Audio:
         - A fix for newer Roland MIDI devices
         - Quirks and workarounds for Zoom R16/24 device
      
        Misc:
         - A few fixes for some old Cirrus CS46xx PCI sound boards
         - Yet another fixes for some old ESS Maestro3 PCI sound boards"
      
      * tag 'sound-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (330 commits)
        ALSA: hda - Add Intel Lewisburg device IDs Audio
        ALSA: hda - Apply pin fixup for HP ProBook 6550b
        ALSA: hda - Fix lost 4k BDL boundary workaround
        ALSA: maestro3: Fix Allegro mute until master volume/mute is touched
        ALSA: maestro3: Enable docking support for Dell Latitude C810
        ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports
        ALSA: firewire-digi00x: add MIDI operations for MIDI control port
        ALSA: firewire-digi00x: rename identifiers of MIDI operation for physical ports
        ALSA: cs46xx: Fix suspend for all channels
        ALSA: cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs
        ALSA: DocBook: Add soc-ops.c and soc-compress.c
        ALSA: hda - Add / fix kernel doc comments
        ALSA: Constify ratden/ratnum constraints
        ALSA: hda - Disable 64bit address for Creative HDA controllers
        ALSA: hda/realtek - Dell XPS one ALC3260 speaker no sound after resume back
        ALSA: hda/ca0132 - Convert leftover pr_info() and pr_err()
        ASoC: fsl: Use #ifdef instead of #if for CONFIG_PM_SLEEP
        ASoC: rt5645: Sort the order for register bit defines
        ASoC: dwc: add check for master/slave format
        ASoC: rt5645: Add the HWEQ for the speaker output
        ...
      0280d1a0
    • Linus Torvalds's avatar
      Merge tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 5bc23a0c
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "New Device Support
         - None
      
        New Functionality:
         - None
      
        Core Frameworks:
         - Reject legacy PWM request for device defined in DT
      
        Fix-ups:
         - Remove unnecessary MODULE_ALIAS(); adp8860_bl, adp8870_bl
         - Simplify code: pm8941-wled
         - Supply default-brightness logic; pm8941-wled
      
        Bug Fixes:
         - Clean up OF node; 88pm860x_bl
         - Ensure struct is zeroed; lp855x_bl"
      
      * tag 'backlight-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: pm8941-wled: Add default-brightness property
        backlight: pm8941-wled: Fix ptr_ret.cocci warnings
        backlight: pwm: Reject legacy PWM request for device defined in DT
        backlight: 88pm860x_bl: Add missing of_node_put
        backlight: adp8870: Remove unnecessary MODULE_ALIAS()
        backlight: adp8860: Remove unnecessary MODULE_ALIAS()
        backlight: lp855x: Make sure props struct is zeroed
      5bc23a0c
    • Linus Torvalds's avatar
      mfd: avoid newly introduced compiler warning · 4dcee4d8
      Linus Torvalds authored
      Commit b158b69a ("mfd: rtsx: Simplify function return logic")
      removed the use of the 'err' variable, but left the variable itself
      around, resulting in gcc quite reasonably warning:
      
          drivers/mfd/rtsx_pcr.c: In function ‘rtsx_pci_set_pull_ctl’:
          drivers/mfd/rtsx_pcr.c:565:6: warning: unused variable ‘err’ [-Wunused-variable]
            int err;
                ^
      
      Get rid of the unused variable, and avoid the new warning.
      
      Cc: Javier Martinez Canillas <javier@osg.samsung.com>
      Cc: Lee Jones <lee.jones@linaro.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4dcee4d8
    • Linus Torvalds's avatar
      Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · bc914532
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Device Support:
         - Add support for 88pm860; 88pm80x
         - Add support for 24c08 EEPROM; at24
         - Add support for Broxton Whiskey Cove; intel*
         - Add support for RTS522A; rts5227
         - Add support for I2C devices; intel_quark_i2c_gpio
      
        New Functionality:
         - Add microphone support; arizona
         - Add general purpose switch support; arizona
         - Add fuel-gauge support; da9150-core
         - Add shutdown support; sec-core
         - Add charger support; tps65217
         - Add flexible serial communication unit support; atmel-flexcom
         - Add power button support; axp20x
         - Add led-flash support; rt5033
      
        Core Frameworks:
         - Supply a generic macro for defining Regmap IRQs
         - Rework ACPI child device matching
      
        Fix-ups:
         - Use Regmap to access registers; tps6105x
         - Use DEFINE_RES_IRQ_NAMED() macro; da9150
         - Re-arrange device registration order; intel_quark_i2c_gpio
         - Allow OF matching; cros_ec_i2c, atmel-hlcdc, hi6421-pmic, max8997, sm501
         - Handle deferred probe; twl6040
         - Improve accuracy of headphone detect; arizona
         - Unnecessary MODULE_ALIAS() removal; bcm590xx, rt5033
         - Remove unused code; htc-i2cpld, arizona, pcf50633-irq, sec-core
         - Simplify code; kempld, rts5209, da903x, lm3533, da9052, arizona
         - Remove #iffery; arizona
         - DT binding adaptions; many
      
        Bug Fixes:
         - Fix possible NULL pointer dereference; wm831x, tps6105x
         - Fix 64bit bug; intel_soc_pmic_bxtwc
         - Fix signedness issue; arizona"
      
      * tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (73 commits)
        bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC
        mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children
        extcon: arizona: Add extcon specific device tree binding document
        MAINTAINERS: Add binding docs for Cirrus Logic/Wolfson Arizona devices
        mfd: arizona: Remove bindings covered in new subsystem specific docs
        mfd: rt5033: Add RT5033 Flash led sub device
        mfd: lpss: Add Intel Broxton PCI IDs
        mfd: lpss: Add Broxton ACPI IDs
        mfd: arizona: Signedness bug in arizona_runtime_suspend()
        mfd: axp20x: Add a cell for the power button part of the, axp288 PMICs
        mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X
        mfd: sec-core: Disable buck voltage reset on watchdog falling edge
        mfd: sec-core: Dump PMIC revision to find out the HW
        mfd: arizona: Use correct type ID for device tree config
        mfd: arizona: Remove use of codec build config #ifdefs
        mfd: arizona: Simplify adding subdevices
        mfd: arizona: Downgrade type mismatch messages to dev_warn
        mfd: arizona: Factor out checking of jack detection state
        mfd: arizona: Factor out DCVDD isolation control
        mfd: Make TPS6105X select REGMAP_I2C
        ...
      bc914532
    • Brian Norris's avatar
      mtd: don't WARN about overloaded users of mtd->reboot_notifier.notifier_call · f8479dd6
      Brian Norris authored
      There are multiple types of users of mtd->reboot_notifier.notifier_call:
      
      (1) A while back, the cfi_cmdset_000{1,2} chip drivers implemented a
      reboot notifier to (on a best effort basis) attempt to reset their flash
      chips before rebooting.
      
      (2) More recently, we implemented a common _reboot() hook so that MTD
      drivers (particularly, NAND flash) could better halt I/O operations
      without having to reimplement the same notifier boilerplate.
      
      Currently, the WARN_ONCE() condition here was written to handle (2), but
      at the same time it mis-diagnosed case (1) as an already-registered MTD.
      Let's fix this by having the WARN_ONCE() condition better imitate the
      condition that immediately follows it. (Wow, I don't know how I missed
      that one.)
      
      (Side note: Unfortunately, we can't yet combine the reboot notifier code
      for (1) and (2) with a patch like [1], because some users of (1) also
      use mtdconcat, and so the mtd_info struct from cfi_cmdset_000{1,2} won't
      actually get registered with mtdcore, and therefore their reboot
      notifier won't get registered.)
      
      [1] http://patchwork.ozlabs.org/patch/417981/Suggested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      Cc: Jesper Nilsson <jespern@axis.com>
      Cc: linux-cris-kernel@axis.com
      Tested-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
      Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      f8479dd6
    • Linus Torvalds's avatar
      x86: don't make DEBUG_WX default to 'y' even with DEBUG_RODATA · 54727e6e
      Linus Torvalds authored
      It turns out that we still have issues with the EFI memory map that ends
      up polluting our kernel page tables with writable executable pages.
      
      That will get sorted out, but in the meantime let's not make the scary
      complaint about them be on by default.  The code is useful for
      developers, but not ready for end user testing yet.
      Acked-by: default avatarBorislav Petkov <bp@alien8.de>
      Acked-by: default avatarIngo Molnar <mingo@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      54727e6e
    • Josh Poimboeuf's avatar
      livepatch: Fix crash with !CONFIG_DEBUG_SET_MODULE_RONX · e2391a2d
      Josh Poimboeuf authored
      When loading a patch module on a kernel with
      !CONFIG_DEBUG_SET_MODULE_RONX, the following crash occurs:
      
        [  205.988776] livepatch: enabling patch 'kpatch_meminfo_string'
        [  205.989829] BUG: unable to handle kernel paging request at ffffffffa08d2fc0
        [  205.989863] IP: [<ffffffff8154fecb>] do_init_module+0x8c/0x1ba
        [  205.989888] PGD 1a10067 PUD 1a11063 PMD 7bcde067 PTE 3740e161
        [  205.989915] Oops: 0003 [#1] SMP
        [  205.990187] CPU: 2 PID: 14570 Comm: insmod Tainted: G           O  K 4.1.12
        [  205.990214] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.8.1-20150318_183358- 04/01/2014
        [  205.990249] task: ffff8800374aaa90 ti: ffff8800794b8000 task.ti: ffff8800794b8000
        [  205.990276] RIP: 0010:[<ffffffff8154fecb>]  [<ffffffff8154fecb>] do_init_module+0x8c/0x1ba
        [  205.990307] RSP: 0018:ffff8800794bbd58  EFLAGS: 00010246
        [  205.990327] RAX: 0000000000000000 RBX: ffffffffa08d2fc0 RCX: 0000000000000000
        [  205.990356] RDX: 01ffff8000000080 RSI: 0000000000000000 RDI: ffffffff81a54b40
        [  205.990382] RBP: ffff88007b4c4d80 R08: 0000000000000007 R09: 0000000000000000
        [  205.990408] R10: 0000000000000008 R11: ffffea0001f18840 R12: 0000000000000000
        [  205.990433] R13: 0000000000000001 R14: ffffffffa08d2fc0 R15: ffff88007bd0bc40
        [  205.990459] FS:  00007f1128fbc700(0000) GS:ffff88007fc80000(0000) knlGS:0000000000000000
        [  205.990488] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
        [  205.990509] CR2: ffffffffa08d2fc0 CR3: 000000002606e000 CR4: 00000000001406e0
        [  205.990536] Stack:
        [  205.990545]  ffff8800794bbec8 0000000000000001 ffffffffa08d3010 ffffffff810ecea9
        [  205.990576]  ffffffff810e8e40 000000000005f360 ffff88007bd0bc50 ffffffffa08d3240
        [  205.990608]  ffffffffa08d52c0 ffffffffa08d3210 ffff8800794bbed8 ffff8800794bbf1c
        [  205.990639] Call Trace:
        [  205.990651]  [<ffffffff810ecea9>] ? load_module+0x1e59/0x23a0
        [  205.990672]  [<ffffffff810e8e40>] ? store_uevent+0x40/0x40
        [  205.990693]  [<ffffffff810e99b5>] ? copy_module_from_fd.isra.49+0xb5/0x140
        [  205.990718]  [<ffffffff810ed5bd>] ? SyS_finit_module+0x7d/0xa0
        [  205.990741]  [<ffffffff81556832>] ? system_call_fastpath+0x16/0x75
        [  205.990763] Code: f9 00 00 00 74 23 49 c7 c0 92 e1 60 81 48 8d 53 18 89 c1 4c 89 c6 48 c7 c7 f0 85 7d 81 31 c0 e8 71 fa ff ff e8 58 0e 00 00 31 f6 <c7> 03 00 00 00 00 48 89 da 48 c7 c7 20 c7 a5 81 e8 d0 ec b3 ff
        [  205.990916] RIP  [<ffffffff8154fecb>] do_init_module+0x8c/0x1ba
        [  205.990940]  RSP <ffff8800794bbd58>
        [  205.990953] CR2: ffffffffa08d2fc0
      
      With !CONFIG_DEBUG_SET_MODULE_RONX, module text and rodata pages are
      writable, and the debug_align() macro allows the module struct to share
      a page with executable text.  When klp_write_module_reloc() calls
      set_memory_ro() on the page, it effectively turns the module struct into
      a read-only structure, resulting in a page fault when load_module() does
      "mod->state = MODULE_STATE_LIVE".
      Reported-by: default avatarCyril B. <cbay@alwaysdata.com>
      Tested-by: default avatarCyril B. <cbay@alwaysdata.com>
      Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      e2391a2d
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.4-1' of... · d1e41ff1
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.4-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver update from Darren Hart:
       "Various toshiba hotkey and keyboard related fixes and a new WMI
        driver.  Several intel_scu_ipc cleanups and a locking fix.  A
        spattering of small single fixes across various platforms.
      
        I was asked to pick up an OLPC cleanup as the driver appeared
        unmaintained and it seemed similar to what is maintained in
        platform/drivers/x86.  I have included the patch and an update to the
        MAINTAINERS file.
      
        toshiba_acpi:
         - Initialize hotkey_event_type variable
         - Remove unneeded u32 variables from *setup_keyboard
         - Add 0x prefix to available_kbd_modes_show function
         - Change default Hotkey enabling value
         - Unify hotkey enabling functions
      
        toshiba-wmi:
         - Toshiba WMI Hotkey Driver
      
        intel_scu_ipc:
         - Protect dev member assignment on ->remove()
         - Switch to use module_pci_driver() macro
         - Convert to use struct device *
         - Propagate pointer to struct intel_scu_ipc_dev
         - Fix error path by turning to devm_* / pcim_*
      
        acer-wmi:
         - remove threeg and interface sysfs interfaces
      
        OLPC:
         - Use %*ph specifier instead of passing direct values
      
        MAINTAINERS:
         - Add drivers/platform/olpc to drivers/platform/x86
      
        sony-laptop:
         - Fix handling sony_nc_hotkeys_decode result
      
        intel_mid_powerbtn:
         - Remove misuse of IRQF_NO_SUSPEND flag
      
        compal-laptop:
         - Add charge control limit
      
        asus-wmi:
         - restore kbd led level after resume"
      
      * tag 'platform-drivers-x86-v4.4-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        toshiba_acpi: Initialize hotkey_event_type variable
        intel_scu_ipc: Protect dev member assignment on ->remove()
        intel_scu_ipc: Switch to use module_pci_driver() macro
        intel_scu_ipc: Convert to use struct device *
        intel_scu_ipc: Propagate pointer to struct intel_scu_ipc_dev
        intel_scu_ipc: Fix error path by turning to devm_* / pcim_*
        acer-wmi: remove threeg and interface sysfs interfaces
        OLPC: Use %*ph specifier instead of passing direct values
        MAINTAINERS: Add drivers/platform/olpc to drivers/platform/x86
        platform/x86: Toshiba WMI Hotkey Driver
        sony-laptop: Fix handling sony_nc_hotkeys_decode result
        intel_mid_powerbtn: Remove misuse of IRQF_NO_SUSPEND flag
        compal-laptop: Add charge control limit
        asus-wmi: restore kbd led level after resume
        toshiba_acpi: Remove unneeded u32 variables from *setup_keyboard
        toshiba_acpi: Add 0x prefix to available_kbd_modes_show function
        toshiba_acpi: Change default Hotkey enabling value
        toshiba_acpi: Unify hotkey enabling functions
      d1e41ff1
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 2f4bf528
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
      
       - Kconfig: remove BE-only platforms from LE kernel build from Boqun
         Feng
       - Refresh ps3_defconfig from Geoff Levand
       - Emit GNU & SysV hashes for the vdso from Michael Ellerman
       - Define an enum for the bolted SLB indexes from Anshuman Khandual
       - Use a local to avoid multiple calls to get_slb_shadow() from Michael
         Ellerman
       - Add gettimeofday() benchmark from Michael Neuling
       - Avoid link stack corruption in __get_datapage() from Michael Neuling
       - Add virt_to_pfn and use this instead of opencoding from Aneesh Kumar
         K.V
       - Add ppc64le_defconfig from Michael Ellerman
       - pseries: extract of_helpers module from Andy Shevchenko
       - Correct string length in pseries_of_derive_parent() from Nathan
         Fontenot
       - Free the MSI bitmap if it was slab allocated from Denis Kirjanov
       - Shorten irq_chip name for the SIU from Christophe Leroy
       - Wait 1s for secondaries to enter OPAL during kexec from Samuel
         Mendoza-Jonas
       - Fix _ALIGN_* errors due to type difference, from Aneesh Kumar K.V
       - powerpc/pseries/hvcserver: don't memset pi_buff if it is null from
         Colin Ian King
       - Disable hugepd for 64K page size, from Aneesh Kumar K.V
       - Differentiate between hugetlb and THP during page walk from Aneesh
         Kumar K.V
       - Make PCI non-optional for pseries from Michael Ellerman
       - Individual System V IPC system calls from Sam bobroff
       - Add selftest of unmuxed IPC calls from Michael Ellerman
       - discard .exit.data at runtime from Stephen Rothwell
       - Delete old orphaned PrPMC 280/2800 DTS and boot file, from Paul
         Gortmaker
       - Use of_get_next_parent to simplify code from Christophe Jaillet
       - Paginate some xmon output from Sam bobroff
       - Add some more elements to the xmon PACA dump from Michael Ellerman
       - Allow the tm-syscall selftest to build with old headers from Michael
         Ellerman
       - Run EBB selftests only on POWER8 from Denis Kirjanov
       - Drop CONFIG_TUNE_CELL in favour of CONFIG_CELL_CPU from Michael
         Ellerman
       - Avoid reference to potentially freed memory in prom.c from Christophe
         Jaillet
       - Quieten boot wrapper output with run_cmd from Geoff Levand
       - EEH fixes and cleanups from Gavin Shan
       - Fix recursive fenced PHB on Broadcom shiner adapter from Gavin Shan
       - Use of_get_next_parent() in of_get_ibm_chip_id() from Michael
         Ellerman
       - Fix section mismatch warning in msi_bitmap_alloc() from Denis
         Kirjanov
       - Fix ps3-lpm white space from Rudhresh Kumar J
       - Fix ps3-vuart null dereference from Colin King
       - nvram: Add missing kfree in error path from Christophe Jaillet
       - nvram: Fix function name in some errors messages, from Christophe
         Jaillet
       - drivers/macintosh: adb: fix misleading Kconfig help text from Aaro
         Koskinen
       - agp/uninorth: fix a memleak in create_gatt_table from Denis Kirjanov
       - cxl: Free virtual PHB when removing from Andrew Donnellan
       - scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target from
         Michael Ellerman
       - scripts/kconfig/Makefile: Fix KBUILD_DEFCONFIG check when building
         with O= from Michael Ellerman
       - Freescale updates from Scott: Highlights include 64-bit book3e
         kexec/kdump support, a rework of the qoriq clock driver, device tree
         changes including qoriq fman nodes, support for a new 85xx board, and
         some fixes.
       - MPC5xxx updates from Anatolij: Highlights include a driver for
         MPC512x LocalPlus Bus FIFO with its device tree binding
         documentation, mpc512x device tree updates and some minor fixes.
      
      * tag 'powerpc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (106 commits)
        powerpc/msi: Fix section mismatch warning in msi_bitmap_alloc()
        powerpc/prom: Use of_get_next_parent() in of_get_ibm_chip_id()
        powerpc/pseries: Correct string length in pseries_of_derive_parent()
        powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry
        powerpc/mpc85xx: Add FSL QorIQ DPAA FMan support to the SoC device tree(s)
        powerpc/mpc85xx: Create dts components for the FSL QorIQ DPAA FMan
        powerpc/fsl: Add #clock-cells and clockgen label to clockgen nodes
        powerpc: handle error case in cpm_muram_alloc()
        powerpc: mpic: use IRQCHIP_SKIP_SET_WAKE instead of redundant mpic_irq_set_wake
        powerpc/book3e-64: Enable kexec
        powerpc/book3e-64/kexec: Set "r4 = 0" when entering spinloop
        powerpc/booke: Only use VIRT_PHYS_OFFSET on booke32
        powerpc/book3e-64/kexec: Enable SMP release
        powerpc/book3e-64/kexec: create an identity TLB mapping
        powerpc/book3e-64: Don't limit paca to 256 MiB
        powerpc/book3e/kdump: Enable crash_kexec_wait_realmode
        powerpc/book3e: support CONFIG_RELOCATABLE
        powerpc/booke64: Fix args to copy_and_flush
        powerpc/book3e-64: rename interrupt_end_book3e with __end_interrupts
        powerpc/e6500: kexec: Handle hardware threads
        ...
      2f4bf528
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 2e3078af
      Linus Torvalds authored
      Merge patch-bomb from Andrew Morton:
      
       - inotify tweaks
      
       - some ocfs2 updates (many more are awaiting review)
      
       - various misc bits
      
       - kernel/watchdog.c updates
      
       - Some of mm.  I have a huge number of MM patches this time and quite a
         lot of it is quite difficult and much will be held over to next time.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (162 commits)
        selftests: vm: add tests for lock on fault
        mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage
        mm: introduce VM_LOCKONFAULT
        mm: mlock: add new mlock system call
        mm: mlock: refactor mlock, munlock, and munlockall code
        kasan: always taint kernel on report
        mm, slub, kasan: enable user tracking by default with KASAN=y
        kasan: use IS_ALIGNED in memory_is_poisoned_8()
        kasan: Fix a type conversion error
        lib: test_kasan: add some testcases
        kasan: update reference to kasan prototype repo
        kasan: move KASAN_SANITIZE in arch/x86/boot/Makefile
        kasan: various fixes in documentation
        kasan: update log messages
        kasan: accurately determine the type of the bad access
        kasan: update reported bug types for kernel memory accesses
        kasan: update reported bug types for not user nor kernel memory accesses
        mm/kasan: prevent deadlock in kasan reporting
        mm/kasan: don't use kasan shadow pointer in generic functions
        mm/kasan: MODULE_VADDR is not available on all archs
        ...
      2e3078af
    • Eric Biggers's avatar
      vfs: clear remainder of 'full_fds_bits' in dup_fd() · ea5c58e7
      Eric Biggers authored
      This fixes a bug from commit f3f86e33 ("vfs: Fix pathological
      performance case for __alloc_fd()").
      
      v2: refactor to share fd bitmap copying code
      Signed-off-by: default avatarEric Biggers <ebiggers3@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea5c58e7
    • Eric B Munson's avatar
      selftests: vm: add tests for lock on fault · b3b0d09c
      Eric B Munson authored
      Test the mmap() flag, and the mlockall() flag.  These tests ensure that
      pages are not faulted in until they are accessed, that the pages are
      unevictable once faulted in, and that VMA splitting and merging works with
      the new VM flag.  The second test ensures that mlock limits are respected.
       Note that the limit test needs to be run a normal user.
      
      Also add tests to use the new mlock2 family of system calls.
      
      [treding@nvidia.com: : Fix mlock2-tests for 32-bit architectures]
      [treding@nvidia.com: ensure the mlock2 syscall number can be found]
      [treding@nvidia.com: use the right arguments for main()]
      Signed-off-by: default avatarEric B Munson <emunson@akamai.com>
      Cc: Shuah Khan <shuahkh@osg.samsung.com>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: Vlastimil Babka <vbabka@suse.cz>
      Cc: Jonathan Corbet <corbet@lwn.net>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Michael Kerrisk <mtk.manpages@gmail.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b3b0d09c
    • Eric B Munson's avatar
      mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage · b0f205c2
      Eric B Munson authored
      The previous patch introduced a flag that specified pages in a VMA should
      be placed on the unevictable LRU, but they should not be made present when
      the area is created.  This patch adds the ability to set this state via
      the new mlock system calls.
      
      We add MLOCK_ONFAULT for mlock2 and MCL_ONFAULT for mlockall.
      MLOCK_ONFAULT will set the VM_LOCKONFAULT modifier for VM_LOCKED.
      MCL_ONFAULT should be used as a modifier to the two other mlockall flags.
      When used with MCL_CURRENT, all current mappings will be marked with
      VM_LOCKED | VM_LOCKONFAULT.  When used with MCL_FUTURE, the mm->def_flags
      will be marked with VM_LOCKED | VM_LOCKONFAULT.  When used with both
      MCL_CURRENT and MCL_FUTURE, all current mappings and mm->def_flags will be
      marked with VM_LOCKED | VM_LOCKONFAULT.
      
      Prior to this patch, mlockall() will unconditionally clear the
      mm->def_flags any time it is called without MCL_FUTURE.  This behavior is
      maintained after adding MCL_ONFAULT.  If a call to mlockall(MCL_FUTURE) is
      followed by mlockall(MCL_CURRENT), the mm->def_flags will be cleared and
      new VMAs will be unlocked.  This remains true with or without MCL_ONFAULT
      in either mlockall() invocation.
      
      munlock() will unconditionally clear both vma flags.  munlockall()
      unconditionally clears for VMA flags on all VMAs and in the mm->def_flags
      field.
      Signed-off-by: default avatarEric B Munson <emunson@akamai.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.com>
      Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Cc: Jonathan Corbet <corbet@lwn.net>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Michael Kerrisk <mtk.manpages@gmail.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Shuah Khan <shuahkh@osg.samsung.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b0f205c2