1. 20 Apr, 2017 33 commits
  2. 16 Apr, 2017 7 commits
    • Linus Torvalds's avatar
      Linux 4.11-rc7 · 4f7d029b
      Linus Torvalds authored
      4f7d029b
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7395ca0f
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Again, a batch that's been sitting a couple of weeks, mostly because
        I anticipated a bit more material but it didn't show up -- which is
        good.
      
        These are all your garden variety fixes for ARM platforms.
      
        The most visible issue fixed here is probably the SMP reset issue on
        OMAP, the rest are minor stuff"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: allwinner: a64: add pmu0 regs for USB PHY
        ARM: OMAP2+: omap_device: Sync omap_device and pm_runtime after probe defer
        reset: add exported __reset_control_get, return NULL if optional
        ARM: orion5x: only call into phylib when available
        ARM: omap2+: Revert omap-smp.c changes resetting CPU1 during boot
        ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend
        ARM: dts: ti: fix PCI bus dtc warnings
        ARM: dts: am335x-baltos: disable EEE for Atheros 8035 PHY
        ARM: dts: OMAP3: Fix MFG ID EEPROM
        ARM: sun8i: a33: add operating-points-v2 property to all nodes
        ARM: sun8i: a33: remove highest OPP to fix CPU crashes
      7395ca0f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · a86f106f
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "Four small fixes.
      
        Three of them fix the same error in NVMe, in loop, fc, and rdma
        respectively.  The last fix from Ming fixes a regression in this
        series, where our bvec gap logic was wrong and causes an oops on
        NVMe for certain conditions"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: fix bio_will_gap() for first bvec with offset
        nvme-fc: Fix sqsize wrong assignment based on ctrl MQES capability
        nvme-rdma: Fix sqsize wrong assignment based on ctrl MQES capability
        nvme-loop: Fix sqsize wrong assignment based on ctrl MQES capability
      a86f106f
    • Olof Johansson's avatar
      Merge tag 'omap-for-v4.11/fixes-rc6-signed' of... · e2647b6d
      Olof Johansson authored
      Merge tag 'omap-for-v4.11/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Regression fix for omap interconnect code for deferred probe.
      Without this fix we can get PM related warnings for devices that
      use deferred probe. If necessary, this fix can wait for the
      v4.12 merge window no problem.
      
      * tag 'omap-for-v4.11/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: omap_device: Sync omap_device and pm_runtime after probe defer
        ARM: omap2+: Revert omap-smp.c changes resetting CPU1 during boot
        ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend
        ARM: dts: ti: fix PCI bus dtc warnings
        ARM: dts: am335x-baltos: disable EEE for Atheros 8035 PHY
        ARM: dts: OMAP3: Fix MFG ID EEPROM
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      e2647b6d
    • Linus Torvalds's avatar
      Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 11c994d9
      Linus Torvalds authored
      Pull cgroup fix from Tejun Heo:
       "Unfortunately, the commit to fix the cgroup mount race in the previous
        pull request can lead to hangs.
      
        The original bug has been around for a while and isn't too likely to
        be triggered in usual use cases. Revert the commit for now"
      
      * 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        Revert "cgroup: avoid attaching a cgroup root to two different superblocks"
      11c994d9
    • Linus Torvalds's avatar
      Merge tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 032aaf3f
      Linus Torvalds authored
      Pull tty fix from Greg KH:
       "Here is a single tty core revert for a patch that was reported to
        cause problems.
      
        The original issue is one that we have lived with for decades, so
        trying to scramble to fix the fix in time for 4.11-final does not make
        sense due to the fragility of the tty ldisc layer. Just reverting it
        makes sense for now"
      
      * tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "tty: don't panic on OOM in tty_set_ldisc()"
      032aaf3f
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.11-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 48538861
      Linus Torvalds authored
      Pull ftrace fix from Steven Rostedt:
       "While rewriting the function probe code, I stumbled over a long
        standing bug. This bug has been there sinc function tracing was added
        way back when. But my new development depends on this bug being fixed,
        and it should be fixed regardless as it causes ftrace to disable
        itself when triggered, and a reboot is required to enable it again.
      
        The bug is that the function probe does not disable itself properly if
        there's another probe of its type still enabled. For example:
      
           # cd /sys/kernel/debug/tracing
           # echo schedule:traceoff > set_ftrace_filter
           # echo do_IRQ:traceoff > set_ftrace_filter
           # echo \!do_IRQ:traceoff > /debug/tracing/set_ftrace_filter
           # echo do_IRQ:traceoff > set_ftrace_filter
      
        The above registers two traceoff probes (one for schedule and one for
        do_IRQ, and then removes do_IRQ.
      
        But since there still exists one for schedule, it is not done
        properly. When adding do_IRQ back, the breakage in the accounting is
        noticed by the ftrace self tests, and it causes a warning and disables
        ftrace"
      
      * tag 'trace-v4.11-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix removing of second function probe
      48538861