1. 15 12月, 2016 32 次提交
  2. 14 12月, 2016 8 次提交
    • L
      Revert "nvme: add support for the Write Zeroes command" · cdb98c26
      Linus Torvalds 提交于
      This reverts commit 6d31e3ba.
      
      This causes bootup problems for me both on my laptop and my desktop.
      What they have in common is that they have NVMe disks with dm-crypt, but
      it's not the same controller, so it's not controller-specific.
      
      Jens does not see it on his machine (also NVMe), so it's presumably
      something that triggers just on bootup.  Possibly related to dm-crypt
      and the fact that I mark my luks volume with "allow-discards" in
      /etc/crypttab.
      
      It's 100% repeatable for me, which made it fairly straightforward to
      bisect the problem to this commit. Small mercies.
      
      So we don't know what the reason is yet, but the revert is needed to get
      things going again.
      Acked-by: NJens Axboe <axboe@fb.com>
      Cc: Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cdb98c26
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · f4000cd9
      Linus Torvalds 提交于
      Pull arm64 updates from Catalin Marinas:
      
       - struct thread_info moved off-stack (also touching
         include/linux/thread_info.h and include/linux/restart_block.h)
      
       - cpus_have_cap() reworked to avoid __builtin_constant_p() for static
         key use (also touching drivers/irqchip/irq-gic-v3.c)
      
       - uprobes support (currently only for native 64-bit tasks)
      
       - Emulation of kernel Privileged Access Never (PAN) using TTBR0_EL1
         switching to a reserved page table
      
       - CPU capacity information passing via DT or sysfs (used by the
         scheduler)
      
       - support for systems without FP/SIMD (IOW, kernel avoids touching
         these registers; there is no soft-float ABI, nor kernel emulation for
         AArch64 FP/SIMD)
      
       - handling of hardware watchpoint with unaligned addresses, varied
         lengths and offsets from base
      
       - use of the page table contiguous hint for kernel mappings
      
       - hugetlb fixes for sizes involving the contiguous hint
      
       - remove unnecessary I-cache invalidation in flush_cache_range()
      
       - CNTHCTL_EL2 access fix for CPUs with VHE support (ARMv8.1)
      
       - boot-time checks for writable+executable kernel mappings
      
       - simplify asm/opcodes.h and avoid including the 32-bit ARM counterpart
         and make the arm64 kernel headers self-consistent (Xen headers patch
         merged separately)
      
       - Workaround for broken .inst support in certain binutils versions
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (60 commits)
        arm64: Disable PAN on uaccess_enable()
        arm64: Work around broken .inst when defective gas is detected
        arm64: Add detection code for broken .inst support in binutils
        arm64: Remove reference to asm/opcodes.h
        arm64: Get rid of asm/opcodes.h
        arm64: smp: Prevent raw_smp_processor_id() recursion
        arm64: head.S: Fix CNTHCTL_EL2 access on VHE system
        arm64: Remove I-cache invalidation from flush_cache_range()
        arm64: Enable HIBERNATION in defconfig
        arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
        arm64: xen: Enable user access before a privcmd hvc call
        arm64: Handle faults caused by inadvertent user access with PAN enabled
        arm64: Disable TTBR0_EL1 during normal kernel execution
        arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
        arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
        arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
        arm64: Update the synchronous external abort fault description
        selftests: arm64: add test for unaligned/inexact watchpoint handling
        arm64: Allow hw watchpoint of length 3,5,6 and 7
        arm64: hw_breakpoint: Handle inexact watchpoint addresses
        ...
      f4000cd9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 2ec4584e
      Linus Torvalds 提交于
      Pull s390 updates from Martin Schwidefsky:
       "The main bulk of the s390 patches for the 4.10 merge window:
      
         - Add support for the contiguous memory allocator.
      
         - The recovery for I/O errors in the dasd device driver is improved,
           the driver will now remove channel paths that are not working
           properly.
      
         - Additional fields are added to /proc/sysinfo, the extended
           partition name and the partition UUID.
      
         - New naming for PCI devices with system defined UIDs.
      
         - The last few remaining alloc_bootmem calls are converted to
           memblock.
      
         - The thread_info structure is stripped down and moved to the
           task_struct. The only field left in thread_info is the flags field.
      
         - Rework of the arch topology code to fix a fake numa issue.
      
         - Refactoring of the atomic primitives and add a new preempt_count
           implementation.
      
         - Clocksource steering for the STP sync check offsets.
      
         - The s390 specific headers are changed to make them usable with
           CLANG.
      
         - Bug fixes and cleanup"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (70 commits)
        s390/cpumf: Use configuration level indication for sampling data
        s390: provide memmove implementation
        s390: cleanup arch/s390/kernel Makefile
        s390: fix initrd corruptions with gcov/kcov instrumented kernels
        s390: exclude early C code from gcov profiling
        s390/dasd: channel path aware error recovery
        s390/dasd: extend dasd path handling
        s390: remove unused labels from entry.S
        s390/vmlogrdr: fix IUCV buffer allocation
        s390/crypto: unlock on error in prng_tdes_read()
        s390/sysinfo: show partition extended name and UUID if available
        s390/numa: pin all possible cpus to nodes early
        s390/numa: establish cpu to node mapping early
        s390/topology: use cpu_topology array instead of per cpu variable
        s390/smp: initialize cpu_present_mask in setup_arch
        s390/topology: always use s390 specific sched_domain_topology_level
        s390/smp: use smp_get_base_cpu() helper function
        s390/numa: always use logical cpu and core ids
        s390: Remove VLAIS in ptff() and clear_table()
        s390: fix machine check panic stack switch
        ...
      2ec4584e
    • L
      Merge tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · aa3ecf38
      Linus Torvalds 提交于
      Pull xen updates from Juergen Gross:
       "Xen features and fixes for 4.10
      
        These are some fixes, a move of some arm related headers to share them
        between arm and arm64 and a series introducing a helper to make code
        more readable.
      
        The most notable change is David stepping down as maintainer of the
        Xen hypervisor interface. This results in me sending you the pull
        requests for Xen related code from now on"
      
      * tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (29 commits)
        xen/balloon: Only mark a page as managed when it is released
        xenbus: fix deadlock on writes to /proc/xen/xenbus
        xen/scsifront: don't request a slot on the ring until request is ready
        xen/x86: Increase xen_e820_map to E820_X_MAX possible entries
        x86: Make E820_X_MAX unconditionally larger than E820MAX
        xen/pci: Bubble up error and fix description.
        xen: xenbus: set error code on failure
        xen: set error code on failures
        arm/xen: Use alloc_percpu rather than __alloc_percpu
        arm/arm64: xen: Move shared architecture headers to include/xen/arm
        xen/events: use xen_vcpu_id mapping for EVTCHNOP_status
        xen/gntdev: Use VM_MIXEDMAP instead of VM_IO to avoid NUMA balancing
        xen-scsifront: Add a missing call to kfree
        MAINTAINERS: update XEN HYPERVISOR INTERFACE
        xenfs: Use proc_create_mount_point() to create /proc/xen
        xen-platform: use builtin_pci_driver
        xen-netback: fix error handling output
        xen: make use of xenbus_read_unsigned() in xenbus
        xen: make use of xenbus_read_unsigned() in xen-pciback
        xen: make use of xenbus_read_unsigned() in xen-fbfront
        ...
      aa3ecf38
    • L
      Merge branch 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb · b5cab0da
      Linus Torvalds 提交于
      Pull swiotlb updates from Konrad Rzeszutek Wilk:
      
       - minor fixes (rate limiting), remove certain functions
      
       - support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization
         in the DMA API
      
      * 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
        swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support
        swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC
        swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
        swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg
        swiotlb: Rate-limit printing when running out of SW-IOMMU space
      b5cab0da
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 93173b5b
      Linus Torvalds 提交于
      Pull KVM updates from Paolo Bonzini:
       "Small release, the most interesting stuff is x86 nested virt
        improvements.
      
        x86:
         - userspace can now hide nested VMX features from guests
         - nested VMX can now run Hyper-V in a guest
         - support for AVX512_4VNNIW and AVX512_FMAPS in KVM
         - infrastructure support for virtual Intel GPUs.
      
        PPC:
         - support for KVM guests on POWER9
         - improved support for interrupt polling
         - optimizations and cleanups.
      
        s390:
         - two small optimizations, more stuff is in flight and will be in
           4.11.
      
        ARM:
         - support for the GICv3 ITS on 32bit platforms"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (94 commits)
        arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest
        KVM: arm/arm64: timer: Check for properly initialized timer on init
        KVM: arm/arm64: vgic-v2: Limit ITARGETSR bits to number of VCPUs
        KVM: x86: Handle the kthread worker using the new API
        KVM: nVMX: invvpid handling improvements
        KVM: nVMX: check host CR3 on vmentry and vmexit
        KVM: nVMX: introduce nested_vmx_load_cr3 and call it on vmentry
        KVM: nVMX: propagate errors from prepare_vmcs02
        KVM: nVMX: fix CR3 load if L2 uses PAE paging and EPT
        KVM: nVMX: load GUEST_EFER after GUEST_CR0 during emulated VM-entry
        KVM: nVMX: generate MSR_IA32_CR{0,4}_FIXED1 from guest CPUID
        KVM: nVMX: fix checks on CR{0,4} during virtual VMX operation
        KVM: nVMX: support restore of VMX capability MSRs
        KVM: nVMX: generate non-true VMX MSRs based on true versions
        KVM: x86: Do not clear RFLAGS.TF when a singlestep trap occurs.
        KVM: x86: Add kvm_skip_emulated_instruction and use it.
        KVM: VMX: Move skip_emulated_instruction out of nested_vmx_check_vmcs12
        KVM: VMX: Reorder some skip_emulated_instruction calls
        KVM: x86: Add a return value to kvm_emulate_cpuid
        KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h
        ...
      93173b5b
    • L
      Merge tag 'hwmon-for-linus-v4.10' of... · 1c59e1ed
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
      
       - new drivers for TMP108 and TC654
      
       - hwmon core code cleanup
      
       - coretemp driver cleanup
      
       - fix overflow issues in several drivers
      
       - minor fixes, cleanups and enhancements in various drivers
      
      * tag 'hwmon-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (41 commits)
        hwmon: (g762) Fix overflows and crash seen when writing limit attributes
        hwmon: (emcw201) Fix overflows seen when writing into limit attributes
        hwmon: (emc2103) Fix overflows seen when temperature limit attributes
        hwmon: (lm85) Fix overflows seen when writing voltage limit attributes
        hwmon: (lm87) Fix overflow seen when writing voltage limit attributes
        hwmon: (nct7802) Fix overflows seen when writing into limit attributes
        hwmon: (adt7470) Fix overflows seen when writing into limit attributes
        hwmon: (adt7462) Fix overflows seen when writing into limit attributes
        hwmon: (adm1026) Fix overflows seen when writing into limit attributes
        hwmon: (adm1025) Fix overflows seen when writing voltage limits
        hwmon: (via-cputemp) Convert to hotplug state machine
        devicetree: hwmon: Add documentation for TMP108 driver.
        hwmon: Add Texas Instruments TMP108 temperature sensor driver.
        hwmon: (core) Simplify sysfs attribute name allocation
        hwmon: (core) Rename groups parameter in API to extra_groups
        hwmon: (core) Explain why at least two attribute groups are allocated
        hwmon: (core) Make is_visible callback truly mandatory
        hwmon: (core) Deprecate hwmon_device_register()
        hwmon: (core) Clarify use of chip attributes
        hwmon: (core) Add support for string attributes to new API
        ...
      1c59e1ed
    • L
      Merge tag 'spi-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · bb3dd056
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "The nicest things about this release for me is seeing some older
        drivers getting some cleanups and modernization, it's really good to
        see things moving forwards even for older drivers.
      
        In content terms it's a fairly humdrum release but where the work has
        been happening is great.
      
         - Support for simultaneous use of internal and GPIO chip selects for
           devices that require the use of the internal select even if it's
           not connected and a GPIO is actually routed to the slave device.
      
         - A major rework and cleanup of the fsl-espi driver from Heiner
           Kallweit which should make it work substantially better.
      
         - DMA support for Freescale DSPI IPs.
      
         - New drivers for Freescale LPSPI IPs and Marvell Armada 3700.
      
         - Support for Allwinner H3"
      
      * tag 'spi-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (85 commits)
        spi: mvebu: fix baudrate calculation for armada variant
        spi: Add support for Armada 3700 SPI Controller
        spi: armada-3700: Add documentation for the Armada 3700 SPI Controller
        spi: fsl-lpspi: quit reading rx fifo under error condition
        spi: fsl-lpspi: use GPL as module license
        spi: fsl-espi: fix ioread16/iowrite16 endianness
        spi: fsl-espi: remove unused linearization code
        spi: fsl-espi: eliminate need for linearization when reading from hardware
        spi: fsl-espi: eliminate need for linearization when writing to hardware
        spi: fsl-espi: determine need for byte swap only once
        spi: fsl-lpspi: read lpspi tx/rx fifo size in probe()
        spi: fsl-lpspi: use wait_for_completion_timeout() while waiting transfer done
        spi: orion: fix comment to mention MVEBU
        spi: atmel: remove the use of private channel fields
        spi: atmel: trivial: remove unused fields in DMA structure
        spi: atmel: Use SPI core DMA mapping framework
        spi: atmel: Use core SPI_MASTER_MUST_[RT]X handling
        spi: atmel: trivial: move info banner to latest probe action
        spi: imx: replace schedule() with cond_resched()
        spi: imx: fix potential shift truncation
        ...
      bb3dd056