1. 08 Mar, 2015 4 commits
    • Linus Torvalds's avatar
      Merge tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · bbbce516
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are some tty and serial driver fixes for 4.0-rc3.
      
        Along with the atime fix that you know about, here are some other
        serial driver bugfixes as well.  Most notable is a wait_until_sent
        bugfix that was traced back to being around since before 2.6.12 that
        Johan has fixed up.
      
        All have been in linux-next successfully"
      
      * tag 'tty-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        TTY: fix tty_wait_until_sent maximum timeout
        TTY: fix tty_wait_until_sent on 64-bit machines
        USB: serial: fix infinite wait_until_sent timeout
        TTY: bfin_jtag_comm: remove incorrect wait_until_sent operation
        net: irda: fix wait_until_sent poll timeout
        serial: uapi: Declare all userspace-visible io types
        serial: core: Fix iotype userspace breakage
        serial: sprd: Fix missing spin_unlock in sprd_handle_irq()
        console: Fix console name size mismatch
        tty: fix up atime/mtime mess, take four
        serial: 8250_dw: Fix get_mctrl behaviour
        serial:8250:8250_pci: delete unneeded quirk entries
        serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S
        Change email address for 8250_pci
        serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO"
        Revert "tty/serial: of_serial: add DT alias ID handling"
      bbbce516
    • Linus Torvalds's avatar
      Merge tag 'staging-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 47df986b
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some IIO and staging driver fixes for 4.0-rc3.
      
        Details are in the shortlog, nothing major, mostly IIO fixes for
        reported issues.
      
        All have been in linux-next successfully"
      
      * tag 'staging-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (23 commits)
        staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel
        staging: comedi: vmk80xx: remove "firmware version" kernel messages
        staging: comedi: comedi_isadma: fix "stalled" detect in comedi_isadma_disable_on_sample()
        iio: ak8975: fix AK09911 dependencies
        iio: common: ssp_sensors: Protect PM-only functions to kill warning
        IIO: si7020: Allocate correct amount of memory in devm_iio_device_alloc
        Revert "iio:humidity:si7020: fix pointer to i2c client"
        iio: light: gp2ap020a00f: Select REGMAP_I2C
        iio: light: jsa1212: Select REGMAP_I2C
        iio: ad5686: fix optional reference voltage declaration
        iio:adc:mcp3422 Fix incorrect scales table
        iio: mxs-lradc: fix iio channel map regression
        iio: imu: adis16400: Fix sign extension
        staging: iio: ad2s1200: Fix sign extension
        iio: mxs-lradc: only update the buffer when its conversions have finished
        iio: mxs-lradc: make ADC reads not unschedule touchscreen conversions
        iio: mxs-lradc: make ADC reads not disable touchscreen interrupts
        iio: mxs-lradc: separate touchscreen and buffer virtual channels
        iio: imu: inv_mpu6050: Prevent dereferencing NULL
        iio: iadc: wait_for_completion_timeout time in jiffies
        ...
      47df986b
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 29191c7f
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are two char/misc fixes for 4.0-rc3.
      
        One is a reported binder driver fix needed due to a change in the mm
        core that happened in 4.0-rc1.  Another is a mei driver fix that
        resolves a reported issue in that driver.
      
        Both have been in linux-next for a while"
      
      * tag 'char-misc-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: make device disabled on stop unconditionally
        android: binder: fix binder mmap failures
      29191c7f
    • Linus Torvalds's avatar
      Merge tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · b0bc6572
      Linus Torvalds authored
      Pull "code of conflict" from Greg KH:
       "This file tries to set the rational basis for our code reviews, gives
        some advice on how to conduct them, and provides an excalation channel
        for any kernel developers if they so desire it"
      
      [ Let's see how this works ]
      
      * tag 'cc-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Code of Conflict
      b0bc6572
  2. 07 Mar, 2015 26 commits
  3. 06 Mar, 2015 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 84399bb0
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Outside of misc fixes, Filipe has a few fsync corners and we're
        pulling in one more of Josef's fixes from production use here"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs:__add_inode_ref: out of bounds memory read when looking for extended ref.
        Btrfs: fix data loss in the fast fsync path
        Btrfs: remove extra run_delayed_refs in update_cowonly_root
        Btrfs: incremental send, don't rename a directory too soon
        btrfs: fix lost return value due to variable shadowing
        Btrfs: do not ignore errors from btrfs_lookup_xattr in do_setxattr
        Btrfs: fix off-by-one logic error in btrfs_realloc_node
        Btrfs: add missing inode update when punching hole
        Btrfs: abort the transaction if we fail to update the free space cache inode
        Btrfs: fix fsync race leading to ordered extent memory leaks
      84399bb0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0d9b9c16
      Linus Torvalds authored
      Pull livepatching fix from Jiri Kosina:
       "Fix an RCU unlock misplacement in live patching infrastructure, from
        Peter Zijlstra"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: fix RCU usage in klp_find_external_symbol()
      0d9b9c16
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · 5b3b5921
      Linus Torvalds authored
      Pull thermal management fixes from Eduardo Valentin:
       "Specifics:
      
         - adding Lukasz as maintainer of samsung thermal driver.
         - driver fixes: exynos and int430x.
         - one fix in the exynos cpufreq driver related to cpu cooling (acked
           by cpufreq maintainer).
         - fix default sysfs attributes of cooling devices
      
        Note: I am sending this pull on Rui's behalf while he fixes issues in his Linux box"
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: Make sysfs attributes of cooling devices default attributes
        Thermal/int340x: Fix memleak for aux trip
        MAINTAINERS: Add entry for SAMSUNG THERMAL DRIVER
        cpufreq: exynos: Use simple approach to asses if cpu cooling can be used
        thermal: exynos: Fix wrong control of power down detection mode for Exynos7
      5b3b5921
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-03-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes · f6bec6ea
      Dave Airlie authored
      two fixes, both cc'd stable.
      
      * tag 'drm-intel-fixes-2015-03-05' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: gen4: work around hang during hibernation
        drm/i915: Check for driver readyness before handling an underrun interrupt
      f6bec6ea
    • Dave Airlie's avatar
      Merge tag 'v4.0-rc2' into drm-fixes · b0b20ce3
      Dave Airlie authored
      Linux 4.0-rc2
      
      Merging this manually as the i915 change is in it,
      and intel fixes are on top of this
      b0b20ce3
    • Linus Torvalds's avatar
      Merge tag 'sound-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5f237425
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a few more ASoC changes that have been gathered since rc1,
        but it's still fairly calm over all.  The only largish LOC is found in
        atmel driver, and it's just a removal of broken non-DT stuff.  The
        rest are all small driver-specific fixes, nothing to worry much"
      
      * tag 'sound-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
        ALSA: hda - One more Dell macine needs DELL1_MIC_NO_PRESENCE quirk
        ALSA: opl3: small array underflow
        ALSA: line6: Clamp values correctly
        ALSA: msnd: add some missing curly braces
        ASoC: omap-pcm: Correct dma mask
        ASoC: simple-card: Add a NULL pointer check in asoc_simple_card_dai_link_of
        ASoC: sam9g20_wm8731: drop machine_is_xxx
        ALSA: dice: fix wrong offsets for Dice interface
        ALSA: oxfw: fix a condition and return code in start_stream()
        ASoC: OMAP: mcbsp: Fix CLKX and CLKR pinmux when used as inputs
        ASoC: rt5677: Correct the routing paths of that after IF1/2 DACx Mux
        ASoC: sta32x: fix register range in regmap.
        ASoC: rt5670: Set RT5670_IRQ_CTRL1 non volatile
        ASoC: Intel: reset the DSP while suspending
        ASoC: Intel: save and restore the CSR register
        ASoC: Intel: update MMX ID to 3
        ASoC: max98357a: Add missing header files
        ASoC: cirrus: tlv320aic23 needs I2C
        ASoC: Samsung: add missing I2C/SPI dependencies
        ASoC: rt5670: Fix the speaker mono output issue
        ...
      5f237425
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 39ed853a
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These are fixes for recent regressions (ACPI resources management,
        suspend-to-idle), stable-candidate fixes (ACPI backlight), fixes
        related to the wakeup IRQ management changes made in v3.18, other
        fixes (suspend-to-idle, cpufreq ppc driver) and a couple of cleanups
        (suspend-to-idle, generic power domains, ACPI backlight).
      
        Specifics:
      
         - Fix ACPI resources management problems introduced by the recent
           rework of the code in question (Jiang Liu) and a build issue
           introduced by those changes (Joachim Nilsson).
      
         - Fix a recent suspend-to-idle regression on systems where entering
           idle states causes local timers to stop, prevent suspend-to-idle
           from crashing in restricted configurations (no cpuidle driver,
           cpuidle disabled etc.) and clean up the idle loop somewhat while at
           it (Rafael J Wysocki).
      
         - Fix build problem in the cpufreq ppc driver (Geert Uytterhoeven).
      
         - Allow the ACPI backlight driver module to be loaded if ACPI is
           disabled which helps the i915 driver in those configurations
           (stable-candidate) and change the code to help debug unusual use
           cases (Chris Wilson).
      
         - Wakeup IRQ management changes in v3.18 caused some drivers on the
           at91 platform to trigger a warning from the IRQ core related to an
           unexpected combination of interrupt action handler flags.  However,
           on at91 a timer IRQ is shared with some other devices (including
           system wakeup ones) and that leads to the unusual combination of
           flags in question.
      
           To make it possible to avoid the warning introduce a new interrupt
           action handler flag (which can be used by drivers to indicate the
           special case to the core) and rework the problematic at91 drivers
           to use it and work as expected during system suspend/resume.  From
           Boris Brezillon, Rafael J Wysocki and Mark Rutland.
      
         - Clean up the generic power domains subsystem's debugfs interface
           (Kevin Hilman)"
      
      * tag 'pm+acpi-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        genirq / PM: describe IRQF_COND_SUSPEND
        tty: serial: atmel: rework interrupt and wakeup handling
        watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND
        cpuidle / sleep: Use broadcast timer for states that stop local timer
        clk: at91: implement suspend/resume for the PMC irqchip
        rtc: at91rm9200: rework wakeup and interrupt handling
        rtc: at91sam9: rework wakeup and interrupt handling
        PM / wakeup: export pm_system_wakeup symbol
        genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
        ACPI / video: Propagate the error code for acpi_video_register
        ACPI / video: Load the module even if ACPI is disabled
        PM / Domains: cleanup: rename gpd -> genpd in debugfs interface
        cpufreq: ppc: Add missing #include <asm/smp.h>
        x86/PCI/ACPI: Relax ACPI resource descriptor checks to work around BIOS bugs
        x86/PCI/ACPI: Ignore resources consumed by host bridge itself
        cpuidle: Clean up fallback handling in cpuidle_idle_call()
        cpuidle / sleep: Do sanity checks in cpuidle_enter_freeze() too
        idle / sleep: Avoid excessive disabling and enabling interrupts
        PCI: versatile: Update for list_for_each_entry() API change
        genirq / PM: better describe IRQF_NO_SUSPEND semantics
      39ed853a
    • Linus Torvalds's avatar
      Merge tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux · 7c5bde7a
      Linus Torvalds authored
      Pull file locking fix from Jeff Layton:
       "Just a single patch to fix a memory leak that Daniel Wagner discovered
        while doing some testing with leases"
      
      * tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux:
        locks: fix fasync_struct memory leak in lease upgrade/downgrade handling
      7c5bde7a
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.0-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 1b1bd561
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
         - Fix a regression in the NFSv4 open state recovery code
         - Fix a regression in the NFSv4 close code
         - Fix regressions and side-effects of the loop-back mounted NFS fixes
           in 3.18, that cause the NFS read() syscall to return EBUSY.
         - Fix regressions around the readdirplus code and how it interacts
           with the VFS lazy unmount changes that went into v3.18.
         - Fix issues with out-of-order RPC call replies replacing updated
           attributes with stale ones (particularly after a truncate()).
         - Fix an underflow checking issue with RPC/RDMA credits
         - Fix a number of issues with the NFSv4 delegation return/free code.
         - Fix issues around stale NFSv4.1 leases when doing a mount"
      
      * tag 'nfs-for-4.0-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (24 commits)
        NFSv4.1: Clear the old state by our client id before establishing a new lease
        NFSv4: Fix a race in NFSv4.1 server trunking discovery
        NFS: Don't write enable new pages while an invalidation is proceeding
        NFS: Fix a regression in the read() syscall
        NFSv4: Ensure we skip delegations that are already being returned
        NFSv4: Pin the superblock while we're returning the delegation
        NFSv4: Ensure we honour NFS_DELEGATION_RETURNING in nfs_inode_set_delegation()
        NFSv4: Ensure that we don't reap a delegation that is being returned
        NFS: Fix stateid used for NFS v4 closes
        NFSv4: Don't call put_rpccred() under the rcu_read_lock()
        NFS: Don't require a filehandle to refresh the inode in nfs_prime_dcache()
        NFSv3: Use the readdir fileid as the mounted-on-fileid
        NFS: Don't invalidate a submounted dentry in nfs_prime_dcache()
        NFSv4: Set a barrier in the update_changeattr() helper
        NFS: Fix nfs_post_op_update_inode() to set an attribute barrier
        NFS: Remove size hack in nfs_inode_attrs_need_update()
        NFSv4: Add attribute update barriers to delegreturn and pNFS layoutcommit
        NFS: Add attribute update barriers to NFS writebacks
        NFS: Set an attribute barrier on all updates
        NFS: Add attribute update barriers to nfs_setattr_update_inode()
        ...
      1b1bd561
    • Takashi Iwai's avatar
      Merge tag 'asoc-fix-v4.0-rc2' of... · 4fda87df
      Takashi Iwai authored
      Merge tag 'asoc-fix-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v4.0
      
      A few driver specific fixes here, none of them earth shattering in
      themselves, that have accumliated since the opening of the merge window.
      4fda87df