1. 15 2月, 2014 11 次提交
  2. 14 2月, 2014 12 次提交
  3. 13 2月, 2014 9 次提交
  4. 12 2月, 2014 8 次提交
    • M
      Merge remote-tracking branches 'regulator/fix/da9055' and... · 5c306c8a
      Mark Brown 提交于
      Merge remote-tracking branches 'regulator/fix/da9055' and 'regulator/fix/max14577' into regulator-linus
      5c306c8a
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45f7fdc2
      Linus Torvalds 提交于
      Pull powerpc updates from Ben Herrenschmidt:
       "Here is some powerpc goodness for -rc2.  Arguably -rc1 material more
        than -rc2 but I was travelling (again !)
      
        It's mostly bug fixes including regressions, but there are a couple of
        new things that I decided to drop-in.
      
        One is a straightforward patch from Michael to add a bunch of P8 cache
        events to perf.
      
        The other one is a patch by myself to add the direct DMA (iommu
        bypass) for PCIe on Power8 for 64-bit capable devices.  This has been
        around for a while, I had lost track of it.  However it's been in our
        internal kernels we use for testing P8 already and it affects only P8
        related code.  Since P8 is still unreleased the risk is pretty much
        nil at this point"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/powernv: Add iommu DMA bypass support for IODA2
        powerpc: Fix endian issues in kexec and crash dump code
        powerpc/ppc32: Fix the bug in the init of non-base exception stack for UP
        powerpc/xmon: Don't signal we've entered until we're finished printing
        powerpc/xmon: Fix timeout loop in get_output_lock()
        powerpc/xmon: Don't loop forever in get_output_lock()
        powerpc/perf: Configure BHRB filter before enabling PMU interrupts
        crypto/nx/nx-842: Fix handling of vmalloc addresses
        powerpc/pseries: Select ARCH_RANDOM on pseries
        powerpc/perf: Add Power8 cache & TLB events
        powerpc/relocate fix relocate processing in LE mode
        powerpc: Fix kdump hang issue on p8 with relocation on exception enabled.
        powerpc/pseries: Disable relocation on exception while going down during crash.
        powerpc/eeh: Drop taken reference to driver on eeh_rmv_device
        powerpc: Fix build failure in sysdev/mpic.c for MPIC_WEIRD=y
      45f7fdc2
    • R
      xen-blkback: init persistent_purge_work work_struct · abb97b8c
      Roger Pau Monne 提交于
      Initialize persistent_purge_work work_struct on xen_blkif_alloc (and
      remove the previous initialization done in purge_persistent_gnt). This
      prevents flush_work from complaining even if purge_persistent_gnt has
      not been used.
      Signed-off-by: NRoger Pau Monné <roger.pau@citrix.com>
      Reviewed-by: NDavid Vrabel <david.vrabel@citrix.com>
      Tested-by: NSander Eikelenboom <linux@eikelenboom.it>
      Signed-off-by: NJens Axboe <axboe@fb.com>
      abb97b8c
    • D
      Merge branch 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next · 9b244b5d
      Dave Airlie 提交于
      These are a number of fixes from the patch set which Jean-Francois has
      been working on which I think are important to be merged during -rc, and
      have been tested independently here.  I've been in discussion with Rob,
      who is happy that I send these directly to you.
      
      * 'tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
        drm/i2c: tda998x: fix the ENABLE_SPACE register
        drm/i2c: tda998x: set the PLL division factor in range 0..3
        drm/i2c: tda998x: force the page register at startup time
        drm/i2c: tda998x: free the CEC device on encoder_destroy
        drm/i2c: tda998x: check the CEC device creation
        drm/i2c: tda998x: fix bad value in the AIF
      9b244b5d
    • D
      Merge tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel into drm-next · da89486f
      Dave Airlie 提交于
      3 regression fixes in i915
      
      * tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel:
        drm/i915: Pair va_copy with va_end in i915_error_vprintf
        drm/i915: Fix intel_pipe_to_cpu_transcoder for UMS
        drm/i915: Disable dp aux irq on g4x
      da89486f
    • L
      Merge tag 'dt-fixes-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · bbb19555
      Linus Torvalds 提交于
      Pull DeviceTree fixes from Rob Herring:
      
       - Fix compile error drivers/spi/spi-rspi.c with !CONFIG_OF
       - Fix warnings for unused/uninitialized variables with !CONFIG_OF
       - Fix PCIe bus matching for powerpc
       - Add documentation for various vendor strings
      
      * tag 'dt-fixes-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        DT: Add vendor prefix for Spansion Inc.
        of/device: Nullify match table in of_match_device() for CONFIG_OF=n
        dt-bindings: add vendor-prefix for neonode
        of: fix PCI bus match for PCIe slots
        of: restructure for_each macros to fix compile warnings
        of: add vendor prefix for Honeywell
        of: Update qcom vendor prefix description
        of: add vendor prefix for Allwinner Technology
      bbb19555
    • L
      Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze · 738b52bb
      Linus Torvalds 提交于
      Pull microblaze fixes from Michal Simek:
       - Fix two compilation issues - HZ, readq/writeq
       - Fix stack protection support
      
      * tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Fix a typo when disabling stack protection
        microblaze: Define readq and writeq IO helper function
        microblaze: Fix missing HZ macro
      738b52bb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · a87af778
      Linus Torvalds 提交于
      Pull s390 bugfixes from Martin Schwidefsky:
       "A collection a bug fixes.  Most of them are minor but two of them are
        more severe.  The linkage stack bug can be used by user space to force
        an oops, with panic_on_oops this is a denial-of-service.  And the dump
        memory detection issue can cause incomplete memory dumps"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/cio: improve cio_commit_config
        s390: fix kernel crash due to linkage stack instructions
        s390/dump: Fix dump memory detection
        s390/appldata: restore missing init_virt_timer()
        s390/qdio: correct program-controlled interruption checking
        s390/qdio: for_each macro correctness
      a87af778