07 Feb, 2016

6 commits

  • This change fixes a bug for a corner case where we have the the last
    release from a pty master/slave coming from a previously opened /dev/tty
    file. When this happens, the tty->driver_data can be stale, due to all
    ptmx or pts/N files having already been closed before (and thus the inode
    related to these files, which tty->driver_data points to, being already
    freed/destroyed).

    The fix here is to keep a reference on the opened master ptmx inode.
    We maintain the inode referenced until the final pty_unix98_shutdown,
    and only pass this inode to devpts_kill_index.

    Signed-off-by: Herton R. Krzesinski
    Cc: # 2.6.29+
    Reviewed-by: Peter Hurley
    Signed-off-by: Greg Kroah-Hartman

    Herton R. Krzesinski
     
  • WCH382 2S board is a PCIe card with 2 DB9 COM ports detected as
    Serial controller: Device 1c00:3253 (rev 10) (prog-if 05 [16850])

    Signed-off-by: Jeremy McNicoll
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Jeremy McNicoll
     
  • The wait_for_xmitr() function is only used if CONFIG_CONSOLE_POLL
    or CONFIG_SERIAL_OMAP_CONSOLE are set, but when both are disabled,
    the compiler warns about it being unused:

    drivers/tty/serial/omap-serial.c:1168:13: warning: 'wait_for_xmitr' defined but not used [-Wunused-func

    We could add more #ifdefs to work around it, but adding __maybe_unused
    seems nicer.

    Signed-off-by: Arnd Bergmann
    Fixes: 2172076d2399 ("serial/omap-serial: Deinline wait_for_xmitr, save 165 bytes")
    Signed-off-by: Greg Kroah-Hartman

    Arnd Bergmann
     
  • The omap-serial driver emulates RS485 delays using software timers,
    but neglects to clamp the input values from the unprivileged
    ioctl(TIOCSRS485). Because the software implementation busy-waits,
    malicious userspace could stall the cpu for ~49 days.

    Clamp the input values to < 100ms.

    Fixes: 4a0ac0f55b18 ("OMAP: add RS485 support")
    Cc: # 3.12+
    Signed-off-by: Peter Hurley
    Signed-off-by: Greg Kroah-Hartman

    Peter Hurley
     
  • The recently added uniphier 8250 port driver supports early console
    probing, and it supports being built as a module, but the combination
    of the two fails to link:

    ERROR: "early_serial8250_setup" [drivers/tty/serial/8250/8250_uniphier.ko] undefined!

    Given that earlycon support in a loadable module makes no sense,
    making that code conditional on 'MODULE' is a correct solution.

    Signed-off-by: Arnd Bergmann
    Fixes: b8d20e06eaad ("serial: 8250_uniphier: add earlycon support")
    Acked-by: Masahiro Yamada
    Signed-off-by: Greg Kroah-Hartman

    Arnd Bergmann
     
  • When the tty lock is interrupted on attempted re-open, 2 tty krefs
    are still held. Drop extra kref before returning failure from
    tty_lock_interruptible(), and drop lookup kref before returning
    failure from tty_open().

    Fixes: 0bfd464d3fdd ("tty: Wait interruptibly for tty lock on reopen")
    Reported-by: Dmitry Vyukov
    Signed-off-by: Peter Hurley
    Signed-off-by: Greg Kroah-Hartman

    Peter Hurley
     

01 Feb, 2016

15 commits

  • Linus Torvalds
     
  • Pull USB driver fixes from Greg KH:
    "Here are some small USB fixes and new device ids for 4.5-rc2. Nothing
    major here, full details are in the shortlog, and all of these have
    been in linux-next successfully"

    * tag 'usb-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
    USB: option: fix Cinterion AHxx enumeration
    USB: mxu11x0: fix memory leak on usb_serial private data
    USB: serial: ftdi_sio: add support for Yaesu SCU-18 cable
    USB: serial: option: Adding support for Telit LE922
    USB: serial: visor: fix crash on detecting device without write_urbs
    USB: visor: fix null-deref at probe
    USB: cp210x: add ID for IAI USB to RS485 adaptor
    usb: hub: do not clear BOS field during reset device
    cdc-acm:exclude Samsung phone 04e8:685d
    usb: cdc-acm: send zero packet for intel 7260 modem
    usb: cdc-acm: handle unlinked urb in acm read callback

    Linus Torvalds
     
  • Pull tty/serial fixes from Greg KH:
    "Here are some small tty/serial driver fixes for 4.5-rc2.

    They resolve a number of reported problems (the ioctl one specifically
    has been pointed out by numerous people) and one patch adds some new
    device ids for the 8250_pci driver. All have been in linux-next
    successfully"

    * tag 'tty-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    serial: 8250_pci: Add Intel Broadwell ports
    staging/speakup: Use tty_ldisc_ref() for paste kworker
    n_tty: Fix unsafe reference to "other" ldisc
    tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)
    tty: Retry failed reopen if tty teardown in-progress
    tty: Wait interruptibly for tty lock on reopen

    Linus Torvalds
     
  • Pull staging fixes from Greg KH:
    "Here are some small staging driver fixes for 4.5-rc2.

    One of them predated 4.4-final, but I missed that merge window due to
    the holliday. The others fix reported issues that have come up
    recently. The tty change is needed for the speakup driver fix and has
    the ack of the tty driver maintainer as well, i.e. myself :)

    All have been in linux-next with no reported issues"

    * tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    Staging: speakup: fix read scrolled-back VT
    Staging: speakup: Fix getting port information
    Revert "Staging: panel: usleep_range is preferred over udelay"
    iio: adis_buffer: Fix out-of-bounds memory access

    Linus Torvalds
     
  • Pull driver core fix from Greg KH:
    "Here's a single driver core fix that resolves an issue a lot of users
    have been hitting for a while now. It's been tested a lot and has
    been in linux-next successfully for a while"

    * tag 'driver-core-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    base/platform: Fix platform drivers with no probe callback

    Linus Torvalds
     
  • Pull MIPS fix from Ralf Baechle:
    "Just a single revert for a patch which I had upstreamed out of
    sequence"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function"

    Linus Torvalds
     
  • Pull x86 fixes from Thomas Gleixner:
    "A bit on the largish side due to a series of fixes for a regression in
    the x86 vector management which was introduced in 4.3. This work was
    started in December already, but it took some time to fix all corner
    cases and a couple of older bugs in that area which were detected
    while at it

    Aside of that a few platform updates for intel-mid, quark and UV and
    two fixes for in the mm code:
    - Use proper types for pgprot values to avoid truncation
    - Prevent a size truncation in the pageattr code when setting page
    attributes for large mappings"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
    x86/mm/pat: Avoid truncation when converting cpa->numpages to address
    x86/mm: Fix types used in pgprot cacheability flags translations
    x86/platform/quark: Print boundaries correctly
    x86/platform/UV: Remove EFI memmap quirk for UV2+
    x86/platform/intel-mid: Join string and fix SoC name
    x86/platform/intel-mid: Enable 64-bit build
    x86/irq: Plug vector cleanup race
    x86/irq: Call irq_force_move_complete with irq descriptor
    x86/irq: Remove outgoing CPU from vector cleanup mask
    x86/irq: Remove the cpumask allocation from send_cleanup_vector()
    x86/irq: Clear move_in_progress before sending cleanup IPI
    x86/irq: Remove offline cpus from vector cleanup
    x86/irq: Get rid of code duplication
    x86/irq: Copy vectormask instead of an AND operation
    x86/irq: Check vector allocation early
    x86/irq: Reorganize the search in assign_irq_vector
    x86/irq: Reorganize the return path in assign_irq_vector
    x86/irq: Do not use apic_chip_data.old_domain as temporary buffer
    x86/irq: Validate that irq descriptor is still active
    x86/irq: Fix a race in x86_vector_free_irqs()
    ...

    Linus Torvalds
     
  • Pull timer fixes from Thomas Gleixner:
    "The timer departement delivers:

    - a regression fix for the NTP code along with a proper selftest
    - prevent a spurious timer interrupt in the NOHZ lowres code
    - a fix for user space interfaces returning the remaining time on
    architectures with CONFIG_TIME_LOW_RES=y
    - a few patches to fix COMPILE_TEST fallout"

    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    tick/nohz: Set the correct expiry when switching to nohz/lowres mode
    clocksource: Fix dependencies for archs w/o HAS_IOMEM
    clocksource: Select CLKSRC_MMIO where needed
    tick/sched: Hide unused oneshot timer code
    kselftests: timers: Add adjtimex SETOFFSET validity tests
    ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO
    itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper
    posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper
    timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper
    hrtimer: Handle remaining time proper for TIME_LOW_RES
    clockevents/tcb_clksrc: Prevent disabling an already disabled clock

    Linus Torvalds
     
  • Pull scheduler fixes from Thomas Gleixner:
    "Three small fixes in the scheduler/core:

    - use after free in the numa code
    - crash in the numa init code
    - a simple spelling fix"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    pid: Fix spelling in comments
    sched/numa: Fix use-after-free bug in the task_numa_compare
    sched: Fix crash in sched_init_numa()

    Linus Torvalds
     
  • Pull perf fixes from Thomas Gleixner:
    "This is much bigger than typical fixes, but Peter found a category of
    races that spurred more fixes and more debugging enhancements. Work
    started before the merge window, but got finished only now.

    Aside of that this contains the usual small fixes to perf and tools.
    Nothing particular exciting"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (43 commits)
    perf: Remove/simplify lockdep annotation
    perf: Synchronously clean up child events
    perf: Untangle 'owner' confusion
    perf: Add flags argument to perf_remove_from_context()
    perf: Clean up sync_child_event()
    perf: Robustify event->owner usage and SMP ordering
    perf: Fix STATE_EXIT usage
    perf: Update locking order
    perf: Remove __free_event()
    perf/bpf: Convert perf_event_array to use struct file
    perf: Fix NULL deref
    perf/x86: De-obfuscate code
    perf/x86: Fix uninitialized value usage
    perf: Fix race in perf_event_exit_task_context()
    perf: Fix orphan hole
    perf stat: Do not clean event's private stats
    perf hists: Fix HISTC_MEM_DCACHELINE width setting
    perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
    perf tests: Remove wrong semicolon in while loop in CQM test
    perf: Synchronously free aux pages in case of allocation failure
    ...

    Linus Torvalds
     
  • Pull locking fix from Thomas Gleixner:
    "A single commit, which makes the rtmutex.wait_lock an irq safe lock.

    This prevents a potential deadlock which can be triggered by the rcu
    boosting code from rcu_read_unlock()"

    * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    rtmutex: Make wait_lock irq safe

    Linus Torvalds
     
  • Pull IRQ fixes from Ingo Molnar:
    "Mostly irqchip driver fixes, but also an irq core crash fix and a
    build fix"

    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    irqchip/mxs: Add missing set_handle_irq()
    irqchip/atmel-aic: Fix wrong bit operation for IRQ priority
    irqchip/gic-v3-its: Recompute the number of pages on page size change
    base: Export platform_msi_domain_[alloc,free]_irqs
    of: MSI: Simplify irqdomain lookup
    irqdomain: Allow domain lookup with DOMAIN_BUS_WIRED token
    irqchip: Fix dependencies for archs w/o HAS_IOMEM
    irqchip/s3c24xx: Mark init_eint as __maybe_unused
    genirq: Validate action before dereferencing it in handle_irq_event_percpu()

    Linus Torvalds
     
  • Pull debugobjects fix from Ingo Molnar:
    "Bump up debugobjects pool limit that bigger s390 systems kept running
    into"

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    debugobjects: Allow bigger number of early boot objects

    Linus Torvalds
     
  • Pull VFIO fix from Alex Williamson:
    "Use alternate group tracking for no-iommu"

    * tag 'vfio-v4.5-rc2' of git://github.com/awilliam/linux-vfio:
    vfio/noiommu: Don't use iommu_present() to track fake groups

    Linus Torvalds
     
  • Pull i2c fixes from Wolfram Sang:
    "Here are two I2C driver regression fixes. piix4 gets a larger
    overhaul fixing the latest refactoring and also an older known issue
    as well. designware-pci gets a fix for a bad merge conflict
    resolution"

    * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
    i2c: piix4: don't regress on bus names
    i2c: designware-pci: use IRQF_COND_SUSPEND flag
    i2c: piix4: Fully initialize SB800 before it is registered
    i2c: piix4: Fix SB800 locking

    Linus Torvalds
     

