1. 04 1月, 2017 1 次提交
  2. 03 1月, 2017 3 次提交
  3. 23 12月, 2016 11 次提交
    • J
      Merge branch 'nvme-4.10' of git://git.infradead.org/nvme into for-linus · 8e5d31eb
      Jens Axboe 提交于
      Christoph writes:
      
      The most significant one is that we've agreed on shared maintaince and
      a common repository for the PCIe NVMe driver and NVMe over Fabrics.  The
      target code still only has a subset of the maintainers but goes through
      the same tree as well.  Keith, Sagi and me will take turns at collecting
      patches and sending you pull requests.
      8e5d31eb
    • J
      genhd: remove dead and duplicated scsi code · 72c5296f
      Jon Derrick 提交于
      blk_scsi_cmd_filter use was deprecated by 4beab5c6 and the SCSI macros
      are duplicated in blkdev.h, both likely reintroduced by a bad merge from
      540eed56.
      Signed-off-by: NJon Derrick <jonathan.derrick@intel.com>
      Reviewed-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@fb.com>
      72c5296f
    • C
      block: add back plugging in __blkdev_direct_IO · 64d656a1
      Christoph Hellwig 提交于
      This allows sending larger than 1 MB requests to devices that support
      large I/O sizes.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reported-by: NLaurence Oberman <loberman@redhat.com>
      Signed-off-by: NJens Axboe <axboe@fb.com>
      64d656a1
    • L
      Merge tag 'leds_for_4.10_email_update' of... · 50f6584e
      Linus Torvalds 提交于
      Merge tag 'leds_for_4.10_email_update' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
      
      Pull LED maintainer email update from Jacek Anaszewski:
       "Update Jacek Anaszewski's email address"
      
      * tag 'leds_for_4.10_email_update' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        MAINTAINERS: Update Jacek Anaszewski's email address
      50f6584e
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · af22941a
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "Just a set of small fixes that have either been queued up after the
        original pull for this merge window, or just missed the original pull
        request.
      
         - a few bcache fixes/changes from Eric and Kent
      
         - add WRITE_SAME to the command filter whitelist frm Mauricio
      
         - kill an unused struct member from Ritesh
      
         - partition IO alignment fix from Stefan
      
         - nvme sysfs printf fix from Stephen"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: check partition alignment
        nvme : Use correct scnprintf in cmb show
        block: allow WRITE_SAME commands with the SG_IO ioctl
        block: Remove unused member (busy) from struct blk_queue_tag
        bcache: partition support: add 16 minors per bcacheN device
        bcache: Make gc wakeup sane, remove set_task_state()
      af22941a
    • L
      Merge tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 9be962d5
      Linus Torvalds 提交于
      Pull more ACPI updates from Rafael Wysocki:
       "Here are new versions of two ACPICA changes that were deferred
        previously due to a problem they had introduced, two cleanups on top
        of them and the removal of a useless warning message from the ACPI
        core.
      
        Specifics:
      
         - Move some Linux-specific functionality to upstream ACPICA and
           update the in-kernel users of it accordingly (Lv Zheng)
      
         - Drop a useless warning (triggered by the lack of an optional
           object) from the ACPI namespace scanning code (Zhang Rui)"
      
      * tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / osl: Remove deprecated acpi_get_table_with_size()/early_acpi_os_unmap_memory()
        ACPI / osl: Remove acpi_get_table_with_size()/early_acpi_os_unmap_memory() users
        ACPICA: Tables: Allow FADT to be customized with virtual address
        ACPICA: Tables: Back port acpi_get_table_with_size() and early_acpi_os_unmap_memory() from Linux kernel
        ACPI: do not warn if _BQC does not exist
      9be962d5
    • L
      Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 85ba70b6
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "They fix one bug introduced recently, a build warning and a kerneldoc
        function description.
      
        Specifics:
      
         - Prevent the acpi-cpufreq driver from crashing on exit by fixing a
           check against the __cpuhp_setup_state() return value and fix the
           kerneldoc description of that function to make it clear that it may
           return positive numbers on success too (Boris Ostrovsky)
      
         - Drop an incorrect __init annotation of a function in the s3c64xx
           cpufreq driver and fix a build warning generated (by older
           compilers) because of it (Arnd Bergmann)"
      
      * tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: s3c64xx: remove incorrect __init annotation
        cpufreq: Remove CPU hotplug callbacks only if they were initialized
        CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
      85ba70b6
    • L
      Merge tag 'mmc-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 8d86cf88
      Linus Torvalds 提交于
      Pull MMC fixes from Ulf Hansson:
       "MMC core:
         - further fix thread wake-up for requests
         - use a bounce buffer to fix DMA issue for SSR register read
      
        MMC host:
         - sdhci: Fix a regression for runtime PM
         - sdhci-cadence: Add a proper SoC specific DT compatible"
      
      * tag 'mmc-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: sd: Meet alignment requirements for raw_ssr DMA
        mmc: core: Further fix thread wake-up
        mmc: sdhci: Fix to handle MMC_POWER_UNDEFINED
        mmc: sdhci-cadence: add Socionext UniPhier specific compatible string
      8d86cf88
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 67327145
      Linus Torvalds 提交于
      Pull SElinux fix from James Morris:
       "From Paul:
         'A small SELinux patch to fix some clang/llvm compiler warnings and
          ensure the tools under scripts work well in the face of kernel
          changes'"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        selinux: use the kernel headers when building scripts/selinux
      67327145
    • L
      Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · eb254f32
      Linus Torvalds 提交于
      Pull x86 cache allocation interface from Thomas Gleixner:
       "This provides support for Intel's Cache Allocation Technology, a cache
        partitioning mechanism.
      
        The interface is odd, but the hardware interface of that CAT stuff is
        odd as well.
      
        We tried hard to come up with an abstraction, but that only allows
        rather simple partitioning, but no way of sharing and dealing with the
        per package nature of this mechanism.
      
        In the end we decided to expose the allocation bitmaps directly so all
        combinations of the hardware can be utilized.
      
        There are two ways of associating a cache partition:
      
         - Task
      
           A task can be added to a resource group. It uses the cache
           partition associated to the group.
      
         - CPU
      
           All tasks which are not member of a resource group use the group to
           which the CPU they are running on is associated with.
      
           That allows for simple CPU based partitioning schemes.
      
        The main expected user sare:
      
         - Virtualization so a VM can only trash only the associated part of
           the cash w/o disturbing others
      
         - Real-Time systems to seperate RT and general workloads.
      
         - Latency sensitive enterprise workloads
      
         - In theory this also can be used to protect against cache side
           channel attacks"
      
      [ Intel RDT is "Resource Director Technology". The interface really is
        rather odd and very specific, which delayed this pull request while I
        was thinking about it. The pull request itself came in early during
        the merge window, I just delayed it until things had calmed down and I
        had more time.
      
        But people tell me they'll use this, and the good news is that it is
        _so_ specific that it's rather independent of anything else, and no
        user is going to depend on the interface since it's pretty rare. So if
        push comes to shove, we can just remove the interface and nothing will
        break ]
      
      * 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
        x86/intel_rdt: Implement show_options() for resctrlfs
        x86/intel_rdt: Call intel_rdt_sched_in() with preemption disabled
        x86/intel_rdt: Update task closid immediately on CPU in rmdir and unmount
        x86/intel_rdt: Fix setting of closid when adding CPUs to a group
        x86/intel_rdt: Update percpu closid immeditately on CPUs affected by changee
        x86/intel_rdt: Reset per cpu closids on unmount
        x86/intel_rdt: Select KERNFS when enabling INTEL_RDT_A
        x86/intel_rdt: Prevent deadlock against hotplug lock
        x86/intel_rdt: Protect info directory from removal
        x86/intel_rdt: Add info files to Documentation
        x86/intel_rdt: Export the minimum number of set mask bits in sysfs
        x86/intel_rdt: Propagate error in rdt_mount() properly
        x86/intel_rdt: Add a missing #include
        MAINTAINERS: Add maintainer for Intel RDT resource allocation
        x86/intel_rdt: Add scheduler hook
        x86/intel_rdt: Add schemata file
        x86/intel_rdt: Add tasks files
        x86/intel_rdt: Add cpus file
        x86/intel_rdt: Add mkdir to resctrl file system
        x86/intel_rdt: Add "info" files to resctrl file system
        ...
      eb254f32
    • J
      MAINTAINERS: Update Jacek Anaszewski's email address · 305335b9
      Jacek Anaszewski 提交于
      My previous email address is no longer valid.
      From now on, jacek.anaszewski@gmail.com should be used instead.
      Signed-off-by: NJacek Anaszewski <jacek.anaszewski@gmail.com>
      305335b9
  4. 22 12月, 2016 8 次提交
    • R
      Merge branch 'pm-cpufreq' · 7b99f1ae
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: s3c64xx: remove incorrect __init annotation
        cpufreq: Remove CPU hotplug callbacks only if they were initialized
        CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
      7b99f1ae
    • R
      Merge branches 'acpica' and 'acpi-scan' · c8e008e2
      Rafael J. Wysocki 提交于
      * acpica:
        ACPI / osl: Remove deprecated acpi_get_table_with_size()/early_acpi_os_unmap_memory()
        ACPI / osl: Remove acpi_get_table_with_size()/early_acpi_os_unmap_memory() users
        ACPICA: Tables: Allow FADT to be customized with virtual address
        ACPICA: Tables: Back port acpi_get_table_with_size() and early_acpi_os_unmap_memory() from Linux kernel
      
      * acpi-scan:
        ACPI: do not warn if _BQC does not exist
      c8e008e2
    • G
      CREDITS: Remove outdated address information · f79f7b1b
      Gertjan van Wingerde 提交于
      This address hasn't been accurate for several years now.
      
      Simply remove it.
      Signed-off-by: NGertjan van Wingerde <gwingerde@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f79f7b1b
    • 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
  5. 21 12月, 2016 17 次提交