Skip to content
  1. Oct 31, 2014
  2. Oct 30, 2014
  3. Oct 29, 2014
  4. Oct 28, 2014
    • Alex Deucher's avatar
      drm/radeon: remove invalid pci id · 8c3e4347
      Alex Deucher authored
      
      
      0x4c6e is a secondary device id so should not be used
      by the driver.
      
      Noticed-by: default avatarMark Kettenis <mark.kettenis@xs4all.nl>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      8c3e4347
    • Alex Deucher's avatar
      drm/radeon: dpm fixes for asrock systems · 72b3f918
      Alex Deucher authored
      
      
      - bapm seems to cause CPU stuck messages so disable it.
      - nb dpm seems to prevent GPU dpm from getting enabled, so
      disable it.
      
      bug:
      https://bugs.freedesktop.org/show_bug.cgi?id=85107
      
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      72b3f918
    • Wilfried Klaebe's avatar
    • Michel Dänzer's avatar
      drm/radeon: Use drm_malloc_ab instead of kmalloc_array · e5a5fd4d
      Michel Dänzer authored
      
      
      Should avoid kmalloc failures due to large number of array entries.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81991
      Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      e5a5fd4d
    • Alex Deucher's avatar
      drm/radeon/dpm: disable ulv support on SI · 6fa45593
      Alex Deucher authored
      
      
      Causes problems on some boards.
      
      bug:
      https://bugs.freedesktop.org/show_bug.cgi?id=82889
      
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      6fa45593
    • Dave Airlie's avatar
      Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes · 30aad89a
      Dave Airlie authored
      Three changes for the Armada DRM driver:
      1. Add back the flags which tell the DRM core that we can do vblank.  This
         was removed in error during the recent restructuring, and came to light
         while trying textured Xv rendering.
      
      2. Fixing a refcount leak with Xv overlay.
      
      3. As per recent discussion, the drm_vblank_pre_modeset() calls can cause
         deadlock with other changes to generic code.  This change prevents those
         deadlocks by switching to the drm_crtc_vblank_*() calls instead.
      
      * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/armada: convert to use vblank_on/off calls
        drm/armada: fix page_flip refcounting leak
        drm/armada: add IRQ support back
      30aad89a
    • Linus Torvalds's avatar
      Merge tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · f7e87a44
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "A series of driver fixes:
         - a few compilation fixes with randconfigs
         - one potential compilation breakage on userspace due to the usage of
           a gcc extension
         - several warnings fixed
         - some other random driver fixes"
      
      * tag 'media/v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (22 commits)
        [media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
        [media] s5p-fimc: Only build suspend/resume for PM
        [media] s5p-jpeg: Only build suspend/resume for PM
        [media] Remove references to non-existent PLAT_S5P symbol
        [media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
        [media] tw68: remove bogus I2C_ALGOBIT dependency
        [media] usbvision-video: two use after frees
        [media] tw68: remove deprecated IRQF_DISABLED
        [media] xc5000: use after free in release()
        [media] em28xx-input: NULL dereference on error
        [media] wl128x: fix fmdbg compiler warning
        Revert "[media] v4l2-dv-timings: fix a sparse warning"
        [media] hackrf: harmless off by one in debug code
        [media] cx23885: initialize config structs for T9580
        [media] v4l: uvcvideo: Fix buffer completion size check
        [media] vivid: fix buffer overrun
        [media] saa7146: Create a device name before it's used
        [media] em28xx: fix uninitialized variable warning
        [media] vivid: fix Kconfig FB dependency
        [media] anysee: make sure loading modules is const
        ...
      f7e87a44
    • Linus Torvalds's avatar
      Merge tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · ebbe914b
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
       "Correct severity of reported errors in several EDAC drivers.  From
        Jason Baron"
      
      * tag 'edac_fixes_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        e7xxx_edac: Report CE events properly
        cpc925_edac: Report UE events properly
        i82860_edac: Report CE events properly
        i3200_edac: Report CE events properly
      ebbe914b
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · d9b9692a
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "Quite a few driver fixes in here, including some fairly substantial
        ones for the recently added Rockchip driver, plus a fix for spidev to
        more reliably support bidirectional transfers which is fairly large
        but basically mechanical.
      
        It's a bit more code than I'd like but all fixes"
      
      * tag 'spi-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: orion: fix potential NULL pointer de-reference
        spi/rockchip: spi controller must be disabled in tx callback too
        spi/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode
        spi/rockchip: fix bug that case spi can't go as fast as slave request
        spi: pl022: Fix incorrect dma_unmap_sg
        spi: spidev: Use separate TX and RX bounce buffers
        spi: dw: Initialize of_node to discover DT node children
      d9b9692a
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · d855c5c9
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "A couple of fixes for v3.18, one fix for an incorrect voltage to
        register mapping in the rk808 driver and a fix for a build failure in
        some SH defconfigs"
      
      * tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Include err.h from consumer.h to fix build failure
        regulator: rk808: Fix min_uV for DCDC1 & DCDC2
      d855c5c9
  5. Oct 27, 2014
    • Ville Syrjälä's avatar
      drm/i915: Fix GMBUSFREQ on vlv/chv · 6be1e3d3
      Ville Syrjälä authored
      vlv_cdclk_freq is in kHz but we need MHz for the GMBUSFREQ divider.
      
      This is a regression from:
      commit f8bf63fd
      
      
      Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Date:   Fri Jun 13 13:37:54 2014 +0300
      
          drm/i915: Kill duplicated cdclk readout code from i2c
      
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      6be1e3d3
    • Ville Syrjälä's avatar
      drm/i915: Ignore long hpds on eDP ports · 7a7f84cc
      Ville Syrjälä authored
      
      
      Turning vdd on/off can generate a long hpd pulse on eDP ports. In order
      to handle hpd we would need to turn on vdd to perform aux transfers.
      This would lead to an endless cycle of
      "vdd off -> long hpd -> vdd on -> detect -> vdd off -> ..."
      
      So ignore long hpd pulses on eDP ports. eDP panels should be physically
      tied to the machine anyway so they should not actually disappear and
      thus don't need long hpd handling. Short hpds are still needed for link
      re-train and whatnot so we can't just turn off the hpd interrupt
      entirely for eDP ports. Perhaps we could turn it off whenever the panel
      is disabled, but just ignoring the long hpd seems sufficient.
      
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
      Reviewed-by: default avatarTodd Previte <tprevite@gmail.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      7a7f84cc
    • Ville Syrjälä's avatar
      drm/i915: Do a dummy DPCD read before the actual read · f6a19066
      Ville Syrjälä authored
      
      
      Sometimes we seem to get utter garbage from DPCD reads. The resulting
      buffer is filled with the same byte, and the operation completed without
      errors. My HP ZR24w monitor seems particularly susceptible to this
      problem once it's gone into a sleep mode.
      
      The issue seems to happen only for the first AUX message that wakes the
      sink up. But as the first AUX read we often do is the DPCD receiver
      cap it does wreak a bit of havoc with subsequent link training etc. when
      the receiver cap bw/lane/etc. information is garbage.
      
      A sufficient workaround seems to be to perform a single byte dummy read
      before reading the actual data. I suppose that just wakes up the sink
      sufficiently and we can just throw away the returned data in case it's
      crap. DP_DPCD_REV seems like a sufficiently safe location to read here.
      
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarTodd Previte <tprevite@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      f6a19066
    • Mark Brown's avatar
      Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/orion', 'spi/fix/pl022',... · 1e2cf73e
      Mark Brown authored
      Merge remote-tracking branches 'spi/fix/dw', 'spi/fix/orion', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/spidev' into spi-linus
      1e2cf73e
    • Mark Brown's avatar
    • Mark Brown's avatar
    • Linus Torvalds's avatar
      Linux 3.18-rc2 · cac7f242
      Linus Torvalds authored
      v3.18-rc2
      cac7f242
    • Linus Torvalds's avatar
      Merge tag 'armsoc-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 88e23761
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Another week, another small batch of fixes.
      
        Most of these make zynq, socfpga and sunxi platforms work a bit
        better:
      
         - due to new requirements for regulators, DWMMC on socfpga broke past
           v3.17
         - SMP spinup fix for socfpga
         - a few DT fixes for zynq
         - another option (FIXED_REGULATOR) for sunxi is needed that used to
           be selected by other options but no longer is.
         - a couple of small DT fixes for at91
         - ...and a couple for i.MX"
      
      * tag 'armsoc-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: imx28-evk: Let i2c0 run at 100kHz
        ARM: i.MX6: Fix "emi" clock name typo
        ARM: multi_v7_defconfig: enable CONFIG_MMC_DW_ROCKCHIP
        ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
        ARM: dts: socfpga: Add a 3.3V fixed regulator node
        ARM: dts: socfpga: Fix SD card detect
        ARM: dts: socfpga: rename gpio nodes
        ARM: at91/dt: sam9263: fix PLLB frequencies
        power: reset: at91-reset: fix power down register
        MAINTAINERS: add atmel ssc driver maintainer entry
        arm: socfpga: fix fetching cpu1start_addr for SMP
        ARM: zynq: DT: trivial: Fix mc node
        ARM: zynq: DT: Add cadence watchdog node
        ARM: zynq: DT: Add missing reference for memory-controller
        ARM: zynq: DT: Add missing reference for ADC
        ARM: zynq: DT: Add missing address for L2 pl310
        ARM: zynq: DT: Remove 222 MHz OPP
        ARM: zynq: DT: Fix GEM register area size
      88e23761
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · d1e14f1d
      Linus Torvalds authored
      Pull vfs updates from Al Viro:
       "overlayfs merge + leak fix for d_splice_alias() failure exits"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        overlayfs: embed middle into overlay_readdir_data
        overlayfs: embed root into overlay_readdir_data
        overlayfs: make ovl_cache_entry->name an array instead of pointer
        overlayfs: don't hold ->i_mutex over opening the real directory
        fix inode leaks on d_splice_alias() failure exits
        fs: limit filesystem stacking depth
        overlay: overlay filesystem documentation
        overlayfs: implement show_options
        overlayfs: add statfs support
        overlay filesystem
        shmem: support RENAME_WHITEOUT
        ext4: support RENAME_WHITEOUT
        vfs: add RENAME_WHITEOUT
        vfs: add whiteout support
        vfs: export check_sticky()
        vfs: introduce clone_private_mount()
        vfs: export __inode_permission() to modules
        vfs: export do_splice_direct() to modules
        vfs: add i_op->dentry_open()
      d1e14f1d
  6. Oct 26, 2014
    • Olof Johansson's avatar
      Merge tag 'imx-fixes-3.18' of... · efc176a8
      Olof Johansson authored
      
      Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Merge "ARM: imx: fixes for 3.18" from Shawn Guo:
      
      The i.MX fixes for 3.18:
       - Revert one patch which increases I2C bus frequency on imx28-evk
       - Fix a typo on imx6q EIM clock name
      
      * tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx28-evk: Let i2c0 run at 100kHz
        ARM: i.MX6: Fix "emi" clock name typo
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      efc176a8
  7. Oct 25, 2014
    • Fabio Estevam's avatar
      ARM: dts: imx28-evk: Let i2c0 run at 100kHz · d1e61eb4
      Fabio Estevam authored
      Commit 78b81f46 ("ARM: dts: imx28-evk: Run I2C0 at 400kHz") caused issues
      when doing the following sequence in loop:
      
      - Boot the kernel
      - Perform audio playback
      - Reboot the system via 'reboot' command
      
      In many times the audio card cannot be probed, which causes playback to fail.
      
      After restoring to the original i2c0 frequency of 100kHz there is no such
      problem anymore.
      
      This reverts commit 78b81f46
      
      .
      
      Cc: <stable@vger.kernel.org> # 3.16+
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      d1e61eb4
    • Steve Longerbeam's avatar
      ARM: i.MX6: Fix "emi" clock name typo · a1fc1980
      Steve Longerbeam authored
      
      
      Fix a typo error, the "emi" names refer to the eim clocks.
      
      The change fixes typo in EIM and EIM_SLOW pre-output dividers and
      selectors clock names. Notably EIM_SLOW clock itself is named correctly.
      
      Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
      [vladimir_zapolskiy@mentor.com: ported to v3.17]
      Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
      Cc: Sascha Hauer <kernel@pengutronix.de>
      Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
      a1fc1980
    • Al Viro's avatar
      overlayfs: embed middle into overlay_readdir_data · db6ec212
      Al Viro authored
      
      
      same story...
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      db6ec212
    • Al Viro's avatar
      overlayfs: embed root into overlay_readdir_data · 49be4fb9
      Al Viro authored
      
      
      no sense having it a pointer - all instances have it pointing to
      local variable in the same stack frame
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      49be4fb9
    • Al Viro's avatar
    • Al Viro's avatar
      overlayfs: don't hold ->i_mutex over opening the real directory · 3d268c9b
      Al Viro authored
      
      
      just use it to serialize the assignment
      
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3d268c9b
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 2cc91884
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "This is the first round of fixes and tying up loose ends for MIPS.
      
         - plenty of fixes for build errors in specific obscure configurations
         - remove redundant code on the Lantiq platform
         - removal of a useless SEAD I2C driver that was causing a build issue
         - fix an earlier TLB exeption handler fix to also work on Octeon.
         - fix ISA level dependencies in FPU emulator's instruction decoding.
         - don't hardcode kernel command line in Octeon software emulator.
         - fix an earlier fix for the Loondson 2 clock setting"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: SEAD3: Fix I2C device registration.
        MIPS: SEAD3: Nuke PIC32 I2C driver.
        MIPS: ftrace: Fix a microMIPS build problem
        MIPS: MSP71xx: Fix build error
        MIPS: Malta: Do not build the malta-amon.c file if CMP is not enabled
        MIPS: Prevent compiler warning from cop2_{save,restore}
        MIPS: Kconfig: Add missing MIPS_CPS dependencies to PM and cpuidle
        MIPS: idle: Remove leftover __pastwait symbol and its references
        MIPS: Sibyte: Include the swarm subdir to the sb1250 LittleSur builds
        MIPS: ptrace.h: Add a missing include
        MIPS: ath79: Fix compilation error when CONFIG_PCI is disabled
        MIPS: MSP71xx: Remove compilation error when CONFIG_MIPS_MT is present
        MIPS: Octeon: Remove special case for simulator command line.
        MIPS: tlbex: Properly fix HUGE TLB Refill exception handler
        MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge
        pci: pci-lantiq: remove duplicate check on resource
        MIPS: Lasat: Add missing CONFIG_PROC_FS dependency to PICVUE_PROC
        MIPS: cp1emu: Fix ISA restrictions for cop1x_op instructions
      2cc91884
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · cdc63a05
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - enable 48-bit VA space now that KVM has been fixed, together with a
         couple of fixes for pgd allocation alignment and initial memblock
         current_limit.  There is still a dependency on !ARM_SMMU which needs
         to be updated as it uses the page table manipulation macros of the
         host kernel
       - eBPF fixes following changes/conflicts during the merging window
       - Compat types affecting compat_elf_prpsinfo
       - Compilation error on UP builds
       - ASLR fix when /proc/sys/kernel/randomize_va_space == 0
       - DT definitions for CLCD support on ARMv8 model platform
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Fix memblock current_limit with 64K pages and 48-bit VA
        arm64: ASLR: Don't randomise text when randomise_va_space == 0
        arm64: vexpress: Add CLCD support to the ARMv8 model platform
        arm64: Fix compilation error on UP builds
        Documentation/arm64/memory.txt: fix typo
        net: bpf: arm64: minor fix of type in jited
        arm64: bpf: add 'load 64-bit immediate' instruction
        arm64: bpf: add 'shift by register' instructions
        net: bpf: arm64: address randomize and write protect JIT code
        arm64: mm: Correct fixmap pagetable types
        arm64: compat: fix compat types affecting struct compat_elf_prpsinfo
        arm64: Align less than PAGE_SIZE pgds naturally
        arm64: Allow 48-bits VA space without ARM_SMMU
      cdc63a05
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 83da00fb
      Linus Torvalds authored
      Pull two sparc fixes from David Miller:
      
       1) Fix boots with gcc-4.9 compiled sparc64 kernels.
      
       2) Add missing __get_user_pages_fast() on sparc64 to fix hangs on
          futexes used in transparent hugepage areas.
      
          It's really idiotic to have a weak symbolled fallback that just
          returns zero, and causes this kind of bug.  There should be no
          backup implementation and the link should fail if the architecture
          fails to provide __get_user_pages_fast() and supports transparent
          hugepages.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Implement __get_user_pages_fast().
        sparc64: Fix register corruption in top-most kernel stack frame during boot.
      83da00fb
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 96971e9a
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "This is a pretty large update.  I think it is roughly as big as what I
        usually had for the _whole_ rc period.
      
        There are a few bad bugs where the guest can OOPS or crash the host.
        We have also started looking at attack models for nested
        virtualization; bugs that usually result in the guest ring 0 crashing
        itself become more worrisome if you have nested virtualization,
        because the nested guest might bring down the non-nested guest as
        well.  For current uses of nested virtualization these do not really
        have a security impact, but you never know and bugs are bugs
        nevertheless.
      
        A lot of these bugs are in 3.17 too, resulting in a large number of
        stable@ Ccs.  I checked that all the patches apply there with no
        conflicts"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: vfio: fix unregister kvm_device_ops of vfio
        KVM: x86: Wrong assertion on paging_tmpl.h
        kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
        KVM: x86: PREFETCH and HINT_NOP should have SrcMem flag
        KVM: x86: Emulator does not decode clflush well
        KVM: emulate: avoid accessing NULL ctxt->memopp
        KVM: x86: Decoding guest instructions which cross page boundary may fail
        kvm: x86: don't kill guest on unknown exit reason
        kvm: vmx: handle invvpid vm exit gracefully
        KVM: x86: Handle errors when RIP is set during far jumps
        KVM: x86: Emulator fixes for eip canonical checks on near branches
        KVM: x86: Fix wrong masking on relative jump/call
        KVM: x86: Improve thread safety in pit
        KVM: x86: Prevent host from panicking on shared MSR writes.
        KVM: x86: Check non-canonical addresses upon WRMSR
      96971e9a
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.18-b-rc1-tag' of... · 20ca57cd
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.18-b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull xen bug fixes from David Vrabel:
      
       - Fix regression in xen_clocksource_read() which caused all Xen guests
         to crash early in boot.
       - Several fixes for super rare race conditions in the p2m.
       - Assorted other minor fixes.
      
      * tag 'stable/for-linus-3.18-b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/pci: Allocate memory for physdev_pci_device_add's optarr
        x86/xen: panic on bad Xen-provided memory map
        x86/xen: Fix incorrect per_cpu accessor in xen_clocksource_read()
        x86/xen: avoid race in p2m handling
        x86/xen: delay construction of mfn_list_list
        x86/xen: avoid writing to freed memory after race in p2m handling
        xen/balloon: Don't continue ballooning when BP_ECANCELED is encountered
      20ca57cd
    • Linus Torvalds's avatar
      Merge tag 'sound-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · c6d13403
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Here are a chunk of small fixes since rc1: two PCM core fixes, one is
        a long-standing annoyance about lockdep and another is an ARM64 mmap
        fix.
      
        The rest are a HD-audio HDMI hotplug notification fix, a fix for
        missing NULL termination in Realtek codec quirks and a few new
        device/codec-specific quirks as usual"
      
      * tag 'sound-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add missing terminating entry to SND_HDA_PIN_QUIRK macro
        ALSA: pcm: Fix false lockdep warnings
        ALSA: hda - Fix inverted LED gpio setup for Lenovo Ideapad
        ALSA: hda - hdmi: Fix missing ELD change event on plug/unplug
        ALSA: usb-audio: Add support for Steinberg UR22 USB interface
        ALSA: ALC283 codec - Avoid pop noise on headphones during suspend/resume
        ALSA: pcm: use the same dma mmap codepath both for arm and arm64
      c6d13403