1. 23 Oct, 2015 18 commits
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 9f30931a
      Linus Torvalds authored
      Merge fixes from Andrew Morton:
       "9 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put
        fault-inject: fix inverted interval/probability values in printk
        lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y
        mm: make sendfile(2) killable
        thp: use is_zero_pfn() only after pte_present() check
        mailmap: update Javier Martinez Canillas' email
        MAINTAINERS: add Sergey as zsmalloc reviewer
        mm: cma: fix incorrect type conversion for size during dma allocation
        kmod: don't run async usermode helper as a child of kworker thread
      9f30931a
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · a2c01ed5
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
      
       - Revert "Use the POWER8 Micro Partition Prefetch Engine in KVM HV on
         POWER8" from Paul
       - Handle irq_happened flag correctly in off-line loop from Paul
       - Validate rtas.entry before calling enter_rtas() from Vasant
      
      * tag 'powerpc-4.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/rtas: Validate rtas.entry before calling enter_rtas()
        powerpc/powernv: Handle irq_happened flag correctly in off-line loop
        powerpc: Revert "Use the POWER8 Micro Partition Prefetch Engine in KVM HV on POWER8"
      a2c01ed5
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d0ddf980
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "Most of the changes this time are for incorrect device nodes in
        various ways, on on imx, berlin, exynos, ux500, uniphier, omap and
        meson.
      
        Chen-Yu Tsai now co-maintains mach-sunxi (Allwinner).
      
        Other bug fixes include
         - a partial revert of a broken tegra gpio patch
         - irq affinity for arm ccn
         - suspend on one Armada 385 machine
         - enable ZONE_DMA to avoid an OMAP crash for over 2GB RAM
         - turning on a regulator on beagleboard-x15 for HDMI
         - making the omap gpmc debug code visible
         - setup of orion network switch
         - a rare build regression for pxa"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
        ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
        thermal: exynos: Fix register read in TMU
        ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
        ARM: tegra: Comment out gpio-ranges properties
        ARM: dts: uniphier: fix IRQ number for devices on PH1-LD6b ref board
        drivers/perf: arm_pmu: avoid CPU device_node reference leak
        bus: arm-ccn: Fix irq affinity setting on CPU migration
        bus: arm-ccn: Handle correctly no-more-cpus case
        ARM: mvebu: correct a385-db-ap compatible string
        ARM: meson6: DTS: Fix wrong reg mapping and IRQ numbers
        MAINTAINERS: Update Allwinner entry and add new maintainer
        ARM: ux500: modify initial levelshifter status
        ARM: pxa: fix pxa3xx DFI lockup hack
        Documentation: ARM: List new omap MMC requirements
        memory: omap-gpmc: dump "before" state before first modification
        memory: omap-gpmc: Fix unselectable debug option for GPMC
        ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
        ARM: dts: Fix audio card detection on Peach boards
        ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
        ARM: orion: Fix DSA platform device after mvmdio conversion
        ...
      d0ddf980
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 2c44f4f0
      Linus Torvalds authored
      Pull KVM bugfixes from Paolo Bonzini:
       "Bug fixes for ARM, mostly 4.3 regressions related to virtual interrupt
        controller changes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        arm/arm64: KVM: Fix disabled distributor operation
        arm/arm64: KVM: Clear map->active on pend/active clear
        arm/arm64: KVM: Fix arch timer behavior for disabled interrupts
        KVM: arm: use GIC support unconditionally
        KVM: arm/arm64: Fix memory leak if timer initialization fails
        KVM: arm/arm64: Do not inject spurious interrupts
      2c44f4f0
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v4.3-rc6' of... · 8a990fb4
      Linus Torvalds authored
      Merge tag 'trace-fixes-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Running tests on other changes, the system locked up due to lots of
        warnings.  It was caused by the stack tracer triggering a warning
        about using rcu_dereference() when RCU was not watching.  This can
        happen due to the fact that the stack tracer uses the function tracer
        to check each function, and there are functions that may be called and
        traced when RCU stopped watching.  Namely when a function is called
        just before going idle or to userspace and after RCU stopped watching
        that current CPU.
      
        The first patch makes sure that RCU is watching when the stack tracer
        uses RCU.  The second patch is to make sure that the stack tracer does
        not get called by functions in NMI, as it's not NMI safe"
      
      * tag 'trace-fixes-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Do not allow stack_tracer to record stack in NMI
        tracing: Have stack tracer force RCU to be watching
      8a990fb4
    • Linus Torvalds's avatar
      Merge tag 'sound-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0122835a
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "There is nothing to worry you much, only a few small & stable patches
        are found for usual stuff, HD-audio (a Lenovo laptop quirk, a fix for
        minor error handling) and ASoC (trivial fixes for RT298 and WM
        codecs).
      
        The only remaining major change is the fix for ASoC SX_TLV control
        that was overseen during refactoring, but the fix itself is trivial
        and safe"
      
      * tag 'sound-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: wm8962: mark cache_dirty flag after software reset in pm_resume
        ASoC: rt298: fix wrong setting of gpio2_en
        ASoC: wm8904: Correct number of EQ registers
        ALSA: hda - Fix deadlock at error in building PCM
        ASoC: Add info callback for SX_TLV controls
        ASoC: rt298: correct index default value
        ALSA: hda - Fix inverted internal mic on Lenovo G50-80
        ALSA: hdac: Explicitly add io.h
      0122835a
    • Linus Torvalds's avatar
      Merge tag 'media/v4.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 45d80f16
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "Some regression fixes and potential security issues:
      
         - netup_unidvb: fix potential crash when spi is NULL
         - rtl28xxu: fix control message flaws
         - m88ds3103: fix a regression on Kernel 4.2
         - c8sectpfe: fix some issues on this new driver
         - v4l2-flash-led-class: fix a Kbuild dependency
         - si2157 and si2158: check for array boundary when uploading firmware
           files
         - horus3a and lnbh25: fix some building troubles when some options
           aren't selected
         - ir-hix5hd2: drop the use of IRQF_NO_SUSPEND"
      
      * tag 'media/v4.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] m88ds3103: use own reg update_bits() implementation
        [media] rtl28xxu: fix control message flaws
        [media] v4l2-flash-led-class: Add missing VIDEO_V4L2 Kconfig dependency
        [media] netup_unidvb: fix potential crash when spi is NULL
        [media] si2168: Bounds check firmware
        [media] si2157: Bounds check firmware
        [media] ir-hix5hd2: drop the use of IRQF_NO_SUSPEND
        [media] c8sectpfe: fix return of garbage
        [media] c8sectpfe: fix ininitialized error return on firmware load failure
        [media] lnbh25: Fix lnbh25_attach() function return type
        [media] horus3a: Fix horus3a_attach() function parameters
      45d80f16
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · a67b20d2
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "I've been a bit slow gathering these:
      
         - drm/mst: one mutex leak in a fail path
      
         - radeon: two oops fixes, one dpm fix
      
         - i915: one messy set of fixes, where we revert the original fix, and
                 pull back the proper set of fixes from -next on top.
      
         - nouveau: one fix for an illegal buffer placement.
      
        Doesn't look too bad, hopefully shouldn't be too much more"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau/gem: return only valid domain when there's only one
        drm: fix mutex leak in drm_dp_get_mst_branch_device
        drm/amdgpu: add missing dpm check for KV dpm late init
        drm/amdgpu/dpm: don't add pwm attributes if DPM is disabled
        drm/radeon/dpm: don't add pwm attributes if DPM is disabled
        drm/i915: Add primary plane to mask if it's visible
        drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()
        drm/i915: Assign hwmode after encoder state readout
        Revert "drm/i915: Add primary plane to mask if it's visible"
        drm/i915: Deny wrapping an userptr into a framebuffer
        drm/i915: Enable DPLL VGA mode before P1/P2 divider write
        drm/i915: Restore lost DPLL register write on gen2-4
        drm/i915: Flush pipecontrol post-sync writes
        drm/i915: Fix kerneldoc for i915_gem_shrink_all
      a67b20d2
    • Joseph Qi's avatar
      ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put · b67de018
      Joseph Qi authored
      dlm_lockres_put will call dlm_lockres_release if it is the last
      reference, and then it may call dlm_print_one_lock_resource and
      take lockres spinlock.
      
      So unlock lockres spinlock before dlm_lockres_put to avoid deadlock.
      Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.com>
      Cc: Mark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b67de018
    • Florian Westphal's avatar
      fault-inject: fix inverted interval/probability values in printk · bb387002
      Florian Westphal authored
      interval displays the probability and vice versa.
      
      Fixes: 6adc4a22 ("fault-inject: add ratelimit option")
      Acked-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bb387002
    • Andrey Ryabinin's avatar
      lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y · 3f181b4d
      Andrey Ryabinin authored
      When the kernel compiled with KASAN=y, GCC adds redzones for each
      variable on stack.  This enlarges function's stack frame and causes:
      
      	'warning: the frame size of X bytes is larger than Y bytes'
      
      The worst case I've seen for now is following:
      
         ../net/wireless/nl80211.c: In function `nl80211_send_wiphy':
         ../net/wireless/nl80211.c:1731:1: warning: the frame size of 5448 bytes is larger than 2048 bytes [-Wframe-larger-than=]
      
      That kind of warning becomes useless with KASAN=y.  It doesn't
      necessarily indicate that there is some problem in the code, thus we
      should turn it off.
      
      (The KASAN=y stack size in increased from 16k to 32k for this reason)
      Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Acked-by: default avatarAbylay Ospan <aospan@netup.ru>
      Cc: Andi Kleen <andi@firstfloor.org>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
      Cc: Kozlov Sergey <serjk@netup.ru>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3f181b4d
    • Jan Kara's avatar
      mm: make sendfile(2) killable · 296291cd
      Jan Kara authored
      Currently a simple program below issues a sendfile(2) system call which
      takes about 62 days to complete in my test KVM instance.
      
              int fd;
              off_t off = 0;
      
              fd = open("file", O_RDWR | O_TRUNC | O_SYNC | O_CREAT, 0644);
              ftruncate(fd, 2);
              lseek(fd, 0, SEEK_END);
              sendfile(fd, fd, &off, 0xfffffff);
      
      Now you should not ask kernel to do a stupid stuff like copying 256MB in
      2-byte chunks and call fsync(2) after each chunk but if you do, sysadmin
      should have a way to stop you.
      
      We actually do have a check for fatal_signal_pending() in
      generic_perform_write() which triggers in this path however because we
      always succeed in writing something before the check is done, we return
      value > 0 from generic_perform_write() and thus the information about
      signal gets lost.
      
      Fix the problem by doing the signal check before writing anything.  That
      way generic_perform_write() returns -EINTR, the error gets propagated up
      and the sendfile loop terminates early.
      Signed-off-by: default avatarJan Kara <jack@suse.com>
      Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      296291cd
    • Minchan Kim's avatar
      thp: use is_zero_pfn() only after pte_present() check · 47aee4d8
      Minchan Kim authored
      Use is_zero_pfn() on pteval only after pte_present() check on pteval
      (It might be better idea to introduce is_zero_pte() which checks
      pte_present() first).
      
      Otherwise when working on a swap or migration entry and if pte_pfn's
      result is equal to zero_pfn by chance, we lose user's data in
      __collapse_huge_page_copy().  So if you're unlucky, the application
      segfaults and finally you could see below message on exit:
      
      BUG: Bad rss-counter state mm:ffff88007f099300 idx:2 val:3
      
      Fixes: ca0984ca ("mm: incorporate zero pages into transparent huge pages")
      Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
      Reviewed-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
      Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: <stable@vger.kernel.org>	[4.1+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      47aee4d8
    • Javier Martinez Canillas's avatar
      mailmap: update Javier Martinez Canillas' email · b8fa0efa
      Javier Martinez Canillas authored
      The get_maintainer script still reports my old Collabora email based on
      old commits but that address no longer exist so update mailmap to report
      my current email and avoid people sending to the old address.
      Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b8fa0efa
    • Sergey Senozhatsky's avatar
      MAINTAINERS: add Sergey as zsmalloc reviewer · 41192a2d
      Sergey Senozhatsky authored
      Nominate myself as a zsmalloc reviewer.
      Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Cc: Minchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      41192a2d
    • Rohit Vaswani's avatar
      mm: cma: fix incorrect type conversion for size during dma allocation · 67a2e213
      Rohit Vaswani authored
      This was found during userspace fuzzing test when a large size dma cma
      allocation is made by driver(like ion) through userspace.
      
        show_stack+0x10/0x1c
        dump_stack+0x74/0xc8
        kasan_report_error+0x2b0/0x408
        kasan_report+0x34/0x40
        __asan_storeN+0x15c/0x168
        memset+0x20/0x44
        __dma_alloc_coherent+0x114/0x18c
      Signed-off-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Marek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      67a2e213
    • Oleg Nesterov's avatar
      kmod: don't run async usermode helper as a child of kworker thread · 52116139
      Oleg Nesterov authored
      call_usermodehelper_exec_sync() does fork() + wait() with "unignored"
      SIGCHLD.  What we have missed is that this worker thread can have other
      children previously forked by call_usermodehelper_exec_work() without
      UMH_WAIT_PROC.  If such a child exits in between it becomes a zombie
      because auto-reaping only works if SIGCHLD is ignored, and nobody can
      reap it (unless/until this worker thread exits too).
      
      Change the !UMH_WAIT_PROC case to use CLONE_PARENT.
      
      Note: this is only first step.  All PF_KTHREAD tasks, even created by
      kernel_thread() should have ->parent == kthreadd by default.
      
      Fixes: bb304a5c ("kmod: handle UMH_WAIT_PROC from system unbound workqueue")
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Christoph Lameter <cl@linux.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      52116139
    • Takashi Iwai's avatar
      Merge tag 'asoc-fix-v4.3-rc6' of... · b9b6e4ac
      Takashi Iwai authored
      Merge tag 'asoc-fix-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v4.3
      
      A bunch of driver fixes plus one core fix which fixes problems with
      misreporting values from _SX controls following a recent refactoring.
      This had gone unnoticed as such controls are quite rare.
      b9b6e4ac
  2. 22 Oct, 2015 17 commits
  3. 21 Oct, 2015 5 commits