1. 08 Nov, 2012 10 commits
  2. 29 Oct, 2012 1 commit
    • Eric Sandeen's avatar
      ext4: fix unjournaled inode bitmap modification · ffb5387e
      Eric Sandeen authored
      commit 119c0d44
      ext4_new_inode() such that the inode bitmap was being modified
      outside a transaction, which could lead to corruption, and was
      discovered when journal_checksum found a bad checksum in the
      journal during log replay.
      Nix ran into this when using the journal_async_commit mount
      option, which enables journal checksumming.  The ensuing
      journal replay failures due to the bad checksums led to
      filesystem corruption reported as the now infamous
      "Apparent serious progressive ext4 data corruption bug"
      [ Changed by tytso to only call ext4_journal_get_write_access() only
        when we're fairly certain that we're going to allocate the inode. ]
      I've tested this by mounting with journal_checksum and
      running fsstress then dropping power; I've also tested by
      hacking DM to create snapshots w/o first quiescing, which
      allows me to test journal replay repeatedly w/o actually
      power-cycling the box.  Without the patch I hit a journal
      checksum error every time.  With this fix it survives
      many iterations.
      Reported-by: default avatarNix <nix@esperi.org.uk>
      Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
  3. 28 Oct, 2012 7 commits
    • Linus Torvalds's avatar
      Linux 3.7-rc3 · 8f0d8163
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · 5a5210c6
      Linus Torvalds authored
      Pull ktest confusion fix from Steven Rostedt:
       "With the v3.7-rc2 kernel, the network cards on my target boxes were
        not being brought up.
        I found that the modules for the network was not being installed.
        This was due to the config CONFIG_MODULES_USE_ELF_RELA that came
        before CONFIG_MODULES, and confused ktest in thinking that
        CONFIG_MODULES=y was not found.
        Ktest needs to test all configs and not just stop if something starts
        with CONFIG_MODULES."
      * tag 'ktest-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Fix ktest confusion with CONFIG_MODULES_USE_ELF_RELA
    • Linus Torvalds's avatar
      Merge tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc · 8e99165a
      Linus Torvalds authored
      Pull minor spi MXS fixes from Mark Brown:
       "These fixes are both pretty minor ones and are driver local."
      * tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
        spi: mxs: Terminate DMA in case of DMA timeout
        spi: mxs: Assign message status after transfer finished
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 065c8012
      Linus Torvalds authored
      Pull arm-soc fixes from Arnd Bergmann:
       "Bug fixes for a number of ARM platforms, mostly OMAP, imx and at91.
        These come a little later than I had hoped but unfortunately we had a
        few of these patches cause regressions themselves and had to work out
        how to deal with those in the meantime."
      * tag 'fixes-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
        Revert "ARM i.MX25: Fix PWM per clock lookups"
        ARM: versatile: fix versatile_defconfig
        ARM: mvebu: update defconfig with 3.7 changes
        ARM: at91: fix at91x40 build
        ARM: socfpga: Fix socfpga compilation with early_printk() enabled
        ARM: SPEAr: Remove unused empty files
        MAINTAINERS: Add arm-soc tree entry
        ARM: dts: mxs: add the "clock-names" for gpmi-nand
        ARM: ux500: Correct SDI5 address and add some format changes
        ARM: ux500: Specify AMBA Primecell IDs for Nomadik I2C in DT
        ARM: ux500: Fix build error relating to IRQCHIP_SKIP_SET_WAKE
        ARM: at91: drop duplicated config SOC_AT91SAM9 entry
        ARM: at91/i2c: change id to let i2c-at91 work
        ARM: at91/i2c: change id to let i2c-gpio work
        ARM: at91/dts: at91sam9g20ek_common: Fix typos in buttons labels.
        ARM: at91: fix external interrupt specification in board code
        ARM: at91: fix external interrupts in non-DT case
        ARM: at91: at91sam9g10: fix SOC type detection
        ARM: at91/tc: fix typo in the DT document
        ARM: AM33XX: Fix configuration of dmtimer parent clock by dmtimer driverDate:Wed, 17 Oct 2012 13:55:55 -0500
    • Mikulas Patocka's avatar
      Lock splice_read and splice_write functions · 1a25b1c4
      Mikulas Patocka authored
      Functions generic_file_splice_read and generic_file_splice_write access
      the pagecache directly. For block devices these functions must be locked
      so that block size is not changed while they are in progress.
      This patch is an additional fix for commit b87570f5
       ("Fix a crash
      when block device is read and block size is changed at the same time")
      that locked aio_read, aio_write and mmap against block size change.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Mikulas Patocka's avatar
      percpu-rw-semaphores: use rcu_read_lock_sched · 1bf11c53
      Mikulas Patocka authored
      Use rcu_read_lock_sched / rcu_read_unlock_sched / synchronize_sched
      instead of rcu_read_lock / rcu_read_unlock / synchronize_rcu.
      This is an optimization. The RCU-protected region is very small, so
      there will be no latency problems if we disable preempt in this region.
      So we use rcu_read_lock_sched / rcu_read_unlock_sched that translates
      to preempt_disable / preempt_disable. It is smaller (and supposedly
      faster) than preemptible rcu_read_lock / rcu_read_unlock.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Mikulas Patocka's avatar
      percpu-rw-semaphores: use light/heavy barriers · 5c1eabe6
      Mikulas Patocka authored
      This patch introduces new barrier pair light_mb() and heavy_mb() for
      percpu rw semaphores.
      This patch fixes a bug in percpu-rw-semaphores where a barrier was
      missing in percpu_up_write.
      This patch improves performance on the read path of
      percpu-rw-semaphores: on non-x86 cpus, there was a smp_mb() in
      percpu_up_read. This patch changes it to a compiler barrier and removes
      the "#if defined(X86) ..." condition.
      From: Lai Jiangshan <laijs@cn.fujitsu.com>
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  4. 27 Oct, 2012 4 commits
  5. 26 Oct, 2012 18 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e657e078
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "This is what we usually expect at this stage of the game, lots of
        little things, mostly in drivers.  With the occasional 'oops didn't
        mean to do that' kind of regressions in the core code."
       1) Uninitialized data in __ip_vs_get_timeouts(), from Arnd Bergmann
       2) Reject invalid ACK sequences in Fast Open sockets, from Jerry Chu.
       3) Lost error code on return from _rtl_usb_receive(), from Christian
       4) Fix reset resume on USB rt2x00, from Stanislaw Gruszka.
       5) Release resources on error in pch_gbe driver, from Veaceslav Falico.
       6) Default hop limit not set correctly in ip6_template_metrics[], fix
          from Li RongQing.
       7) Gianfar PTP code requests wrong kind of resource during probe, fix
          from Wei Yang.
       8) Fix VHOST net driver on big-endian, from Michael S Tsirkin.
       9) Mallenox driver bug fixes from Jack Morgenstein, Or Gerlitz, Moni
          Shoua, Dotan Barak, and Uri Habusha.
      10) usbnet leaks memory on TX path, fix from Hemant Kumar.
      11) Use socket state test, rather than presence of FIN bit packet, to
          determine FIONREAD/SIOCINQ value.  Fix from Eric Dumazet.
      12) Fix cxgb4 build failure, from Vipul Pandya.
      13) Provide a SYN_DATA_ACKED state to complement SYN_FASTOPEN in socket
          info dumps.  From Yuchung Cheng.
      14) Fix leak of security path in kfree_skb_partial().  Fix from Eric
      15) Handle RX FIFO overflows more resiliently in pch_gbe driver, from
          Veaceslav Falico.
      16) Fix MAINTAINERS file pattern for networking drivers, from Jean
      17) Add iPhone5 IDs to IPHETH driver, from Jay Purohit.
      18) VLAN device type change restriction is too strict, and should not
          trigger for the automatically generated vlan0 device.  Fix from Jiri
      19) Make PMTU/redirect flushing work properly again in ipv4, from
          Steffen Klassert.
      20) Fix memory corruptions by using kfree_rcu() in netlink_release().
          From Eric Dumazet.
      21) More qmi_wwan device IDs, from Bjørn Mork.
      22) Fix unintentional change of SNAT/DNAT hooks in generic NAT
          infrastructure, from Elison Niven.
      23) Fix 3.6.x regression in xt_TEE netfilter module, from Eric Dumazet.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (57 commits)
        tilegx: fix some issues in the SW TSO support
        qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan
        net: usb: Fix memory leak on Tx data path
        net/mlx4_core: Unmap UAR also in the case of error flow
        net/mlx4_en: Don't use vlan tag value as an indication for vlan presence
        net/mlx4_en: Fix double-release-range in tx-rings
        bas_gigaset: fix pre_reset handling
        vhost: fix mergeable bufs on BE hosts
        gianfar_ptp: use iomem, not ioports resource tree in probe
        ipv6: Set default hoplimit as zero.
        NET_VENDOR_TI: make available for am33xx as well
        pch_gbe: fix error handling in pch_gbe_up()
        b43: Fix oops on unload when firmware not found
        mwifiex: clean up scan state on error
        mwifiex: return -EBUSY if specific scan request cannot be honored
        brcmfmac: fix potential NULL dereference
        Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
        ath9k_htc: Add PID/VID for a Ubiquiti WiFiStation
        rt2x00: usb: fix reset resume
        rtlwifi: pass rx setup error code to caller
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · f761237e
      Linus Torvalds authored
      Pull slave-dmaengine fixes from Vinod Koul:
       "Three fixes for slave dmanegine.
        Two are for typo omissions in sifr dmaengine driver and the last one
        is for the imx driver fixing a missing unlock"
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: sirf: fix a typo in moving running dma_desc to active queue
        dmaengine: sirf: fix a typo in dma_prep_interleaved
        dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 64b1cbaa
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael J Wysocki:
       - Fix for a memory leak in acpi_bind_one() from Jesper Juhl.
       - Fix for an error code path memory leak in pm_genpd_attach_cpuidle()
         from Jonghwan Choi.
       - Fix for smp_processor_id() usage in preemptible code in powernow-k8
         from Andreas Herrmann.
       - Fix for a suspend-related memory leak in cpufreq stats from Xiaobing
       - Freezer fix for failure to clear PF_NOFREEZE along with PF_KTHREAD in
         flush_old_exec() from Oleg Nesterov.
       - acpi_processor_notify() fix from Alan Cox.
      * tag 'pm+acpi-for-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: missing break
        freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD
        Fix memory leak in cpufreq stats.
        cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
        PM / Domains: Fix memory leak on error path in pm_genpd_attach_cpuidle
        ACPI: Fix memory leak in acpi_bind_one()
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f54c77dd
      Linus Torvalds authored
      Pull infiniband fixes from Roland Dreier:
       "Small batch of fixes for 3.7:
         - Fix crash in error path in cxgb4
         - Fix build error on 32 bits in mlx4
         - Fix SR-IOV bugs in mlx4"
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        mlx4_core: Perform correct resource cleanup if mlx4_QUERY_ADAPTER() fails
        mlx4_core: Remove annoying debug messages from SR-IOV flow
        RDMA/cxgb4: Don't free chunk that we have failed to allocate
        IB/mlx4: Synchronize cleanup of MCGs in MCG paravirtualization
        IB/mlx4: Fix QP1 P_Key processing in the Primary Physical Function (PPF)
        IB/mlx4: Fix build error on platforms where UL is not 64 bits
    • Linus Torvalds's avatar
      Merge tag 'usb-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1d47091a
      Linus Torvalds authored
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a bunch of USB fixes for the 3.7-rc tree.
        There's a lot of small USB serial driver fixes, and one larger one
        (the mos7840 driver changes are mostly just moving code around to fix
        problems.) Thanks to Johan Hovold for finding the problems and fixing
        them all up.
        Other than those, there is the usual new device ids, xhci bugfixes,
        and gadget driver fixes, nothing out of the ordinary.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'usb-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (49 commits)
        xhci: trivial: Remove assigned but unused ep_ctx.
        xhci: trivial: Remove assigned but unused slot_ctx.
        xhci: Fix missing break in xhci_evaluate_context_result.
        xhci: Fix potential NULL ptr deref in command cancellation.
        ehci: Add yet-another Lucid nohandoff pci quirk
        ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
        USB: mos7840: fix port_probe flow
        USB: mos7840: fix port-data memory leak
        USB: mos7840: remove invalid disconnect handling
        USB: mos7840: remove NULL-urb submission
        USB: qcserial: fix interface-data memory leak in error path
        USB: option: fix interface-data memory leak in error path
        USB: ipw: fix interface-data memory leak in error path
        USB: mos7840: fix port-device leak in error path
        USB: mos7840: fix urb leak at release
        USB: sierra: fix port-data memory leak
        USB: sierra: fix memory leak in probe error path
        USB: sierra: fix memory leak in attach error path
        USB: usb-wwan: fix multiple memory leaks in error paths
        USB: keyspan: fix NULL-pointer dereferences and memory leaks
    • Linus Torvalds's avatar
      Merge tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 6ad2c73d
      Linus Torvalds authored
      Pull serial fix from Greg Kroah-Hartman:
       "Here is one patch, a revert of a omap serial driver patch that was
        causing problems, for your 3.7-rc tree.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'tty-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "serial: omap: fix software flow control"
    • Linus Torvalds's avatar
      Merge tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 490916d6
      Linus Torvalds authored
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are some staging driver fixes for your 3.7-rc tree.
        Nothing major here, a number of iio driver fixups that were causing
        problems, some comedi driver bugfixes, and a bunch of tidspbridge
        warning squashing and other regressions fixed from the 3.6 release.
        All have been in the linux-next releases for a bit.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (32 commits)
        staging: tidspbridge: delete unused mmu functions
        staging: tidspbridge: ioremap physical address of the stack segment in shm
        staging: tidspbridge: ioremap dsp sync addr
        staging: tidspbridge: change type to __iomem for per and core addresses
        staging: tidspbridge: drop const from custom mmu implementation
        staging: tidspbridge: request the right irq for mmu
        staging: ipack: add missing include (implicit declaration of function 'kfree')
        staging: ramster: depends on NET
        staging: omapdrm: fix allocation size for page addresses array
        staging: zram: Fix handling of incompressible pages
        Staging: android: binder: Allow using highmem for binder buffers
        Staging: android: binder: Fix memory leak on thread/process exit
        staging: comedi: ni_labpc: fix possible NULL deref during detach
        staging: comedi: das08: fix possible NULL deref during detach
        staging: comedi: amplc_pc263: fix possible NULL deref during detach
        staging: comedi: amplc_pc236: fix possible NULL deref during detach
        staging: comedi: amplc_pc236: fix invalid register access during detach
        staging: comedi: amplc_dio200: fix possible NULL deref during detach
        staging: comedi: 8255_pci: fix possible NULL deref during detach
        staging: comedi: ni_daq_700: fix dio subdevice regression
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 299650ca
      Linus Torvalds authored
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are a number of firmware core fixes for 3.7, and some other minor
        fixes.  And some documentation updates thrown in for good measure.
        All have been in the linux-next tree for a while.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'driver-core-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Documentation:Chinese translation of Documentation/arm64/memory.txt
        Documentation:Chinese translation of Documentation/arm64/booting.txt
        Documentation:Chinese translation of Documentation/IRQ.txt
        firmware loader: document kernel direct loading
        sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
        dynamic_debug: Remove unnecessary __used
        firmware loader: sync firmware cache by async_synchronize_full_domain
        firmware loader: let direct loading back on 'firmware_buf'
        firmware loader: fix one reqeust_firmware race
        firmware loader: cancel uncache work before caching firmware
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · f76ddd98
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg Kroah-Hartman:
       "Here are some driver fixes for 3.7.  They include extcon driver fixes,
        a hyper-v bugfix, and two other minor driver fixes.
        All of these have been in the linux-next releases for a while.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      * tag 'char-misc-3.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
        Drivers: hv: Cleanup error handling in vmbus_open()
        extcon : register for cable interest by cable name
        extcon: trivial: kfree missed from remove path
        extcon: driver model release call not needed
        extcon: MAX77693: Add platform data for MUIC device to initialize registers
        extcon: max77693: Use max77693_update_reg for rmw operations
        extcon: Fix kerneldoc for extcon_set_cable_state and extcon_set_cable_state_
        extcon: adc-jack: Add missing MODULE_LICENSE
        extcon: adc-jack: Fix checking return value of request_any_context_irq
        extcon: Fix return value in extcon_register_interest()
        extcon: unregister compat link on cleanup
        extcon: Unregister compat class at module unload to fix oops
        extcon: optimising the check_mutually_exclusive function
        extcon: standard cable names definition and declaration changed
        extcon-max8997: remove usage of ret in max8997_muic_handle_charger_type_detach
        extcon: Remove duplicate inclusion of extcon.h header file
    • Linus Torvalds's avatar
      VFS: don't do protected {sym,hard}links by default · 561ec64a
      Linus Torvalds authored
      In commit 800179c9 ("This adds symlink and hardlink restrictions to
      the Linux VFS"), the new link protections were enabled by default, in
      the hope that no actual application would care, despite it being
      technically against legacy UNIX (and documented POSIX) behavior.
      However, it does turn out to break some applications.  It's rare, and
      it's unfortunate, but it's unacceptable to break existing systems, so
      we'll have to default to legacy behavior.
      In particular, it has broken the way AFD distributes files, see
      along with some legacy scripts.
      Distributions can end up setting this at initrd time or in system
      scripts: if you have security problems due to link attacks during your
      early boot sequence, you have bigger problems than some kernel sysctl
      setting. Do:
      	echo 1 > /proc/sys/fs/protected_symlinks
      	echo 1 > /proc/sys/fs/protected_hardlinks
      to re-enable the link protections.
      Alternatively, we may at some point introduce a kernel config option
      that sets these kinds of "more secure but not traditional" behavioural
      options automatically.
      Reported-by: default avatarNick Bowler <nbowler@elliptictech.com>
      Reported-by: default avatarHolger Kiehl <Holger.Kiehl@dwd.de>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Cc: stable@kernel.org # v3.6
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 22e978f1
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Slightly a high amount of commits come from Adrian Knoth's HDSPM
        driver fixes.  Other than that, all small trival fixes or quirks that
        are pretty driver-specific."
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: wm8994: Only enable extra BCLK cycles when required
        ALSA: als3000: check for the kzalloc return value
        ALSA: sound/isa/opti9xx/miro.c: eliminate possible double free
        ALSA: hda - Fix silent headphone output from Toshiba P200
        ALSA: hdspm - Fix coding style in CTL_ELEM macros
        ALSA: hdspm - Fix typo in kcontrol element on RME MADI cards
        ALSA: hdspm - Fix sync_in detection on AES/AES32
        ALSA: hdspm - Fix sync_in reporting on RME MADI cards
        ALSA: hdspm - Also report autosync_sample_rate on MADI and MADIface
        ALSA: hdspm - Fix reported autosync_sample_rate
        ALSA: hdspm - Fix sync check reporting on all RME HDSPM cards
        ALSA: hdspm - Report external rate in slave mode on PCI MADI
        ALSA: hdspm - Allow DDS/Varispeed to be set from userspace
        ALSA: hda - add dock support for Thinkpad T430
        ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
        ASoC: Ux500: Dispose of device nodes correctly
    • Linus Torvalds's avatar
      Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · ef48bfd6
      Linus Torvalds authored
      Pull DMA-mapping revert from Marek Szyprowski:
       "Due to my mistake, my previous pull request (merged as commit
        cff7b8ba: "Merge branch 'fixes_for_linus' ..") contained a patch
        which is aimed for v3.8 and lacks its dependences.  This pull request
        reverts it and fixes build break of ARM architecture."
      * 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        Revert "ARM: dma-mapping: support debug_dma_mapping_error"
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 622f202a
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "This fixes a couple of nasty page table initialization bugs which were
        causing kdump regressions.  A clean rearchitecturing of the code is in
        the works - meanwhile these are reverts that restore the
        best-known-working state of the kernel.
        There's also EFI fixes and other small fixes."
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, mm: Undo incorrect revert in arch/x86/mm/init.c
        x86: efi: Turn off efi_enabled after setup on mixed fw/kernel
        x86, mm: Find_early_table_space based on ranges that are actually being mapped
        x86, mm: Use memblock memory loop instead of e820_RAM
        x86, mm: Trim memory in memblock to be page aligned
        x86/irq/ioapic: Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
        x86/efi: Fix oops caused by incorrect set_memory_uc() usage
        x86-64: Fix page table accounting
        Revert "x86/mm: Fix the size calculation of mapping tables"
        MAINTAINERS: Add EFI git repository location
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6a2e52f8
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Most of the kernel diffstat relates to a group of Intel P6 and KNC
        (Xeon-Phi Knights Corner) PMU driver fixes, neither of which is in
        heavy use, so we took the fixes.
        The rest is diverse smallish fixes to the tooling and kernel side."
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86: Remove unused variable in nhmex_rbox_alter_er()
        perf/x86: Enable overflow on Intel KNC with a custom knc_pmu_handle_irq()
        perf/x86: Remove cpuc->enable check on Intl KNC event enable/disable
        perf/x86: Make Intel KNC use full 40-bit width of counters
        perf/x86/uncore: Handle pci_read_config_dword() errors
        perf/x86: Remove P6 cpuc->enabled check
        perf/x86: Update/fix generic events on P6 PMU
        perf/x86: Fix P6 FP_ASSIST event constraint
        perf, cpu hotplug: Use cached value of smp_processor_id()
        perf, cpu hotplug: Run CPU_STARTING notifiers with irqs disabled
        x86/perf: Fix virtualization sanity check
        perf test: Fix exclude_guest parse events tests
        perf tools: do not flush maps on COMM for perf report
        perf help: Fix --help for builtins
        perf trace: Check if sample raw_data field is set
        perf trace: Validate syscall id before growing syscall table
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · f48d4277
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "This has our series of fixes for the next rc.  The biggest batch is
        from Jan Schmidt, fixing up some problems in our subvolume quota code
        and fixing btrfs send/receive to work with the new extended inode
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: do not bug when we fail to commit the transaction
        Btrfs: fix memory leak when cloning root's node
        Btrfs: Use btrfs_update_inode_fallback when creating a snapshot
        Btrfs: Send: preserve ownership (uid and gid) also for symlinks.
        Btrfs: fix deadlock caused by the nested chunk allocation
        btrfs: Return EINVAL when length to trim is less than FSB
        Btrfs: fix memory leak in btrfs_quota_enable()
        Btrfs: send correct rdev and mode in btrfs-send
        Btrfs: extended inode refs support for send mechanism
        Btrfs: Fix wrong error handling code
        Fix a sign bug causing invalid memory access in the ino_paths ioctl.
        Btrfs: comment for loop in tree_mod_log_insert_move
        Btrfs: fix extent buffer reference for tree mod log roots
        Btrfs: determine level of old roots
        Btrfs: tree mod log's old roots could still be part of the tree
        Btrfs: fix a tree mod logging issue for root replacement operations
        Btrfs: don't put removals from push_node_left into tree mod log twice
    • John W. Linville's avatar
      Merge branch 'master' of... · 330ee004
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
    • Arnd Bergmann's avatar
    • Arnd Bergmann's avatar
      Merge branch 'v3.7-samsung-fixes-2' of... · 389a84d2
      Arnd Bergmann authored
      Merge branch 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
      From Kukjin Kim <kgene.kim@samsung.com>:
      One is spi stuff for fix the device names for the different subtypes of
      the spi controller. And the other is adding missing .smp field for
      exynos4-dt and fixing memory sections for exynos4210-trats board.
      * 'v3.7-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
        ARM: EXYNOS: Set .smp field of machine descriptor for exynos4-dt
        ARM: dts: Split memory into 4 sections for exynos4210-trats
        ARM: SAMSUNG: Add naming of s3c64xx-spi devices
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>