1. 16 10月, 2015 4 次提交
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 58bd6e06
      Linus Torvalds 提交于
      Pull rdma updates from Doug Ledford:
       "We have four batched up patches for the current rc kernel.
      
        Two of them are small fixes that are obvious.
      
        One of them is larger than I would like for a late stage rc pull, but
        we found an issue in the namespace lookup code related to RoCE and
        this works around the issue for now (we allow a lookup with a
        namespace to succeed on RoCE since RoCE namespaces aren't implemented
        yet).  This will go away in 4.4 when we put in support for namespaces
        in RoCE devices.
      
        The last one is large in terms of lines, but is all legal and no
        functional changes.  Cisco needed to update their files to be more
        specific about their license.  They had intended the files to be dual
        licensed as GPL/BSD all along, and specified that in their module
        license tag, but their file headers were not up to par.  They
        contacted all of the contributors to get agreement and then submitted
        a patch to update the license headers in the files.
      
        Summary:
      
         - Work around connection namespace lookup bug related to RoCE
      
         - Change usnic license to Dual GPL/BSD (was intended to be that way
           all along, but wasn't clear, permission from contributors was
           chased down)
      
         - Fix an issue between NFSoRDMA and mlx5 that could cause an oops
      
         - Fix leak of sendonly multicast groups"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        IB/ipoib: For sendonly join free the multicast group on leave
        IB/cma: Accept connection without a valid netdev on RoCE
        xprtrdma: Don't require LOCAL_DMA_LKEY support for fastreg
        usnic: add missing clauses to BSD license
      58bd6e06
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · c7823b6b
      Linus Torvalds 提交于
      Pull ext4 Kconfig description fixup from Jan Kara:
       "A small fixup in description of EXT4_USE_FOR_EXT2 config option"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext4: Update EXT4_USE_FOR_EXT2 description
      c7823b6b
    • L
      vmstat: explicitly schedule per-cpu work on the CPU we need it to run on · 176bed1d
      Linus Torvalds 提交于
      The vmstat code uses "schedule_delayed_work_on()" to do the initial
      startup of the delayed work on the right CPU, but then once it was
      started it would use the non-cpu-specific "schedule_delayed_work()" to
      re-schedule it on that CPU.
      
      That just happened to schedule it on the same CPU historically (well, in
      almost all situations), but the code _requires_ this work to be per-cpu,
      and should say so explicitly rather than depend on the non-cpu-specific
      scheduling to schedule on the current CPU.
      
      The timer code is being changed to not be as single-minded in always
      running things on the calling CPU.
      
      See also commit 874bbfe6 ("workqueue: make sure delayed work run in
      local cpu") that for now maintains the local CPU guarantees just in case
      there are other broken users that depended on the accidental behavior.
      
      Cc: Christoph Lameter <cl@linux.com>
      Cc: Tejun Heo <tj@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      176bed1d
    • L
      Merge branch 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 995e2fe9
      Linus Torvalds 提交于
      Pull workqueue fixlet from Tejun Heo:
       "Single patch to make delayed work always be queued on the local CPU"
      
      This is not actually something we should guarantee, but it's something
      we by accident have historically done, and at least one call site has
      grown to depend on it.
      
      I'm going to fix that known broken callsite, but in the meantime this
      makes the accidental behavior be explicit, just in case there are other
      cases that might depend on it.
      
      * 'for-4.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: make sure delayed work run in local cpu
      995e2fe9
  2. 15 10月, 2015 2 次提交
  3. 14 10月, 2015 11 次提交
  4. 13 10月, 2015 1 次提交
  5. 12 10月, 2015 14 次提交
  6. 11 10月, 2015 8 次提交