1. 22 12月, 2016 5 次提交
    • L
      splice: reinstate SIGPIPE/EPIPE handling · 52bce911
      Linus Torvalds 提交于
      Commit 8924feff ("splice: lift pipe_lock out of splice_to_pipe()")
      caused a regression when there were no more readers left on a pipe that
      was being spliced into: rather than the expected SIGPIPE and -EPIPE
      return value, the writer would end up waiting forever for space to free
      up (which obviously was not going to happen with no readers around).
      
      Fixes: 8924feff ("splice: lift pipe_lock out of splice_to_pipe()")
      Reported-and-tested-by: NAndreas Schwab <schwab@linux-m68k.org>
      Debugged-by: NAl Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org   # v4.9
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      52bce911
    • L
      Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 0c961c55
      Linus Torvalds 提交于
      Pull parisc updates from Helge Deller:
      
       - add Kernel address space layout randomization support
      
       - re-enable interrupts earlier now that we have a working IRQ stack
      
       - optimize the timer interrupt function to better cope with missed
         timer irqs
      
       - fix error return code in parisc perf code (by Dan Carpenter)
      
       - fix PAT debug code
      
      * 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Optimize timer interrupt function
        parisc: perf: return -EFAULT on error
        parisc: Enhance CPU detection code on PAT machines
        parisc: Re-enable interrupts early
        parisc: Enable KASLR
      0c961c55
    • L
      Merge tag 'nfs-for-4.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · bc1ecd62
      Linus Torvalds 提交于
      Pull more NFS client updates from Trond Myklebust:
       "Highlights include:
      
         - further attribute cache improvements to make revalidation more fine
           grained
      
         - NFSv4 locking improvements
      
        Bugfixes:
      
         - nfs4_fl_prepare_ds must be careful about reporting success in files
           layout
      
         - pNFS/flexfiles: Instead of marking a device inactive, remove it
           from the cache"
      
      * tag 'nfs-for-4.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFSv4: Retry the DELEGRETURN if the embedded GETATTR is rejected with EACCES
        NFS: Retry the CLOSE if the embedded GETATTR is rejected with EACCES
        NFSv4: Place the GETATTR operation before the CLOSE
        NFSv4: Also ask for attributes when downgrading to a READ-only state
        NFS: Don't abuse NFS_INO_REVAL_FORCED in nfs_post_op_update_inode_locked()
        pNFS: Return RW layouts on OPEN_DOWNGRADE
        NFSv4: Add encode/decode of the layoutreturn op in OPEN_DOWNGRADE
        NFS: Don't disconnect open-owner on NFS4ERR_BAD_SEQID
        NFSv4: ensure __nfs4_find_lock_state returns consistent result.
        NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
        pNFS/flexfiles: delete deviceid, don't mark inactive
        NFS: Clean up nfs_attribute_timeout()
        NFS: Remove unused function nfs_revalidate_inode_rcu()
        NFS: Fix and clean up the access cache validity checking
        NFS: Only look at the change attribute cache state in nfs_weak_revalidate()
        NFS: Clean up cache validity checking
        NFS: Don't revalidate the file on close if we hold a delegation
        NFSv4: Don't discard the attributes returned by asynchronous DELEGRETURN
        NFSv4: Update the attribute cache info in update_changeattr
      bc1ecd62
    • L
      Merge branch 'scsi-target-for-v4.10' of... · d5db84a8
      Linus Torvalds 提交于
      Merge branch 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux
      
      Pull scsi target cleanups from Bart Van Assche:
       "The changes here are:
      
         - a few small bug fixes for the iSCSI and user space target drivers.
      
         - minimize the target build time by about 30% by rearranging #include
           directives
      
         - fix the second argument passed to percpu_ida_alloc()
      
         - reduce the number of false positive warnings reported by sparse
      
        These patches pass Wu Fengguang's build bot tests and also the
        linux-next tests"
      
      * 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux:
        iscsi-target: Return error if unable to add network portal
        target: Fix spelling mistake and unwrap multi-line text
        target/iscsi: Fix double free in lio_target_tiqn_addtpg()
        target/user: Fix use-after-free of tcmu_cmds if they are expired
        target: Minimize #include directives
        target/user: Add an #include directive
        cxgbit: Add an #include directive
        ibmvscsi_tgt: Add two #include directives
        sbp-target: Add an #include directive
        qla2xxx: Add an #include directive
        configfs: Minimize #include directives
        usb: gadget: Fix second argument of percpu_ida_alloc()
        sbp-target: Fix second argument of percpu_ida_alloc()
        target/user: Fix a data type in tcmu_queue_cmd()
        target: Use NULL instead of 0 to represent a pointer
      d5db84a8
    • T
      Revert "ALSA: usb-audio: Fix race at stopping the stream" · f8114f85
      Takashi Iwai 提交于
      This reverts commit 16200948.
      
      The commit was intended to cover the race condition, but it introduced
      yet another regression for devices with the implicit feedback, leading
      to a kernel panic due to NULL-dereference in an irq context.
      
      As the race condition that was addressed by the commit is very rare
      and the regression is much worse, let's revert the commit for rc1, and
      fix the issue properly in a later patch.
      
      Fixes: 16200948 ("ALSA: usb-audio: Fix race at stopping the stream")
      Reported-by: NIoan-Adrian Ratiu <adi@adirat.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f8114f85
  2. 21 12月, 2016 35 次提交