Skip to content
  1. Mar 04, 2017
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · e0d07225
      Linus Torvalds authored
      Pull block layer fixes from Jens Axboe:
       "A collection of fixes for this merge window, either fixes for existing
        issues, or parts that were waiting for acks to come in. This pull
        request contains:
      
         - Allocation of nvme queues on the right node from Shaohua.
      
           This was ready long before the merge window, but waiting on an ack
           from Bjorn on the PCI bit. Now that we have that, the three patches
           can go in.
      
         - Two fixes for blk-mq-sched with nvmeof, which uses hctx specific
           request allocations. This caused an oops. One part from Sagi, one
           part from Omar.
      
         - A loop partition scan deadlock fix from Omar, fixing a regression
           in this merge window.
      
         - A three-patch series from Keith, closing up a hole on clearing out
           requests on shutdown/resume.
      
         - A stable fix for nbd from Josef, fixing a leak of sockets.
      
         - Two fixes for a regression in this window from Jan, fixing a
           problem with one of his earlier patches dealing with queue vs bdi
           life times.
      
         - A fix for a regression with virtio-blk, causing an IO stall if
           scheduling is used. From me.
      
         - A fix for an io context lock ordering problem. From me"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: Move bdi_unregister() to del_gendisk()
        blk-mq: ensure that bd->last is always set correctly
        block: don't call ioc_exit_icq() with the queue lock held for blk-mq
        block: Initialize bd_bdi on inode initialization
        loop: fix LO_FLAGS_PARTSCAN hang
        nvme: Complete all stuck requests
        blk-mq: Provide freeze queue timeout
        blk-mq: Export blk_mq_freeze_queue_wait
        nbd: stop leaking sockets
        blk-mq: move update of tags->rqs to __blk_mq_alloc_request()
        blk-mq: kill blk_mq_set_alloc_data()
        blk-mq: make blk_mq_alloc_request_hctx() allocate a scheduler request
        blk-mq-sched: Allocate sched reserved tags as specified in the original queue tagset
        nvme: allocate nvme_queue in correct node
        PCI: add an API to get node from vector
        blk-mq: allocate blk_mq_tags and requests in correct node
      e0d07225
    • Linus Torvalds's avatar
      Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1827adb1
      Linus Torvalds authored
      Pull sched.h split-up from Ingo Molnar:
       "The point of these changes is to significantly reduce the
        <linux/sched.h> header footprint, to speed up the kernel build and to
        have a cleaner header structure.
      
        After these changes the new <linux/sched.h>'s typical preprocessed
        size goes down from a previous ~0.68 MB (~22K lines) to ~0.45 MB (~15K
        lines), which is around 40% faster to build on typical configs.
      
        Not much changed from the last version (-v2) posted three weeks ago: I
        eliminated quirks, backmerged fixes plus I rebased it to an upstream
        SHA1 from yesterday that includes most changes queued up in -next plus
        all sched.h changes that were pending from Andrew.
      
        I've re-tested the series both on x86 and on cross-arch defconfigs,
        and did a bisectability test at a number of random points.
      
        I tried to test as many build configurations as possible, but some
        build breakage is probably still left - but it should be mostly
        limited to architectures that have no cross-compiler binaries
        available on kernel.org, and non-default configurations"
      
      * 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (146 commits)
        sched/headers: Clean up <linux/sched.h>
        sched/headers: Remove #ifdefs from <linux/sched.h>
        sched/headers: Remove the <linux/topology.h> include from <linux/sched.h>
        sched/headers, hrtimer: Remove the <linux/wait.h> include from <linux/hrtimer.h>
        sched/headers, x86/apic: Remove the <linux/pm.h> header inclusion from <asm/apic.h>
        sched/headers, timers: Remove the <linux/sysctl.h> include from <linux/timer.h>
        sched/headers: Remove <linux/magic.h> from <linux/sched/task_stack.h>
        sched/headers: Remove <linux/sched.h> from <linux/sched/init.h>
        sched/core: Remove unused prefetch_stack()
        sched/headers: Remove <linux/rculist.h> from <linux/sched.h>
        sched/headers: Remove the 'init_pid_ns' prototype from <linux/sched.h>
        sched/headers: Remove <linux/signal.h> from <linux/sched.h>
        sched/headers: Remove <linux/rwsem.h> from <linux/sched.h>
        sched/headers: Remove the runqueue_is_locked() prototype
        sched/headers: Remove <linux/sched.h> from <linux/sched/hotplug.h>
        sched/headers: Remove <linux/sched.h> from <linux/sched/debug.h>
        sched/headers: Remove <linux/sched.h> from <linux/sched/nohz.h>
        sched/headers: Remove <linux/sched.h> from <linux/sched/stat.h>
        sched/headers: Remove the <linux/gfp.h> include from <linux/sched.h>
        sched/headers: Remove <linux/rtmutex.h> from <linux/sched.h>
        ...
      1827adb1
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.11-rc1-urgent_fix' of... · 78769912
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.11-rc1-urgent_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fix from Shuah Khan:
       "This update consists of an urgent fix for individual test build
        failures introduced in the 4.11-rc1 update"
      
      * tag 'linux-kselftest-4.11-rc1-urgent_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: lib.mk Fix individual test builds
      78769912
  2. Mar 03, 2017