30 Jan, 2016

19 commits

  • Accidentally discovered this typo when I studied this module.

    Signed-off-by: Zhen Lei
    Cc: Hanjun Guo
    Cc: Linus Torvalds
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Cc: Tianhong Ding
    Cc: Xinwei Hu
    Cc: Zefan Li
    Link: http://lkml.kernel.org/r/1454119457-11272-1-git-send-email-thunder.leizhen@huawei.com
    Signed-off-by: Ingo Molnar

    Zhen Lei
     
  • …it/acme/linux into perf/urgent

    Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

    - Fix 'perf stat' stddev reporting due to mistakenly cleaning event
    private stats (Jiri Olsa)

    - Fix 'perf test CQM' endless loop detected by 'gcc6 -Wmisleading-indentation'
    (Markus Trippelsdorf)

    - Fix behaviour of Shift-Tab when nothing is focussed in the annotate TUI browser,
    detected with gcc6 -Wmisleading-indentation (Markus Trippelsdorf)

    - Fix mem data cacheline hists browser width setting for unresolved
    addresses (Jiri Olsa)

    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>

    Ingo Molnar
     
  • Pull ARM fixes from Russell King:
    "Just one fix for a -fstack-protector-strong problem from Kees Cook,
    and adding the new copy_file_range syscall"

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: wire up copy_file_range() syscall
    ARM: 8500/1: fix atags_to_fdt with stack-protector-strong

    Linus Torvalds
     
  • Pull powerpc fixes from Michael Ellerman:
    - Wire up copy_file_range() syscall from Chandan Rajendra
    - Simplify module TOC handling from Alan Modra
    - Remove newly added extra definition of pmd_dirty from Stephen Rothwell
    - Allow user space to map rtas_rmo_buf from Vasant Hegde
    - Fix PE location code from Gavin Shan
    - Remove PPMU_HAS_SSLOT flag for Power8 from Madhavan Srinivasan
    - Fixup _HPAGE_CHG_MASK from Aneesh Kumar K.V

    * tag 'powerpc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
    powerpc/mm: Fixup _HPAGE_CHG_MASK
    powerpc/perf: Remove PPMU_HAS_SSLOT flag for Power8
    powerpc/eeh: Fix PE location code
    powerpc/mm: Allow user space to map rtas_rmo_buf
    powerpc: Remove newly added extra definition of pmd_dirty
    powerpc: Simplify module TOC handling
    powerpc: Wire up copy_file_range() syscall

    Linus Torvalds
     
  • Pull s390 updates from Martin Schwidefsky:
    "An optimization for irq-restore, the SSM instruction is quite a bit
    slower than an if-statement and a STOSM.

    The copy_file_range system all is added.

    Cleanup for PCI and CIO.

    And a couple of bug fixes"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/cio: update measurement characteristics
    s390/cio: ensure consistent measurement state
    s390/cio: fix measurement characteristics memleak
    s390/zcrypt: Fix cryptographic device id in kernel messages
    s390/pci: remove iomap sanity checks
    s390/pci: set error state for unusable functions
    s390/pci: fix bar check
    s390/pci: resize iomap
    s390/pci: improve ZPCI_* macros
    s390/pci: provide ZPCI_ADDR macro
    s390/pci: adjust IOMAP_MAX_ENTRIES
    s390/numa: move numa_init_late() from device to arch_initcall
    s390: remove all usages of PSW_ADDR_INSN
    s390: remove all usages of PSW_ADDR_AMODE
    s390: wire up copy_file_range syscall
    s390: remove superfluous memblock_alloc() return value checks
    s390/numa: allocate memory with correct alignment
    s390/irqflags: optimize irq restore
    s390/mm: use TASK_MAX_SIZE where applicable

    Linus Torvalds
     
  • Pull btrfs fixes from Chris Mason:
    "Dave had a small collection of fixes to the new free space tree code,
    one of which was keeping our sysfs files more up to date with feature
    bits as different things get enabled (lzo, raid5/6, etc).

    I should have kept the sysfs stuff for rc3, since we always manage to
    trip over something. This time it was GFP_KERNEL from somewhere that
    is NOFS only. Instead of rebasing it out I've put a revert in, and
    we'll fix it properly for rc3.

    Otherwise, Filipe fixed a btrfs DIO race and Qu Wenruo fixed up a
    use-after-free in our tracepoints that Dave Jones reported"

    * 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
    Revert "btrfs: synchronize incompat feature bits with sysfs files"
    btrfs: don't use GFP_HIGHMEM for free-space-tree bitmap kzalloc
    btrfs: sysfs: check initialization state before updating features
    Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"
    btrfs: async-thread: Fix a use-after-free error for trace
    Btrfs: fix race between fsync and lockless direct IO writes
    btrfs: add free space tree to the cow-only list
    btrfs: add free space tree to lockdep classes
    btrfs: tweak free space tree bitmap allocation
    btrfs: tests: switch to GFP_KERNEL
    btrfs: synchronize incompat feature bits with sysfs files
    btrfs: sysfs: introduce helper for syncing bits with sysfs files
    btrfs: sysfs: add free-space-tree bit attribute
    btrfs: sysfs: fix typo in compat_ro attribute definition

    Linus Torvalds
     
  • Pull power management and ACPI fixes from Rafael Wysocki:
    "These are: cpuidle fixes (including one fix for a recent regression),
    cpufreq fixes (including fixes for two issues introduced during the
    4.2 cycle), generic power domains framework fixes (two locking fixes
    and one cleanup), one locking fix in the ACPI-based PCI hotplug
    framework (ACPIPHP), removal of one ACPI backlight blacklist entry
    that isn't necessary any more and a PM Kconfig cleanup.

    Specifics:

    - Fix a recent cpuidle core regression that broke suspend-to-idle on
    all systems where cpuidle drivers don't provide ->enter_freeze
    callbacks for any states (Sudeep Holla).

    - Drop an unnecessary symbol definition from the cpuidle core code
    handling coupled CPU cores (Anders Roxell).

    - Fix a race condition related to governor initialization and removal
    in the cpufreq core (Viresh Kumar).

    - Clean up the cpufreq core to use list_is_last() for checking if the
    given policy object is the last element of a list instead of open
    coding that in a clumsy way (Gautham R Shenoy).

    - Fix compiler warnings in the pxa2xx and cpufreq-dt cpufreq drivers
    (Arnd Bergmann).

    - Fix two locking issues and clean up a comment in the generic power
    domains framework (Ulf Hansson, Marek Szyprowski, Moritz Fischer).

    - Fix the error code path of one function in the ACPI-based PCI
    hotplug framework (ACPIPHP) that forgets to release a lock acquired
    previously (Insu Yun).

    - Drop the ACPI backlight blacklist entry for Dell Inspiron 5737 that
    is not necessary any more (Hans de Goede).

    - Clean up the top-level PM Kconfig to stop requiring APM emulation
    to depend on PM which in fact isn't necessary (Arnd Bergmann)"

    * tag 'pm+acpi-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    cpufreq: cpufreq-dt: avoid uninitialized variable warnings:
    cpufreq: pxa2xx: fix pxa_cpufreq_change_voltage prototype
    PM: APM_EMULATION does not depend on PM
    cpufreq: Use list_is_last() to check last entry of the policy list
    cpufreq: Fix NULL reference crash while accessing policy->governor_data
    cpuidle: coupled: remove unused define cpuidle_coupled_lock
    PM / Domains: Fix typo in comment
    PM / Domains: Fix potential deadlock while adding/removing subdomains
    ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()
    ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"
    cpuidle: fix fallback mechanism for suspend to idle in absence of enter_freeze
    PM / domains: fix lockdep issue for all subdomains

    Linus Torvalds
     
  • Pull swiotlb patchlet from Konrad Rzeszutek Wilk:
    "One trivial patch.

    Another patch (from Fengguang) is already in your tree courtesy of
    Andrew Morton - but I would prefer not to rebase my tree. Hence the
    diff is very small"

    * 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
    swiotlb: Make linux/swiotlb.h standalone includible
    MAINTAINERS: add git URL for swiotlb

    Linus Torvalds
     
  • Pull cleancache cleanups from Konrad Rzeszutek Wilk:
    "Simple cleanups"

    * 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
    include/linux/cleancache.h: Clean up code
    cleancache: constify cleancache_ops structure

    Linus Torvalds
     
  • Pull IOMMU fixes from Joerg Roedel:
    "Five patches queued up:

    - Two patches for the AMD and Intel IOMMU drivers to fix alias
    handling and ATS handling.

    - Fix build error with arm io-pgtable code

    - Two documentation fixes"

    * tag 'iommu-fixes-v4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
    iommu: Update struct iommu_ops comments
    iommu/vt-d: Fix link to Intel IOMMU Specification
    iommu/amd: Correct the wrong setting of alias DTE in do_attach
    iommu/vt-d: Don't skip PCI devices when disabling IOTLB
    iommu/io-pgtable-arm: Fix io-pgtable-arm build failure

    Linus Torvalds
     
  • …l/git/groeck/linux-staging

    Pull hwmon fixes from Guenter Roeck:
    - Use bit mask to calculate tdp limit in fam15h_power driver
    - Black-list Dell Studio XPS 8000 in dell-smm driver

    * tag 'hwmon-for-linus-v4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (fam15h_power) Add bit masking for tdp_limit
    hwmon: (dell-smm) Blacklist Dell Studio XPS 8000

    Linus Torvalds
     
  • Pull SCSI fixes from James Bottomley:
    "Four fixes: one to try to fix our repeated intermittent crashes in
    suspend/resume, one to correct a regression in the optimal I/O size
    reporting and a couple for randconfig build failures in the hisi_sas
    driver"

    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
    SCSI: fix crashes in sd and sr runtime PM
    sd: Optimal I/O size is in bytes, not sectors
    hisi_sas: Restrict SCSI_HISI_SAS to arm64
    hisi_sas: SCSI_HISI_SAS should depend on HAS_DMA

    Linus Torvalds
     
  • Pull block layer fix from Jens Axboe:
    "This just contains the fix for the split issue that we had in -rc1.

    It's been well tested at this point, so let's get it in mainline so we
    don't have the same split issue for -rc2"

    * 'for-linus' of git://git.kernel.dk/linux-block:
    block: fix bio splitting on max sectors

    Linus Torvalds
     
  • * pm-cpuidle:
    cpuidle: coupled: remove unused define cpuidle_coupled_lock
    cpuidle: fix fallback mechanism for suspend to idle in absence of enter_freeze

    * pm-cpufreq:
    cpufreq: cpufreq-dt: avoid uninitialized variable warnings:
    cpufreq: pxa2xx: fix pxa_cpufreq_change_voltage prototype
    cpufreq: Use list_is_last() to check last entry of the policy list
    cpufreq: Fix NULL reference crash while accessing policy->governor_data

    * pm-domains:
    PM / Domains: Fix typo in comment
    PM / Domains: Fix potential deadlock while adding/removing subdomains
    PM / domains: fix lockdep issue for all subdomains

    * pm-sleep:
    PM: APM_EMULATION does not depend on PM

    Rafael J. Wysocki
     
  • * acpi-video:
    ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"

    * acpi-hotplug:
    ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()

    Rafael J. Wysocki
     
  • Pull sound fixes from Takashi Iwai:
    "There are a few fixes in ALSA core for bugs that have been spotted by
    fuzzer. Also a temporary workaround for PowerPC (and possibly other)
    builds with incompatible ioctls was applied to compress API.

    Other than that, a few trivial fixes and quirks for FireWire BeBoB,
    USB-audio and HD-audio are found, too"

    * tag 'sound-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - disable dynamic clock gating on Broxton before reset
    ALSA: hda - Add new GPU codec ID 0x10de0083 to snd-hda
    ALSA: dummy: Disable switching timer backend via sysfs
    ALSA: timer: fix SND_PCM_TIMER Kconfig text
    ALSA: Add missing dependency on CONFIG_SND_TIMER
    ALSA: bebob: Use a signed return type for get_formation_index
    ALSA: usb-audio: Fix TEAC UD-501/UD-503/NT-503 usb delay
    ALSA: compress: Disable GET_CODEC_CAPS ioctl for some architectures
    ALSA: seq: Degrade the error message for too many opens
    ALSA: seq: Fix incorrect sanity check at snd_seq_oss_synth_cleanup()

    Linus Torvalds
     
  • Pull drm fixes from Dave Airlie:
    "Summary:

    - Misc amdgpu/radeon fixes
    - VC4 build fix
    - vmwgfx fix
    - misc rockchip fixes

    The etnaviv guys had an API feature they wanted in their first
    release, so I've merged that with their fixes"

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (41 commits)
    drm/vmwgfx: respect 'nomodeset'
    drm/amdgpu: only move pt bos in LRU list on success
    drm/radeon: fix DP audio support for APU with DCE4.1 display engine
    drm/radeon: Add a common function for DFS handling
    drm/radeon: cleaned up VCO output settings for DP audio
    drm/amd/powerplay: Update SMU firmware loading for Stoney
    drm/etnaviv: call correct function when trying to vmap a DMABUF
    drm/etnaviv: rename etnaviv_gem_vaddr to etnaviv_gem_vmap
    drm/etnaviv: fix get pages error path in etnaviv_gem_vaddr
    drm/etnaviv: fix memory leak in IOMMU init path
    drm/etnaviv: add further minor features and varyings count
    drm/etnaviv: add helper for comparing model/revision IDs
    drm/etnaviv: add helper to extract bitfields
    drm/etnaviv: use defined constants for the chip model
    drm/etnaviv: update common and state_hi xml.h files
    drm/etnaviv: ignore VG GPUs with FE2.0
    drm/amdgpu: don't init fbdev if we don't have any connectors
    drm/radeon: only init fbdev if we have connectors
    drm/radeon: Ensure radeon bo is unreserved in radeon_gem_va_ioctl
    drm/etnaviv: fix failure path if model is zero
    ...

    Linus Torvalds
     
  • Pull security layer fixes from James Morris:
    "The keys patch fixes a bug which is breaking kerberos, and the seccomp
    fix addresses a no_new_privs bypass"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
    KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set
    seccomp: always propagate NO_NEW_PRIVS on tsync

    Linus Torvalds
     
  • This reverts commit 14e46e04958df740c6c6a94849f176159a333f13.

    This ends up doing sysfs operations from deep in balance (where we
    should be GFP_NOFS) and under heavy balance load, we're making races
    against sysfs internals.

    Revert it for now while we figure things out.

    Signed-off-by: Chris Mason

    Chris Mason