1. 24 Jun, 2016 5 commits
  2. 23 Jun, 2016 2 commits
  3. 22 Jun, 2016 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · f9020d17
      Linus Torvalds authored
      Pull userns fix from Eric Biederman:
       "This contains just a single small patch that fixes a tiny hole in the
        logic of allowing unprivileged mounting of proc and sysfs.
      
        In practice I don't think anyone is affected because having MNT_RDONLY
        clear in mnt->mnt_flags but MS_RDONLY set in sb->s_flags is very weird
        for a filesystem, and weirder for proc and sysfs.  However if it
        happens let's handle it correctly and then no one has to to worry
        about this crazy case"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        mnt: Account for MS_RDONLY in fs_fully_visible
      f9020d17
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 144b5ae3
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "More GPIO fixes.  Most prominent the gpiod_to_irq() fix brought to my
        attention by Hans de Goede.  The hardening patch is a consequence of
        the reasoning around that bug.
      
         - It was discovered that too many parts of the kernel does not
           respect gpiod_to_irq() returning zero for an invalid IRQ.  While
           this gets fixed, we need to make it return negative errorcodes
           again.
      
         - Harden the library a bit when passed error pointers.  It is a bug
           to use these, but let's be helpful and warn the users.
      
         - Fix an uninitialized spinlock in the 104-idi-48 driver"
      
      * tag 'gpio-v4.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: make library immune to error pointers
        gpio: make sure gpiod_to_irq() returns negative on NULL desc
        gpio: 104-idi-48: Fix missing spin_lock_init for ack_lock
      144b5ae3
  4. 20 Jun, 2016 8 commits
  5. 19 Jun, 2016 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · c3695331
      Linus Torvalds authored
      Pull UDF fixes and a reiserfs fix from Jan Kara:
       "A couple of udf fixes (most notably a bug in parsing UDF partitions
        which led to inability to mount recent Windows installation media) and
        a reiserfs fix for handling kstrdup failure"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        reiserfs: check kstrdup failure
        udf: Use correct partition reference number for metadata
        udf: Use IS_ERR when loading metadata mirror file entry
        udf: Don't BUG on missing metadata partition descriptor
      c3695331
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma · 9af1f5d8
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "Some fixes has piled up, so time to send them upstream.
      
        These fixes include:
         - at_xdmac fixes for residue and other stuff
         - update MAINTAINERS for dma dt bindings
         - mv_xor fix for incorrect offset"
      
      * tag 'dmaengine-fix-4.7-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: mv_xor: Fix incorrect offset in dma_map_page()
        dmaengine: at_xdmac: double FIFO flush needed to compute residue
        dmaengine: at_xdmac: fix residue corruption
        dmaengine: at_xdmac: align descriptors on 64 bits
        MAINTAINERS: Add file patterns for dma device tree bindings
      9af1f5d8
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 049a40c0
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Another batch of fixes for ARM SoC platforms.  Most are smaller fixes.
      
        Two areas that are worth pointing out are:
      
         - OMAP had a handful of changes to voltage specs that caused a bit of
           churn, most of volume of change in this branch is due to this.
      
         - There are a couple of _rcuidle fixes from Paul that touch common
           code and came in through the OMAP tree since they were the ones who
           saw the problems.
      
       The rest is smaller changes across a handful of platforms"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (36 commits)
        ARM: dts: STi: stih407-family: Disable reserved-memory co-processor nodes
        ARM: dts: am437x-sk-evm: Reduce i2c0 bus speed for tps65218
        ARM: OMAP2+: timer: add probe for clocksources
        ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ
        memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
        arm: Use _rcuidle for smp_cross_call() tracepoints
        MAINTAINERS: Add myself as reviewer of ARM FSL/NXP
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_mem_ret
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_logic_ret
        ARM: OMAP: DRA7: powerdomain data: Set L3init and L4per to ON
        ARM: imx6ul: Fix Micrel PHY mask
        ARM: OMAP2+: Select OMAP_INTERCONNECT for SOC_AM43XX
        ARM: dts: DRA74x: fix DSS PLL2 addresses
        ARM: OMAP2: Enable Errata 430973 for OMAP3
        ARM: dts: socfpga: Add missing PHY phandle
        ARM: dts: exynos: Fix port nodes names for Exynos5420 Peach Pit board
        ARM: dts: exynos: Fix port nodes names for Exynos5250 Snow board
        ARM: dts: sun6i: yones-toptech-bs1078-v2: Drop constraints on dc1sw regulator
        ARM: dts: sun6i: primo81: Drop constraints on dc1sw regulator
        ARM: dts: sunxi: Add OLinuXino Lime2 eMMC to the Makefile
        ...
      049a40c0
    • Olof Johansson's avatar
      Merge tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux into fixes · 8fd09767
      Olof Johansson authored
      OMAP-GPMC: Fixes for for v4.7-rc cycle:
      
      - Fix omap gpmc EXTRADELAY timing. The DT provided timings
      were wrongly used causing devices requiring extra delay timing
      to fail.
      
      * tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux:
        memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing
        + Linux 4.7-rc3
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      8fd09767
    • Olof Johansson's avatar
      Merge tag 'omap-for-v4.7/fixes-powedomain' of... · 58935f24
      Olof Johansson authored
      Merge tag 'omap-for-v4.7/fixes-powedomain' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Fixes for omaps for v4.7-rc cycle:
      
      - Fix dra7 for hardware issues limiting L4Per and L3init power domains
        to on state. Without this the devices may not work correctly after
        some time of use because of asymmetric aging. And related to this,
        let's also remove the unusable states.
      
      - Always select omap interconnect for am43x as otherwise the am43x
        only configurations will not boot properly. This can happen easily
        for any product kernels that leave out other SoCs to save memory.
      
      - Fix DSS PLL2 addresses that have gone unused for now
      
      - Select erratum 430973 for omap3, this is now safe to do and can
        save quite a bit of debugging time for people who may have left
        it out.
      
      * tag 'omap-for-v4.7/fixes-powedomain' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_mem_ret
        ARM: OMAP: DRA7: powerdomain data: Remove unused pwrsts_logic_ret
        ARM: OMAP: DRA7: powerdomain data: Set L3init and L4per to ON
        ARM: OMAP2+: Select OMAP_INTERCONNECT for SOC_AM43XX
        ARM: dts: DRA74x: fix DSS PLL2 addresses
        ARM: OMAP2: Enable Errata 430973 for OMAP3
        + Linux 4.7-rc2
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      58935f24
    • Olof Johansson's avatar
      Merge tag 'fixes-rcu-fiq-signed' of... · 9503427e
      Olof Johansson authored
      Merge tag 'fixes-rcu-fiq-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Fixes for omaps for v4.7-rc cycle:
      
      - Two boot warning fixes from the RCU tree that should have gotten
        merged several weeks ago already but did not because of issues
        with who merges them. Paul has now split the RCU warning fixes into
        sets for various maintainers.
      
      - Fix ams-delta FIQ regression caused by omap1 sparse IRQ changes
      
      - Fix PM for omap3 boards using timer12 and gptimer, like the
        original beagleboard
      
      - Fix hangs on am437x-sk-evm by lowering the I2C bus speed
      
      * tag 'fixes-rcu-fiq-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: am437x-sk-evm: Reduce i2c0 bus speed for tps65218
        ARM: OMAP2+: timer: add probe for clocksources
        ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ
        arm: Use _rcuidle for smp_cross_call() tracepoints
        arm: Use _rcuidle tracepoint to allow use from idle
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9503427e
    • Lee Jones's avatar
      ARM: dts: STi: stih407-family: Disable reserved-memory co-processor nodes · 0e289e53
      Lee Jones authored
      This patch fixes a non-booting issue in Mainline.
      
      When booting with a compressed kernel, we need to be careful how we
      populate memory close to DDR start.  AUTO_ZRELADDR is enabled by default
      in multi-arch enabled configurations, which place some restrictions on
      where the kernel is placed and where it will be uncompressed to on boot.
      
      AUTO_ZRELADDR takes the decompressor code's start address and masks out
      the bottom 28 bits to obtain an address to uncompress the kernel to
      (thus a load address of 0x42000000 means that the kernel will be
      uncompressed to 0x40000000 i.e. DDR START on this platform).
      
      Even changing the load address to after the co-processor's shared memory
      won't render a booting platform, since the AUTO_ZRELADDR algorithm still
      ensures the kernel is uncompressed into memory shared with the first
      co-processor (0x40000000).
      
      Another option would be to move loading to 0x4A000000, since this will
      mean the decompressor will decompress the kernel to 0x48000000. However,
      this would mean a large chunk (0x44000000 => 0x48000000 (64MB)) of
      memory would essentially be wasted for no good reason.
      
      Until we can work with ST to find a suitable memory location to
      relocate co-processor shared memory, let's disable the shared memory
      nodes.  This will ensure a working platform in the mean time.
      
      NB: The more observant of you will notice that we're leaving the DMU
      shared memory node enabled; this is because a) it is the only one in
      active use at the time of this writing and b) it is not affected by
      the current default behaviour which is causing issues.
      
      Fixes: fe135c63 (ARM: dts: STiH407: Move over to using the 'reserved-memory' API for obtaining DMA memory)
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      Reviewed-by Peter Griffin <peter.griffin@linaro.org>
      Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0e289e53
    • Olof Johansson's avatar
      Merge tag 'imx-fixes-4.7' of... · 7752b0d5
      Olof Johansson authored
      Merge tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      The i.MX fixes for 4.7:
       - Correct Micrel PHY mask to fix the issue that i.MX6UL ethernet works
         in U-Boot but not in kernel.
      
      * tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: imx6ul: Fix Micrel PHY mask
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      7752b0d5
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · c141afd1
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A couple of fixes for pmd_mknotpresent()/pmd_present() for LPAE
        systems"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8579/1: mm: Fix definition of pmd_mknotpresent
        ARM: 8578/1: mm: ensure pmd_present only checks the valid bit
      c141afd1
  6. 18 Jun, 2016 14 commits
    • Pali Rohár's avatar
      hwmon: (dell-smm) Disallow fan_type() calls on broken machines · 2744d2fd
      Pali Rohár authored
      Some Dell machines have especially broken SMM or BIOS which cause that once
      fan_type() is called then CPU fan speed going randomly up and down. And for
      fixing this behaviour reboot is required.
      
      So this patch creates fan_type blacklist of affected Dell machines and
      disallow fan_type() call on them to prevent that erratic behaviour.
      
      Old blacklist which disabled loading driver on some machines added in
      commits a4b45b25 ("hwmon: (dell-smm) Blacklist Dell Studio XPS 8100")
      and 6220f4eb ("hwmon: (dell-smm) Blacklist Dell Studio XPS 8000") were
      moved to FAN_TYPE blacklist.
      Reported-by: default avatarJan C Peters <jcpeters89@gmail.com>
      Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=100121
      Cc: stable@vger.kernel.org # v4.0+, will need backport
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      2744d2fd
    • Pali Rohár's avatar
      hwmon: (dell-smm) Restrict fan control and serial number to CAP_SYS_ADMIN by default · 7613663c
      Pali Rohár authored
      For security reasons ordinary user must not be able to control fan speed
      via /proc/i8k by default. Some malicious software running under "nobody"
      user could be able to turn fan off and cause HW problems. So this patch
      changes default value of "restricted" parameter to 1.
      
      Also restrict reading of DMI_PRODUCT_SERIAL from /proc/i8k via "restricted"
      parameter. It is because non root user cannot read DMI_PRODUCT_SERIAL from
      sysfs file /sys/class/dmi/id/product_serial.
      
      Old non secure behaviour of file /proc/i8k can be achieved by loading this
      module with "restricted" parameter set to 0.
      
      Note that this patch has effects only for kernels compiled with CONFIG_I8K
      and only for file /proc/i8k. Hwmon interface provided by this driver was
      not changed and root access for setting fan speed was needed also before.
      Reported-by: default avatarMario Limonciello <Mario_Limonciello@dell.com>
      Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
      Cc: stable@vger.kernel.org # will need backport
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      7613663c
    • Pali Rohár's avatar
      hwmon: (dell-smm) Fail in ioctl I8K_BIOS_VERSION when bios version is not a number · 053ea640
      Pali Rohár authored
      ABI of I8K_BIOS_VERSION ioctl can return only number. But new BIOS versions
      contain also other characters, which does not fit into that ABI. So in case
      of non digit values return -EINVAL.
      Reported-by: default avatarMario Limonciello <Mario_Limonciello@dell.com>
      Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      053ea640
    • Linus Torvalds's avatar
      Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e80dac11
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a bunch (65) of USB fixes for 4.7-rc4.  Sorry about the
        quantity, I've been slow in getting these out.
      
        The majority are the "normal" gadget, musb, and xhci fixes, that we
        all are used to.  There are also a few other tiny fixes resolving a
        number of reported issues that showed up in 4.7-rc1.
      
        All of these have been in linux-next"
      
      * tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (65 commits)
        usbip: rate limit get_frame_number message
        usb: musb: sunxi: Remove bogus "Frees glue" comment
        usb: musb: sunxi: Fix NULL ptr deref when gadget is registered before musb
        usb: echi-hcd: Add ehci_setup check before echi_shutdown
        usb: host: ehci-msm: Conditionally call ehci suspend/resume
        MAINTAINERS: Add file patterns for usb device tree bindings
        usb: host: ehci-tegra: Avoid getting the same reset twice
        usb: host: ehci-tegra: Grab the correct UTMI pads reset
        USB: mos7720: delete parport
        USB: OHCI: Don't mark EDs as ED_OPER if scheduling fails
        phy: ti-pipe3: Program the DPLL even if it was already locked
        usb: musb: Stop bulk endpoint while queue is rotated
        usb: musb: Ensure rx reinit occurs for shared_fifo endpoints
        usb: musb: host: correct cppi dma channel for isoch transfer
        usb: musb: only restore devctl when session was set in backup
        usb: phy: Check initial state for twl6030
        usb: musb: Use normal module_init for 2430 glue
        usb: musb: Remove pm_runtime_set_irq_safe
        usb: musb: Remove extra PM runtime calls from 2430 glue layer
        usb: musb: Return error value from musb_mailbox
        ...
      e80dac11
    • Linus Torvalds's avatar
      Merge tag 'staging-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · a50094a4
      Linus Torvalds authored
      Pull IIO and staging fixes from Greg KH:
       "Here are a number of IIO and staging bugfixes for 4.7-rc4.
      
        Nothing huge, the normal amount of iio driver fixes, and some small
        staging driver bugfixes for some reported problems (2 are reverts of
        patches that went into 4.7-rc1).  All have been in linux-next with no
        reported issues"
      
      * tag 'staging-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (24 commits)
        Revert "Staging: rtl8188eu: rtw_efuse: Use sizeof type *pointer instead of sizeof type."
        Revert "Staging: drivers: rtl8188eu: use sizeof(*ptr) instead of sizeof(struct)"
        staging: lustre: lnet: Don't access NULL NI on failure path
        iio: hudmidity: hdc100x: fix incorrect shifting and scaling
        iio: light apds9960: Add the missing dev.parent
        iio: Fix error handling in iio_trigger_attach_poll_func
        iio: st_sensors: Disable DRDY at init time
        iio: st_sensors: Init trigger before irq request
        iio: st_sensors: switch to a threaded interrupt
        iio: light: bh1780: assign a static name
        iio: bh1780: dereference the client properly
        iio: humidity: hdc100x: fix IIO_TEMP channel reporting
        iio:st_pressure: fix sampling gains (bring inline with ABI)
        iio: proximity: as3935: fix buffer stack trashing
        iio: proximity: as3935: remove triggered buffer processing
        iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output
        max44000: Remove scale from proximity
        iio: humidity: am2315: Remove a stray unlock
        iio: humidity: hdc100x: correct humidity integration time mask
        iio: pressure: bmp280: fix error message for wrong chip id
        ...
      a50094a4
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 607117a1
      Linus Torvalds authored
      Pull driver core fixes from Greg KH:
       "Here are a small number of debugfs, ISA, and one driver core fix for
        4.7-rc4.
      
        All of these resolve reported issues.  The ISA ones have spent the
        least amount of time in linux-next, sorry about that, I didn't realize
        they were regressions that needed to get in now (thanks to Thorsten
        for the prodding!) but they do all pass the 0-day bot tests.  The
        others have been in linux-next for a while now.
      
        Full details about them are in the shortlog below"
      
      * tag 'driver-core-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        isa: Dummy isa_register_driver should return error code
        isa: Call isa_bus_init before dependent ISA bus drivers register
        watchdog: ebc-c384_wdt: Allow build for X86_64
        iio: stx104: Allow build for X86_64
        gpio: Allow PC/104 devices on X86_64
        isa: Allow ISA-style drivers on modern systems
        base: make module_create_drivers_dir race-free
        debugfs: open_proxy_open(): avoid double fops release
        debugfs: full_proxy_open(): free proxy on ->open() failure
        kernel/kcov: unproxify debugfs file's fops
      607117a1
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 07b5ca22
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are a small number of char and misc driver fixes for 4.7-rc4.
      
        They resolve some minor issues that have been reported, and have all
        been in linux-next"
      
      * tag 'char-misc-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        coresight: Handle build path error
        coresight: Fix erroneous memset in tmc_read_unprepare_etr
        coresight: Fix tmc_read_unprepare_etr
        coresight: Fix NULL pointer dereference in _coresight_build_path
        extcon: palmas: Fix boot up state of VBUS when using GPIO detection
        mcb: Acquire reference to carrier module in core
        mcb: Acquire reference to device in probe
        mei: don't use wake_up_interruptible for wr_ctrl
      07b5ca22
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 4c6459f9
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "The most user visible change here is a fix for our recent superblock
        validation checks that were causing problems on non-4k pagesized
        systems"
      
      * 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: btrfs_check_super_valid: Allow 4096 as stripesize
        btrfs: remove build fixup for qgroup_account_snapshot
        btrfs: use new error message helper in qgroup_account_snapshot
        btrfs: avoid blocking open_ctree from cleaner_kthread
        Btrfs: don't BUG_ON() in btrfs_orphan_add
        btrfs: account for non-CoW'd blocks in btrfs_abort_transaction
        Btrfs: check if extent buffer is aligned to sectorsize
        btrfs: Use correct format specifier
      4c6459f9
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · d9e66146
      Linus Torvalds authored
      Pull ACPI fix from Rafael Wysocki:
       "Revert a recent ACPICA commit that introduced a suspend-to-RAM
        regression on one system due to incorrect information in its ACPI
        tables that had not been taken into consideration at all before (and
        everything worked), but the commit in question started to use it"
      
      * tag 'acpi-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support for acpi_hw_write()"
      d9e66146
    • Linus Torvalds's avatar
      Merge tag 'pm-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 057868ea
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "Fixes for two recent regressions that may lead to degraded performance
        (operating performance points framework, intel_pstate).
      
        Specifics:
      
         - Fix a recent regression in the intel_pstate driver that may lead to
           degraded performance on some systems due to missing turbo state
           entry in the table returned by the ACPI _PSS object (Srinivas
           Pandruvada).
      
         - Fix a recent regression in the OPP (operating performance points)
           framework that may lead to degraded performance on some systems
           where the OPP table is created too early (Viresh Kumar)"
      
      * tag 'pm-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / OPP: Add 'UNKNOWN' status for shared_opp in struct opp_table
        cpufreq: intel_pstate: Adjust _PSS[0] freqeuency if needed
      057868ea
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 6be28d33
      Linus Torvalds authored
      Pull HID subsystem fixes from Jiri Kosina:
      
       - kernel panic fix in hid-elo from Oliver Neukum
      
       - Surface Pro 3 device quirk from Benjamin Tissoires
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: multitouch: Add MT_QUIRK_NOT_SEEN_MEANS_UP to Surface Pro 3
        HID: elo: kill not flush the work
      6be28d33
    • William Breathitt Gray's avatar
      isa: Dummy isa_register_driver should return error code · 5e25db87
      William Breathitt Gray authored
      The inline isa_register_driver stub simply allows compilation on systems
      with CONFIG_ISA disabled; the dummy isa_register_driver does not
      register an isa_driver at all. The inline isa_register_driver should
      return -ENODEV to indicate lack of support when attempting to register
      an isa_driver on such a system with CONFIG_ISA disabled.
      
      Cc: Matthew Wilcox <matthew@wil.cx>
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Tested-by: Ye Xiaolong
      Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      5e25db87
    • William Breathitt Gray's avatar
      isa: Call isa_bus_init before dependent ISA bus drivers register · 32a5a0c0
      William Breathitt Gray authored
      The isa_bus_init function must be called before drivers which utilize
      the ISA bus driver are registered. A race condition for initilization
      exists if device_initcall is used (the isa_bus_init callback is placed
      in the same initcall level as dependent drivers which use module_init).
      This patch ensures that isa_bus_init is called first by utilizing
      postcore_initcall in favor of device_initcall.
      
      Fixes: a5117ba7 ("[PATCH] Driver model: add ISA bus")
      Cc: Rene Herman <rene.herman@keyaccess.nl>
      Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      32a5a0c0
    • William Breathitt Gray's avatar
      watchdog: ebc-c384_wdt: Allow build for X86_64 · b87b8ff7
      William Breathitt Gray authored
      With the introduction of the ISA_BUS_API Kconfig option, ISA-style
      drivers may be built for X86_64 architectures. This patch changes the
      ISA Kconfig option dependency of the WinSystems EBC-C384 watchdog timer
      driver to ISA_BUS_API, thus allowing it to build for X86_64 as it is
      expected to.
      
      Cc: Wim Van Sebroeck <wim@iguana.be>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b87b8ff7