1. 01 Jul, 2014 2 commits
  2. 27 Jun, 2014 1 commit
  3. 25 Jun, 2014 4 commits
  4. 24 Jun, 2014 13 commits
    • Rahul Sharma's avatar
      drm/exynos: enable vsync interrupt while waiting for vblank · 5d39b9ee
      Rahul Sharma authored
      mixer_wait_for_vblank function expects that the upcoming
      vsync interrupt handler routine will clear the
      wait_vsync_event atomic variable.
      
      For this to happen, interrupts should be enabled and
      disabled properly.
      Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      5d39b9ee
    • Rahul Sharma's avatar
      drm/exynos: soft reset mixer before reconfigure after power-on · d74ed937
      Rahul Sharma authored
      Mixer soft reset is a recommended step before reconfiguring
      the mixer after power on. Mixer looses the previous state of
      DMAs if soft reset. This is the recommendation from the
      hardware team.
      Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d74ed937
    • Rahul Sharma's avatar
      drm/exynos: allow multiple layer updates per vsync for mixer · 5c0f4829
      Rahul Sharma authored
      Allowing only one layer update per vsync can cause issues
      while there are update available for both layers. There is
      a good amount of possibility to loose updates if we allow
      single update per vsync.
      Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      5c0f4829
    • Chris Wilson's avatar
      drm/i915: Hold the table lock whilst walking the file's idr and counting the objects in debugfs · 5b5ffff0
      Chris Wilson authored
      Fixes an issue whereby we may race with the table updates (before the
      core takes the struct_mutex) and so risk dereferencing a stale pointer in
      the iterator for /debugfs/.../i915_gem_objects. For example,
      
      [ 1524.757545] BUG: unable to handle kernel paging request at f53af748
      [ 1524.757572] IP: [<c1406982>] per_file_stats+0x12/0x100
      [ 1524.757599] *pdpt = 0000000001b13001 *pde = 00000000379fb067 *pte = 80000000353af060
      [ 1524.757621] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
      [ 1524.757637] Modules linked in: ctr ccm arc4 ath9k ath9k_common ath9k_hw ath snd_hda_codec_conexant mac80211 snd_hda_codec_generic snd_hda_intel snd_hda_controller snd_hda_codec bnep snd_hwdep rfcomm snd_pcm gpio_ich dell_wmi sparse_keymap snd_seq_midi hid_multitouch uvcvideo snd_seq_midi_event dell_laptop snd_rawmidi dcdbas snd_seq videobuf2_vmalloc videobuf2_memops videobuf2_core usbhid videodev snd_seq_device coretemp snd_timer hid joydev kvm_intel cfg80211 ath3k kvm btusb bluetooth serio_raw snd microcode soundcore lpc_ich wmi mac_hid parport_pc ppdev lp parport psmouse ahci libahci
      [ 1524.757825] CPU: 3 PID: 1911 Comm: intel-gpu-overl Tainted: G        W  OE 3.15.0-rc3+ #96
      [ 1524.757840] Hardware name: Dell Inc. Inspiron 1090/Inspiron 1090, BIOS A06 08/23/2011
      [ 1524.757855] task: f52f36c0 ti: f4cbc000 task.ti: f4cbc000
      [ 1524.757869] EIP: 0060:[<c1406982>] EFLAGS: 00210202 CPU: 3
      [ 1524.757884] EIP is at per_file_stats+0x12/0x100
      [ 1524.757896] EAX: 0000002d EBX: 00000000 ECX: f4cbdefc EDX: f53af700
      [ 1524.757909] ESI: c1406970 EDI: f53af700 EBP: f4cbde6c ESP: f4cbde5c
      [ 1524.757922]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      [ 1524.757934] CR0: 80050033 CR2: f53af748 CR3: 356af000 CR4: 000007f0
      [ 1524.757945] Stack:
      [ 1524.757957]  f4cbdefc 00000000 c1406970 f53af700 f4cbdea8 c12e5f15 f4cbdefc c1406970
      [ 1524.757993]  0000ffff f4cbde90 0000002d f5dc5cd0 e4e80438 c1181d59 f4cbded8 f4d89900
      [ 1524.758027]  f5631b40 e5131074 c1903f37 f4cbdf28 c14068e6 f52648a0 c1927748 c1903f37
      [ 1524.758062] Call Trace:
      [ 1524.758084]  [<c1406970>] ? i915_gem_object_info+0x510/0x510
      [ 1524.758106]  [<c12e5f15>] idr_for_each+0xa5/0x100
      [ 1524.758126]  [<c1406970>] ? i915_gem_object_info+0x510/0x510
      [ 1524.758148]  [<c1181d59>] ? seq_vprintf+0x29/0x50
      [ 1524.758168]  [<c14068e6>] i915_gem_object_info+0x486/0x510
      [ 1524.758189]  [<c11823a6>] seq_read+0xd6/0x380
      [ 1524.758208]  [<c116d11d>] ? final_putname+0x1d/0x40
      [ 1524.758227]  [<c11822d0>] ? seq_hlist_next_percpu+0x90/0x90
      [ 1524.758246]  [<c1163e52>] vfs_read+0x82/0x150
      [ 1524.758265]  [<c11645d6>] SyS_read+0x46/0x90
      [ 1524.758285]  [<c16b8d8c>] sysenter_do_call+0x12/0x22
      [ 1524.758298] Code: f5 8f 2a 00 83 c4 6c 31 c0 5b 5e 5f 5d c3 8d 74 26 00 8d bc 27 00 00 00 00 55 89 e5 57 56 53 83 ec 04 3e 8d 74 26 00 83 41 04 01 <8b> 42 48 01 41 08 8b 42 4c 89 d7 85 c0 75 07 8b 42 60 85 c0 74
      [ 1524.758461] EIP: [<c1406982>] per_file_stats+0x12/0x100 SS:ESP 0068:f4cbde5c
      [ 1524.758485] CR2: 00000000f53af748
      Reported-by: default avatarSam Jansen <sam.jansen@starleaf.com>
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Sam Jansen <sam.jansen@starleaf.com>
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      5b5ffff0
    • Rodrigo Vivi's avatar
      drm/i915: BDW: Adding Reserved PCI IDs. · fb7023e0
      Rodrigo Vivi authored
      These PCI IDs are reserved on BSpec and can be used at any time in the future.
      So let's add this now in order to avoid issues that we already faced on previous
      platforms, like finding out about new ids when user reported accelaration weren't
      enabled.
      
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      fb7023e0
    • Chris Wilson's avatar
      drm/i915: Only mark the ctx as initialised after a SET_CONTEXT operation · 967ab6b1
      Chris Wilson authored
      Fallout from
      
      commit 46470fc9
      Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
      Date:   Wed May 21 19:01:06 2014 +0300
      
          drm/i915: Add null state batch to active list
      
      undid the earlier fix of only marking the ctx as initialised after it is
      saved by the hardware during a SET_CONTEXT operation:
      
      commit ad1d2199
      Author: Ben Widawsky <benjamin.widawsky@intel.com>
      Date:   Sat Dec 28 13:31:49 2013 -0800
      
          drm/i915: set ctx->initialized only after RCS
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Damien Lespiau <damien.lespiau@intel.com>
      Cc: Mika Kuoppala <mika.kuoppala@intel.com>
      Cc: Ben Widawsky <ben@bwidawsk.net>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
      [Jani: add reference to the earlier fix in the commit messsage.]
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      967ab6b1
    • Rahul Sharma's avatar
      drm/exynos: stop mixer before gating clocks during poweroff · 381be025
      Rahul Sharma authored
      Mixer should be power gated only after it is gracefully stopped.
      The recommended sequence is to Stop the mixer and wait till
      it enters to IDLE state before gating the clocks and power to
      the mixer.
      Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      381be025
    • Rahul Sharma's avatar
      drm/exynos: set power state variable after enabling clocks and power · b4bfa3c7
      Rahul Sharma authored
      Power state variable holds the state of the mixer device.
      Power on and power off functions are toggling these variable
      at wrong place.
      
      State variable should be changed to true only after Runtime
      PM and clocks are enabled. Else it may result to a situation
      where mixer registers are accessed with device power enabled.
      Similar logic for poweroff sequence.
      Signed-off-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      b4bfa3c7
    • Andrzej Hajda's avatar
      drm/exynos: disable unused windows on apply · d9b68d89
      Andrzej Hajda authored
      The patch disables non-enabled HW windows on applying
      configuration, it will allow to clear windows enabled
      by bootloader.
      Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d9b68d89
    • Sachin Kamat's avatar
      drm/exynos: Fix de-registration ordering · 0013fc9e
      Sachin Kamat authored
      'exynos_drm_pdev' was not getting unregistered if platform_driver_register()
      failed. Fix the ordering to allow this. This also fixes the below warning by
      moving the #endif macro. While at it also fix the ordering in the exit function
      so that de-registration happens in opposite order of registration.
      drivers/gpu/drm/exynos/exynos_drm_drv.c:768:1: warning: label
      'err_unregister_pd' defined but not used [-Wunused-label]
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      0013fc9e
    • Dan Carpenter's avatar
      drm/exynos: change zero to NULL for sparse · dcdffeda
      Dan Carpenter authored
      We recently changed this function to return a pointer instead of an int
      so we need to change this zero to a NULL or Sparse complains:
      
      	drivers/gpu/drm/exynos/exynos_drm_drv.h:346:47:
      	warning: Using plain integer as NULL pointer
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      dcdffeda
    • Tomasz Figa's avatar
      drm/exynos: dpi: Fix NULL pointer dereference with legacy bindings · aaa51b13
      Tomasz Figa authored
      If there is no panel node in DT and instead display timings are provided
      directly in FIMD node, there is no panel object created and ctx->panel
      becomes NULL. However during Exynos DRM initialization
      drm_helper_hpd_irq_event() is called, which in turns calls
      exynos_dpi_detect(), which dereferences ctx->panel without a check,
      causing a NULL pointer derefrence.
      
      This patch fixes the issue by adding necessary NULL pointer check.
      Signed-off-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
      Reviewed-by: default avatarJingoo Han <jg1.han@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      aaa51b13
    • Inki Dae's avatar
      drm/exynos: hdmi: fix power order issue · 245f98f2
      Inki Dae authored
      This patch resolves page fault issue of Mixer when disabled.
      
      The SFRs of VP and Mixer are updated by Vertical Sync of Timing
      generator which is a part of HDMI so the sequence to disable TV
      Subsystem should be as following:
      	VP -> Mixer -> HDMI
      
      For this, this patch disables Mixer and VP (if used) prior to
      disabling HDMI.
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      245f98f2
  5. 23 Jun, 2014 2 commits
  6. 22 Jun, 2014 11 commits
    • Stephane Viau's avatar
      drm/msm: fix IOMMU cleanup for -EPROBE_DEFER · 87e956e9
      Stephane Viau authored
      If probe fails after IOMMU is attached, we need to detach in order to
      clean up properly.  Before this change, IOMMU faults would occur if the
      probe failed (-EPROBE_DEFER).
      Signed-off-by: default avatarStephane Viau <sviau@codeaurora.org>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      87e956e9
    • Fabian Frederick's avatar
      drm/msm: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE) · cf3198c2
      Fabian Frederick authored
      use mm.h definition
      
      Cc: David Airlie <airlied@linux.ie>
      Cc: Rob Clark <robdclark@gmail.com>
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      cf3198c2
    • Stephane Viau's avatar
      drm/msm/hdmi: set hdp clock rate before prepare_enable · b77f47e7
      Stephane Viau authored
      The clock driver usually complains when a clock is being prepared
      before setting its rate. It is the case here for "core_clk" which
      needs to be set at 19.2 MHz before we attempt a prepare_enable().
      Signed-off-by: default avatarStephane Viau <sviau@codeaurora.org>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      b77f47e7
    • Peter Griffin's avatar
      drm/msm: storage class should be before const qualifier · 370a4d8a
      Peter Griffin authored
      The C99 specification states in section 6.11.5:
      
      The placement of a storage-class specifier other than at the beginning
      of the declaration specifiers in a declaration is an obsolescent
      feature.
      Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
      Cc: David Airlie <airlied@linux.ie>
      Cc: dri-devel@lists.freedesktop.org
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      370a4d8a
    • Matwey V. Kornilov's avatar
      drm/msm: Replace type of paddr to uint32_t. · 2557e2d7
      Matwey V. Kornilov authored
      This patch helps to avoid the following build issue:
      
      drivers/gpu/drm/msm/msm_fbdev.c:108:2: error: passing argument 3 of 'msm_gem_get_iova_locked' from incompatible pointer type [-Werror]
         msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
         ^
      In file included from drivers/gpu/drm/msm/msm_fbdev.c:18:0:
      drivers/gpu/drm/msm/msm_drv.h:153:5: note: expected 'uint32_t *' but argument is of type 'dma_addr_t *'
        int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
            ^
      Signed-off-by: default avatarMatwey V. Kornilov <matwey@sai.msu.ru>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      2557e2d7
    • Linus Torvalds's avatar
      Linux 3.16-rc2 · a497c3ba
      Linus Torvalds authored
      a497c3ba
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 8f5d2708
      Linus Torvalds authored
      Pull i2c new drivers from Wolfram Sang:
       "Here is a pull request from i2c hoping for the "new driver" rule.
      
        Originally, I wanted to send this request during the merge window, but
        code checkers with very recent additions complained, so a few fixups
        were needed.  So, some more time went by and I merged rc1 to get a
        stable base"
      
      So the "new driver" rule is really about drivers that people absolutely
      need for the kernel to work on new hardware, which is not so much the
      case for i2c.  So I considered not pulling this, but eventually
      relented.
      
      Just for FYI: the whole (and only) point of "new drivers" is not that
      new drivers cannot regress things (they can, and they have - by
      triggering badly tested code on machines that never triggered that code
      before), but because they can bring to life machines that otherwise
      wouldn't be useful at all without the drivers.
      
      So the new driver rule is for essential things that actual consumers
      would care about, ie devices like networking or disk drivers that matter
      to normal people (not server people - they run old kernels anyway, so
      mainlining new drivers is irrelevant for them).
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: sun6-p2wi: fix call to snprintf
        i2c: rk3x: add NULL entry to the end of_device_id array
        i2c: sun6i-p2wi: use proper return value in probe
        i2c: sunxi: add P2WI (Push/Pull 2 Wire Interface) controller support
        i2c: sunxi: add P2WI DT bindings documentation
        i2c: rk3x: add driver for Rockchip RK3xxx SoC I2C adapter
      8f5d2708
    • Linus Torvalds's avatar
      Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux · 2dfded82
      Linus Torvalds authored
      Pull file locking fixes from Jeff Layton:
       "File locking related bugfixes
      
        Nothing too earth-shattering here.  A fix for a potential regression
        due to a patch in pile #1, and the addition of a memory barrier to
        prevent a race condition between break_deleg and generic_add_lease"
      
      * tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux:
        locks: set fl_owner for leases back to current->files
        locks: add missing memory barrier in break_deleg
      2dfded82
    • Linus Torvalds's avatar
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 532f5138
      Linus Torvalds authored
      Pull kbuild fixes from Michal Marek:
       "There are three fixes for regressions caused by the relative paths
        series: deb-pkg, tar-pkg and *docs did not work with O=.
      
        Plus, there is a fix for the linux-headers deb package and a fixed
        typo.  These are not regression fixes but are safe enough"
      
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: fix a typo in a kbuild document
        builddeb: fix missing headers in linux-headers package
        Documentation: Fix DocBook build with relative $(srctree)
        kbuild: Fix tar-pkg with relative $(objtree)
        deb-pkg: Fix for relative paths
      532f5138
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · e13d100b
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "This fixes some lockups in btrfs reported with rc1.  It probably has
        some performance impact because it is backing off our spinning locks
        more often and switching to a blocking lock.  I'll be able to nail
        that down next week, but for now I want to get the lockups taken care
        of.
      
        Otherwise some more stack reduction and assorted fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix wrong error handle when the device is missing or is not writeable
        Btrfs: fix deadlock when mounting a degraded fs
        Btrfs: use bio_endio_nodec instead of open code
        Btrfs: fix NULL pointer crash when running balance and scrub concurrently
        btrfs: Skip scrubbing removed chunks to avoid -ENOENT.
        Btrfs: fix broken free space cache after the system crashed
        Btrfs: make free space cache write out functions more readable
        Btrfs: remove unused wait queue in struct extent_buffer
        Btrfs: fix deadlocks with trylock on tree nodes
      e13d100b
    • Linus Torvalds's avatar
      Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux · 147f1404
      Linus Torvalds authored
      Pull nfsd bugfixes from Bruce Fields:
       "Fixes for a new regression from the xdr encoding rewrite, and a
        delegation problem we've had for a while (made somewhat more annoying
        by the vfs delegation support added in 3.13)"
      
      * 'for-3.16' of git://linux-nfs.org/~bfields/linux:
        NFSD: fix bug for readdir of pseudofs
        NFSD: Don't hand out delegations for 30 seconds after recalling them.
      147f1404
  7. 21 Jun, 2014 7 commits
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 401c58fc
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "This is larger than usual: the main reason are the ARM symbol lookup
        speedups that came in late and were hard to resist.
      
        There's also a kprobes fix and various tooling fixes, plus the minimal
        re-enablement of the mmap2 support interface"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        x86/kprobes: Fix build errors and blacklist context_track_user
        perf tests: Add test for closing dso objects on EMFILE error
        perf tests: Add test for caching dso file descriptors
        perf tests: Allow reuse of test_file function
        perf tests: Spawn child for each test
        perf tools: Add dso__data_* interface descriptons
        perf tools: Allow to close dso fd in case of open failure
        perf tools: Add file size check and factor dso__data_read_offset
        perf tools: Cache dso data file descriptor
        perf tools: Add global count of opened dso objects
        perf tools: Add global list of opened dso objects
        perf tools: Add data_fd into dso object
        perf tools: Separate dso data related variables
        perf tools: Cache register accesses for unwind processing
        perf record: Fix to honor user freq/interval properly
        perf timechart: Reflow documentation
        perf probe: Improve error messages in --line option
        perf probe: Improve an error message of perf probe --vars mode
        perf probe: Show error code and description in verbose mode
        perf probe: Improve error message for unknown member of data structure
        ...
      401c58fc
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus.patch' of... · 7b08d618
      Linus Torvalds authored
      Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull rtmutex fixes from Thomas Gleixner:
       "Another three patches to make the rtmutex code more robust.  That's
        the last urgent fallout from the big futex/rtmutex investigation"
      
      * 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rtmutex: Plug slow unlock race
        rtmutex: Detect changes in the pi lock chain
        rtmutex: Handle deadlock detection smarter
      7b08d618
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 7a8e9c80
      Linus Torvalds authored
      Pull s390 patches from Martin Schwidefsky:
       "A couple of bug fixes, a debug change for qdio, an update for the
        default config, and one small extension.
      
        The watchdog module based on diagnose 0x288 is converted to the
        watchdog API and it now works under LPAR as well"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/ccwgroup: use ccwgroup_ungroup wrapper
        s390/ccwgroup: fix an uninitialized return code
        s390/ccwgroup: obtain extra reference for asynchronous processing
        qdio: Keep device-specific dbf entries
        s390/compat: correct ucontext layout for high gprs
        s390/cio: set device name as early as possible
        s390: update default configuration
        s390: avoid format strings leaking into names
        s390/airq: silence lockdep warning
        s390/watchdog: add support for LPAR operation (diag288)
        s390/watchdog: use watchdog API
        s390/sclp_vt220: Enable ASCII console per default
        s390/qdio: replace shift loop by ilog2
        s390/cio: silence lockdep warning
        s390/uaccess: always load the kernel ASCE after task switch
        s390/ap_bus: Make modules parameters visible in sysfs
      7a8e9c80
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/gxt/linux · f1b35b83
      Linus Torvalds authored
      Pull UniCore32 bug fixes from Guan Xuetao:
       "This includes bugfixes to make unicore32 successfully build under
        defconfig, and some changes for allmodconfig (though not finished)"
      
      * tag 'for-linus' of git://github.com/gxt/linux:
        unicore32: Remove ARCH_HAS_CPUFREQ config option
        UniCore32: Change git tree location information in MAINTAINERS
        arch: unicore32: ksyms: export '__cpuc_coherent_kern_range' to avoid compiling failure
        arch: unicore32: ksyms: export 'pm_power_off' to avoid compiling failure.
        arch: unicore32: ksyms: export additional find_first_*() to avoid compiling failure
        arch:unicore32:mm: add devmem_is_allowed() to support STRICT_DEVMEM
        unicore32: include: asm: add missing ')' for PAGE_* macros in pgtable.h
        arch/unicore32/kernel/setup.c: add generic 'screen_info' to avoid compiling failure
        drivers: scsi: mvsas: fix compiling issue by adding 'MVS_' for "enum pci_interrupt_cause"
        arch: unicore32: kernel: ksyms: remove 'bswapsi2' and 'muldi3' to avoid compiling failure
        arch/unicore32/kernel/ksyms.c: remove 2 export symbols to avoid compiling failure
        drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0
        drivers/rtc/rtc-puv3.c: use dev_dbg() instead of dev_debug() for typo issue
        arch/unicore32/include/asm/io.h: add readl_relaxed() generic definition
        arch/unicore32/include/asm/ptrace.h: add generic definition for profile_pc()
        arch/unicore32/mm/alignment.c: include "asm/pgtable.h" to avoid compiling error
        arch/unicore32/kernel/clock.c: add readl() and writel() for 'PM_' macros
        arch/unicore32/kernel/module.c: use __vmalloc_node_range() instead of __vmalloc_area()
        arch/unicore32/kernel/ksyms.c: remove several undefined exported symbols
      f1b35b83
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 60761c10
      Linus Torvalds authored
      Pull char / misc driver fixes from Greg KH:
       "Here are 3 patches, one a revert of the UIO patch you objected to in
        3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
        MAINTAINERS update for the vmware balloon driver.
      
        All of these, except for the MAINTAINERS update which just got added,
        have been in linux-next just fine"
      
      * tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        MAINTAINERS: add entry for VMware Balloon driver
        w1: mxc_w1: Fix incorrect "presence" status
        Revert "uio: fix vma io range check in mmap"
      60761c10
    • Linus Torvalds's avatar
      Merge tag 'staging-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · e6934ab4
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are a few fixes for staging and iio drivers that resolve issues
        reported in 3.16-rc1.
      
        All have been in linux-next just fine"
      
      * tag 'staging-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        imx-drm: parallel-display: Fix DPMS default state.
        staging: android: timed_output: fix use after free of dev
        staging: comedi: addi_apci_1564: add addi_watchdog dependency
        staging: rtl8723au: Reference correct firmwarefiles with MODULE_FIRMWARE()
        staging: rtl8723au: Request correct firmware file for A-cut parts
        iio: adc: checking for NULL instead of IS_ERR() in probe
        iio: adc: at91: signedness bug in at91_adc_get_trigger_value_by_name()
        iio: mxs-lradc: fix divider
        iio: Fix endianness issue in ak8975_read_axis()
        staging/iio: IIO_SIMPLE_DUMMY_BUFFER neds IIO_BUFFER
        twl4030-madc: Request processed values in twl4030_get_madc_conversion
        staging: iio: tsl2x7x_core: fix proximity treshold
        iio: Fix two mpl3115 issues in measurement conversion
        iio: hid-sensors: Get feature report from sensor hub after changing power state
      e6934ab4
    • Linus Torvalds's avatar
      Merge tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · c3cb500e
      Linus Torvalds authored
      Pull tty/serial bugfixes from Greg KH:
       "Here are some tty / serial driver bugfixes for 3.16-rc2 that resolve
        some reported issues.  The samsung driver build error itself has been
        reported by a bunch of people, sorry about that one.  The others are
        all tiny and everyone seems to like them in linux-next so far"
      
      * tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty/serial: fix 8250 early console option passing to regular console
        tty: Correct INPCK handling
        serial: Fix IGNBRK handling
        serial: samsung: Fix build error
      c3cb500e