1. 05 Nov, 2014 3 commits
  2. 04 Nov, 2014 6 commits
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal · a1cff6e2
      Linus Torvalds authored
      Pull thermal fixes from Eduardo Valentin:
       "Specifics:
         - a few code fixes improving the Exynos code base.  They remove dead
           and unreachable code.  No functional changes here
         - in Exynos code base, fixes regarding the right usage of features
           (TRIMINFO and TRIMRELOAD)
         - documentation of RCAR thermal
         - fix in the of-thermal, regarding the proper usage of of-APIs
         - fixes on thermal-core, removal of unreachable code"
      
      [ Eduardo is sending the thermal fixes on behalf of Rui Zhang this time.
        Rui is currently unable to send pull requests due to troubles with his
        machine and he's currently in a business trip ]
      
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        Thermal:Remove usless if(!result) before return tz
        thermal: exynos: fix IRQ clearing on TMU initialization
        thermal: fix multiple disbalanced device node counters
        thermal: rcar: Add binding docs for new R-Car Gen2 SoCs
        thermal: exynos: Add support for TRIM_RELOAD feature at Exynos3250
        thermal: exynos: Add support for many TRIMINFO_CTRL registers
        thermal: samsung: Exynos5260 and Exynos5420 should not use TRIM_RELOAD flag
        thermal: exynos: remove identical values from exynos*_tmu_registers structures
        thermal: exynos: remove redundant pdata checks from exynos_tmu_control()
        thermal: exynos: cache non_hw_trigger_levels in pdata
        thermal: exynos: simplify temp_to_code() and code_to_temp()
        thermal: exynos: remove redundant threshold_code checks from exynos_tmu_initialize()
        thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize()
        thermal: exynos: remove dead code for HW_MODE calibration
        thermal: exynos: remove unused struct exynos_tmu_registers entries
      a1cff6e2
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v3.18-2' of... · 9319bc1c
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform drievr updates from Darren Hart:
       "A short list of patches applying quirks and new DMI matches.  These
        pass my basic build tests and have spent 4 days in linux-next"
      
      * tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        quirk for Lenovo Yoga 3: no rfkill switch
        acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
        samsung-laptop: Add broken-acpi-video quirk for NC210/NC110
        asus-nb-wmi: Add wapf4 quirk for the X550VB
        toshiba_acpi: Add Toshiba TECRA A50-A to the alt keymap dmi list
      9319bc1c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 8a97577a
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Some more powerpc fixes if you please"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc: use device_online/offline() instead of cpu_up/down()
        powerpc/powernv: Properly fix LPC debugfs endianness
        powerpc: do_notify_resume can be called with bad thread_info flags argument
        powerpc/fadump: Fix endianess issues in firmware assisted dump handling
        powerpc: Fix section mismatch warning
      8a97577a
    • Linus Torvalds's avatar
      Merge tag 'ftracetest-3.18-rc1' of... · 1efa82ec
      Linus Torvalds authored
      Merge tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftracetest fix from Steven Rostedt:
       "Running the ftracetests on a machine that had the debugfs file system
        mounted in two locations caused the ftracetests to fail.  This is
        because the ftracetests script does a grep of the /proc/mounts file to
        find where the debugfs file system is mounted.  If it is mounted
        twice, then the grep returns two lines instead of just one.  This
        causes the ftracetests to get confused and fail.
      
        Use "head -1" to only return the first mount point for debugfs"
      
      * tag 'ftracetest-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftracetest: Take the first debugfs mount found
      1efa82ec
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 980d0d51
      Linus Torvalds authored
      Pull pin-control fixes from Linus Walleij:
       "This kernel cycle has been calm for both pin control and GPIO so far
        but here are three pin control patches for you anyway, only really
        dealing with Baytrail:
      
         - Two fixes for the Baytrail driver affecting IRQs and output state
           in sysfs
         - Use the linux-gpio mailing list also for pinctrl patches"
      
      * tag 'pinctrl-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
        pinctrl: use linux-gpio mailing list
        pinctrl: baytrail: Clear DIRECT_IRQ bit
      980d0d51
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · f3ed88a6
      Linus Torvalds authored
      Pull CMA and DMA-mapping fixes from Marek Szyprowski:
       "This contains important fixes for recently introduced highmem support
        for default contiguous memory region used for dma-mapping subsystem"
      
      * 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        mm, cma: make parameters order consistent in func declaration and definition
        mm: cma: Use %pa to print physical addresses
        mm: cma: Ensure that reservations never cross the low/high mem boundary
        mm: cma: Always consider a 0 base address reservation as dynamic
        mm: cma: Don't crash on allocation if CMA area can't be activated
      f3ed88a6
  3. 03 Nov, 2014 19 commits
  4. 02 Nov, 2014 12 commits
    • Linus Torvalds's avatar
      Linux 3.18-rc3 · 0df1f248
      Linus Torvalds authored
      0df1f248
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd · 81d92dc1
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       "Three main MTD fixes for 3.18:
      
         - A regression from 3.16 which was noticed in 3.17.  With the
           restructuring of the m25p80.c driver and the SPI NOR library
           framework, we omitted proper listing of the SPI device IDs.  This
           means m25p80.c wouldn't auto-load (modprobe) properly when built as
           a module.  For now, we duplicate the device IDs into both modules.
      
         - The OMAP / ELM modules were depending on an implicit link ordering.
           Use deferred probing so that the new link order (in 3.18-rc) can
           still allow for successful probing.
      
         - Fix suspend/resume support for LH28F640BF NOR flash"
      
      * tag 'for-linus-20141102' of git://git.infradead.org/linux-mtd:
        mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips
        mtd: omap: fix mtd devices not showing up
        mtd: m25p80,spi-nor: Fix module aliases for m25p80
        mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
        mtd: m25p80: get rid of spi_get_device_id
      81d92dc1
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · ad2be379
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of six patches consisting of:
         - two MAINTAINER updates
         - two scsi-mq fixs for the old parallel interface (not every request
           is tagged and we need to set the right flags to populate the SPI
           tag message)
         - a fix for a memory leak in scatterlist traversal caused by a
           preallocation update in 3.17
         - an ipv6 fix for cxgbi"
      
      [ The scatterlist fix also came in separately through the block layer tree ]
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        MAINTAINERS: ufs - remove self
        MAINTAINERS: change hpsa and cciss maintainer
        libcxgbi : support ipv6 address host_param
        scsi: set REQ_QUEUE for the blk-mq case
        Revert "block: all blk-mq requests are tagged"
        lib/scatterlist: fix memory leak with scsi-mq
      ad2be379
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 12267166
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Nothing too astounding or major: radeon, i915, vmwgfx, armada and
        exynos.
      
        Biggest ones:
         - vmwgfx has one big locking regression fix
         - i915 has come displayport fixes
         - radeon has some stability and a memory alloc failure
         - armada and exynos have some vblank fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
        drm/exynos: correct connector->dpms field before resuming
        drm/exynos: enable vblank after DPMS on
        drm/exynos: init kms poll at the end of initialization
        drm/exynos: propagate plane initialization errors
        drm/exynos: vidi: fix build warning
        drm/exynos: remove explicit encoder/connector de-initialization
        drm/exynos: init vblank with real number of crtcs
        drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
        drm/vmwgfx: Fix hash key computation
        drm/vmwgfx: fix lock breakage
        drm/i915/dp: only use training pattern 3 on platforms that support it
        drm/radeon: remove some buggy dead code
        drm/i915: Ignore VBT backlight check on Macbook 2, 1
        drm/radeon: remove invalid pci id
        drm/radeon: dpm fixes for asrock systems
        radeon: clean up coding style differences in radeon_get_bios()
        drm/radeon: Use drm_malloc_ab instead of kmalloc_array
        drm/radeon/dpm: disable ulv support on SI
        drm/i915: Fix GMBUSFREQ on vlv/chv
        drm/i915: Ignore long hpds on eDP ports
        ...
      12267166
    • Olof Johansson's avatar
      Merge tag 'fixes-against-v3.18-rc2' of... · 4257412d
      Olof Johansson authored
      Merge tag 'fixes-against-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge "omap fixes against v3.18-rc2" from Tony Lindgren:
      
      Few fixes for omaps to enable NAND BCH so devices won't
      produce errors when booted with omap2plus_defconfig, and
      reduce bloat by making IPV6 a loadable module.
      
      Also let's add a warning about legacy boot being deprecated
      for omap3.
      
      We now have things working with device tree, and only omap3 is
      still booting in legacy mode. So hopefully this warning will
      help move the remaining legacy mode users to boot with device
      tree.
      
      As the total reduction of code and static data is somewhere
      around 20000 lines of code once we remove omap3 legacy mode
      booting, we really do want to make omap3 to boot also in
      device tree mode only over the next few merge cycles.
      
      * tag 'fixes-against-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (407 commits)
        ARM: OMAP2+: Warn about deprecated legacy booting mode
        ARM: omap2plus_defconfig: Fix errors with NAND BCH
        ARM: omap2plus_defconfig: Fix bloat caused by having ipv6 built-in
        + Linux 3.18-rc2
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4257412d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 3c43de0f
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       - add the new bpf syscall to ARM.
       - drop a redundant return statement in __iommu_alloc_remap()
       - fix a performance issue noticed by Thomas Petazzoni with
         kmap_atomic().
       - fix an issue with the L2 cache OF parsing code which caused it to
         incorrectly print warnings on each boot, and make the warning text
         more consistent with the rest of the code
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()
        ARM: 8183/1: l2c: Improve l2c310_of_parse() error message
        ARM: 8181/1: Drop extra return statement
        ARM: 8182/1: l2c: Make l2x0_cache_size_of_parse() return 'int'
        ARM: enable bpf syscall
      3c43de0f
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 7501a533
      Linus Torvalds authored
      Pull kvm fixes from Paolo Bonzini:
       "A small set of x86 fixes.  The most serious is an SRCU lockdep fix.
      
        A bit late - needed some time to test the SRCU fix, which only came in
        on Friday"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: vmx: defer load of APIC access page address during reset
        KVM: nVMX: Disable preemption while reading from shadow VMCS
        KVM: x86: Fix far-jump to non-canonical check
        KVM: emulator: fix execution close to the segment limit
        KVM: emulator: fix error code for __linearize
      7501a533
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · 66338fee
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes
      
      This pull-request includes some bug fixes and code cleanups.
      Especially, this fixes the bind failure issue occurred when it tries
      to re-bind Exynos drm driver after unbound, and the modetest failure
      issue incurred by not having a pair to vblank on and off requests.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: correct connector->dpms field before resuming
        drm/exynos: enable vblank after DPMS on
        drm/exynos: init kms poll at the end of initialization
        drm/exynos: propagate plane initialization errors
        drm/exynos: vidi: fix build warning
        drm/exynos: remove explicit encoder/connector de-initialization
        drm/exynos: init vblank with real number of crtcs
      66338fee
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 7e05b807
      Linus Torvalds authored
      Pull VFS fixes from Al Viro:
       "A bunch of assorted fixes, most of them followups to overlayfs merge"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ovl: initialize ->is_cursor
        Return short read or 0 at end of a raw device, not EIO
        isofs: don't bother with ->d_op for normal case
        isofs_cmp(): we'll never see a dentry for . or ..
        overlayfs: fix lockdep misannotation
        ovl: fix check for cursor
        overlayfs: barriers for opening upper-layer directory
        rcu: Provide counterpart to rcu_dereference() for non-RCU situations
        staging: android: logger: Fix log corruption regression
      7e05b807
    • Linus Torvalds's avatar
      irda: stop calling sk_prot->disconnect() on connection failure · 4cb8c359
      Linus Torvalds authored
      The sk_prot is irda's own set of protocol handlers, so irda should
      statically know what that function is anyway, without using an indirect
      pointer.  And as it happens, we know *exactly* what that pointer is
      statically: it's NULL, because irda doesn't define a disconnect
      operation.
      
      So calling that function is doubly wrong, and will just cause an oops.
      Reported-by: default avatarMartin Lang <mlg.hessigheim@gmail.com>
      Cc: Samuel Ortiz <samuel@sortiz.org>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4cb8c359
    • Andrzej Hajda's avatar
      drm/exynos: correct connector->dpms field before resuming · 74cfe07a
      Andrzej Hajda authored
      During system suspend after connector switch off its dpms field
      is set to connector previous dpms state. To properly resume dpms field
      should be set to its actual state (off) before resuming to previous dpms state.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      74cfe07a
    • Andrzej Hajda's avatar
      drm/exynos: enable vblank after DPMS on · d6948b2f
      Andrzej Hajda authored
      Before DPMS off driver disables vblank.
      It should be balanced by vblank enable after DPMS on.
      The patch fixes issue with page_flip ioctl not being able
      to acquire vblank counter introduced by patch:
      drm: Always reject drm_vblank_get() after drm_vblank_off()
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d6948b2f