1. 28 5月, 2016 13 次提交
    • L
      Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd · 4cae85be
      Linus Torvalds 提交于
      Pull MTD fixes from Brian Norris:
       "We've already noticed a few flaws in the MTD work for v4.7-rc1:
      
         - The Atmel folks got ahead of themselves on trying to support their
           latest hardware and were working off incorrect documentation.  Fix
           up the NAND driver to get this correct.
      
         - Fix up device tree example documentation to use the latest
           recommendations for describing NAND ECC algorithms"
      
      * tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd:
        Documentation: dt: mtd: drop "soft_bch" from example
        Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts"
      4cae85be
    • L
      Merge tag 'drm-fixes-v4.7-rc1' of git://people.freedesktop.org/~airlied/linux · c61b49c7
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
      
       - one IMX built-in regression fix
      
       - a set of amdgpu fixes, mostly powerplay and polaris GPU stuff
      
       - a set of i915 fixes all over, many cc'ed to stable.
      
         The i915 batch contain support for DP++ dongle detection, which is
         used to fix some regressions in the HDMI color depth area
      
      * tag 'drm-fixes-v4.7-rc1' of git://people.freedesktop.org/~airlied/linux: (44 commits)
        drm/amd: add Kconfig dependency for ACP on DRM_AMDGPU
        drm/amdgpu: Fix hdmi deep color support.
        drm/amdgpu: fix bug in fence driver fini
        drm/i915: Stop automatically retiring requests after a GPU hang
        drm/i915: Unify intel_ring_begin()
        drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)
        drm/i915/psr: Try to program link training times correctly
        drm/imx: Match imx-ipuv3-crtc components using device node in platform data
        drm/i915/bxt: Adjusting the error in horizontal timings retrieval
        drm/i915: Don't leave old junk in ilk active watermarks on readout
        drm/i915: s/DPPL/DPLL/ for SKL DPLLs
        drm/i915: Fix gen8 semaphores id for legacy mode
        drm/i915: Set crtc_state->lane_count for HDMI
        drm/i915/BXT: Retrieving the horizontal timing for DSI
        drm/i915: Protect gen7 irq_seqno_barrier with uncore lock
        drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms
        drm/i915: Determine DP++ type 1 DVI adaptor presence based on VBT
        drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed
        drm/i915: Respect DP++ adaptor TMDS clock limit
        drm: Add helper for DP++ adaptors
        ...
      c61b49c7
    • L
      Merge tag 'platform-drivers-x86-v4.7-1' of... · 1e8143db
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darren Hart:
       "Mostly minor updates and cleanups.  One new power management
        controller driver for Intel Core SoCs.
      
        platform/x86:
         - Add PMC Driver for Intel Core SoC
      
        dell-rbtn:
         - Ignore ACPI notifications if device is suspended
      
        thinkpad_acpi:
         - save kbdlight state on suspend and restore it on resume
      
        intel_menlow:
         - reduce code duplication
      
        asus-wmi:
         - provide access to ALS control
      
        ideapad-laptop:
         - add a new WMI string for ESC key
      
        surfacepro3_button:
         - Add a warning when switching to tablet mode
      
        sony-laptop:
         - Avoid oops on module unload for older laptops
      
        intel_telemetry:
         - Constify telemetry_core_ops structures
      
        fujitsu-laptop:
         - Use IS_ENABLED() instead of checking for built-in or module
      
        asus-laptop:
         - correct error handling in sysfs_acpi_set
         - remove redundant initializers
         - correct error handling in asus_read_brightness()
      
        fujitsu-laptop:
         - Support radio LED"
      
      * tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        platform/x86: Add PMC Driver for Intel Core SoC
        dell-rbtn: Ignore ACPI notifications if device is suspended
        thinkpad_acpi: save kbdlight state on suspend and restore it on resume
        intel_menlow: reduce code duplication
        asus-wmi: provide access to ALS control
        ideapad-laptop: add a new WMI string for ESC key
        surfacepro3_button: Add a warning when switching to tablet mode
        sony-laptop: Avoid oops on module unload for older laptops
        intel_telemetry: Constify telemetry_core_ops structures
        fujitsu-laptop: Use IS_ENABLED() instead of checking for built-in or module
        asus-laptop: correct error handling in sysfs_acpi_set
        asus-laptop: remove redundant initializers
        asus-laptop: correct error handling in asus_read_brightness()
        fujitsu-laptop: Support radio LED
      1e8143db
    • L
      Merge git://git.infradead.org/intel-iommu · 25662785
      Linus Torvalds 提交于
      Pull intel IOMMU updates from David Woodhouse:
       "This patchset improves the scalability of the Intel IOMMU code by
        resolving two spinlock bottlenecks and eliminating the linearity of
        the IOVA allocator, yielding up to ~5x performance improvement and
        approaching 'iommu=off' performance"
      
      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: Use per-cpu IOVA caching
        iommu/iova: introduce per-cpu caching to iova allocation
        iommu/vt-d: change intel-iommu to use IOVA frame numbers
        iommu/vt-d: avoid dev iotlb logic for domains with no dev iotlbs
        iommu/vt-d: only unmap mapped entries
        iommu/vt-d: correct flush_unmaps pfn usage
        iommu/vt-d: per-cpu deferred invalidation queues
        iommu/vt-d: refactoring of deferred flush entries
      25662785
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · e28e909c
      Linus Torvalds 提交于
      Pull second batch of KVM updates from Radim Krčmář:
       "General:
      
         - move kvm_stat tool from QEMU repo into tools/kvm/kvm_stat (kvm_stat
           had nothing to do with QEMU in the first place -- the tool only
           interprets debugfs)
      
         - expose per-vm statistics in debugfs and support them in kvm_stat
           (KVM always collected per-vm statistics, but they were summarised
           into global statistics)
      
        x86:
      
         - fix dynamic APICv (VMX was improperly configured and a guest could
           access host's APIC MSRs, CVE-2016-4440)
      
         - minor fixes
      
        ARM changes from Christoffer Dall:
      
         - new vgic reimplementation of our horribly broken legacy vgic
           implementation.  The two implementations will live side-by-side
           (with the new being the configured default) for one kernel release
           and then we'll remove the legacy one.
      
         - fix for a non-critical issue with virtual abort injection to guests"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (70 commits)
        tools: kvm_stat: Add comments
        tools: kvm_stat: Introduce pid monitoring
        KVM: Create debugfs dir and stat files for each VM
        MAINTAINERS: Add kvm tools
        tools: kvm_stat: Powerpc related fixes
        tools: Add kvm_stat man page
        tools: Add kvm_stat vm monitor script
        kvm:vmx: more complete state update on APICv on/off
        KVM: SVM: Add more SVM_EXIT_REASONS
        KVM: Unify traced vector format
        svm: bitwise vs logical op typo
        KVM: arm/arm64: vgic-new: Synchronize changes to active state
        KVM: arm/arm64: vgic-new: enable build
        KVM: arm/arm64: vgic-new: implement mapped IRQ handling
        KVM: arm/arm64: vgic-new: Wire up irqfd injection
        KVM: arm/arm64: vgic-new: Add vgic_v2/v3_enable
        KVM: arm/arm64: vgic-new: vgic_init: implement map_resources
        KVM: arm/arm64: vgic-new: vgic_init: implement vgic_init
        KVM: arm/arm64: vgic-new: vgic_init: implement vgic_create
        KVM: arm/arm64: vgic-new: vgic_init: implement kvm_vgic_hyp_init
        ...
      e28e909c
    • R
      platform/x86: Add PMC Driver for Intel Core SoC · b740d2e9
      Rajneesh Bhardwaj 提交于
      This patch adds the Power Management Controller driver as a PCI driver
      for Intel Core SoC architecture.
      
      This driver can utilize debugging capabilities and supported features
      as exposed by the Power Management Controller.
      
      Please refer to the below specification for more details on PMC features.
      http://www.intel.in/content/www/in/en/chipsets/100-series-chipset-datasheet-vol-2.html
      
      The current version of this driver exposes SLP_S0_RESIDENCY counter.
      This counter can be used for detecting fragile SLP_S0 signal related
      failures and take corrective actions when PCH SLP_S0 signal is not
      asserted after kernel freeze as part of suspend to idle flow
      (echo freeze > /sys/power/state).
      
      Intel Platform Controller Hub (PCH) asserts SLP_S0 signal when it
      detects favorable conditions to enter its low power mode. As a
      pre-requisite the SoC should be in deepest possible Package C-State
      and devices should be in low power mode. For example, on Skylake SoC
      the deepest Package C-State is Package C10 or PC10. Suspend to idle
      flow generally leads to PC10 state but PC10 state may not be sufficient
      for realizing the platform wide power potential which SLP_S0 signal
      assertion can provide.
      
      SLP_S0 signal is often connected to the Embedded Controller (EC) and the
      Power Management IC (PMIC) for other platform power management related
      optimizations.
      
      In general, SLP_S0 assertion == PC10 + PCH low power mode + ModPhy Lanes
      power gated + PLL Idle.
      
      As part of this driver, a mechanism to read the SLP_S0_RESIDENCY is exposed
      as an API and also debugfs features are added to indicate SLP_S0 signal
      assertion residency in microseconds.
      
      echo freeze > /sys/power/state
      wake the system
      cat /sys/kernel/debug/pmc_core/slp_s0_residency_usec
      Signed-off-by: NRajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
      Signed-off-by: NVishwanath Somayaji <vishwanath.somayaji@intel.com>
      Reviewed-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      b740d2e9
    • G
      dell-rbtn: Ignore ACPI notifications if device is suspended · ff865123
      Gabriele Mazzotta 提交于
      Some BIOSes unconditionally send an ACPI notification to RBTN when the
      system is resuming from suspend. This makes dell-rbtn send an input
      event to userspace as if a function key was pressed. Prevent this by
      ignoring all the notifications received while the device is suspended.
      
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=106031Signed-off-by: NGabriele Mazzotta <gabriele.mzt@gmail.com>
      Tested-by: NAlex Hung <alex.hung@canonical.com>
      Reviewed-by: NPali Rohár <pali.rohar@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      ff865123
    • M
      thinkpad_acpi: save kbdlight state on suspend and restore it on resume · afcedebc
      Marco Trevisan (Treviño) 提交于
      Override default LED class suspend/resume handles, by keeping track of
      the brightness level before suspending so that it can be automatically
      restored on resume by calling default resume handler.
      Signed-off-by: NMarco Trevisan (Treviño) <mail@3v1n0.net>
      Acked-by: NHenrique de Moraes Holschuh <hmh@hmh.eng.br>
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      afcedebc
    • R
      intel_menlow: reduce code duplication · a29ccf6f
      Rasmus Villemoes 提交于
      aux0_show and aux1_show consists of almost identical code. Pull that
      into a common helper and make them thin wrappers. Similarly for
      _store.
      Signed-off-by: NRasmus Villemoes <linux@rasmusvillemoes.dk>
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      a29ccf6f
    • O
      asus-wmi: provide access to ALS control · aca234f6
      Oleksij Rempel 提交于
      Asus Zenbook ux31a is providing ACPI0008 interface for ALS
      (Ambient Light Sensor), which is accessible for OS => Win 7.
      This sensor can be used with iio/acpi-als driver.
      Since it is disabled by default, we should use asus-wmi
      interface to enable it.
      Signed-off-by: NOleksij Rempel <linux@rempel-privat.de>
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      aca234f6
    • A
      ideapad-laptop: add a new WMI string for ESC key · 2d98e0b9
      Arnd Bergmann 提交于
      My patch to the ideapad-laptop driver to get the ESC key working on the
      Yoga 1170 (Yoga 3) failed to do the same for the following model, the
      Lenovo Yoga 700.
      
      Denis Gordienko managed to get it working by adding another GUID for the
      new WMI interface. I have adapted his patch to normal coding style
      and simplified it a bit for inclusion, but this patch is currently
      untested.
      
      Link: https://forums.lenovo.com/t5/Lenovo-Yoga-Series-Notebooks/YOGA-3-14-How-to-reclaim-my-Esc-key-and-permanently-disable/m-p/3317499Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Tested-by: NDenis Gordienko <denis.gordienko.mail@gmail.com>
      [dvhart: Whitespace cleanup, static const char *const array declaration]
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      2d98e0b9
    • A
      surfacepro3_button: Add a warning when switching to tablet mode · e27ffe7e
      Andy Shevchenko 提交于
      Microsoft Surface Book has a tablet mode button. Print another message
      once on this event instead of repeating "Unknown event...".
      
      Unfortunately, proper support involves the _DSM method, which is not a
      discoverable interface. Just print a warning for now.
      Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      e27ffe7e
    • B
      Documentation: dt: mtd: drop "soft_bch" from example · 507e6174
      Baruch Siach 提交于
      Commit 32698aaf (Documentation: devicetree: deprecate "soft_bch"
      nand-ecc-mode value, 2016-04-22) deprecated "soft_bch". Update the example to
      match.
      Signed-off-by: NBaruch Siach <baruch@tkos.co.il>
      Acked-by: NRafał Miłecki <zajec5@gmail.com>
      Acked-by: NRob Herring <robh@kernel.org>
      Acked-by: NBoris Brezillon <boris.brezillon@free-electrons.com>
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      507e6174
  2. 27 5月, 2016 25 次提交
    • D
      Merge tag 'drm-intel-next-fixes-2016-05-25' of... · 7fa1d27b
      Dave Airlie 提交于
      Merge tag 'drm-intel-next-fixes-2016-05-25' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      I see the main drm pull got merged, here's the first batch of fixes for
      4.7 already. Fixes all around, a large portion cc: stable stuff.
      
      [airlied: the DP++ stuff is a regression fix].
      * tag 'drm-intel-next-fixes-2016-05-25' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Stop automatically retiring requests after a GPU hang
        drm/i915: Unify intel_ring_begin()
        drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)
        drm/i915/psr: Try to program link training times correctly
        drm/i915/bxt: Adjusting the error in horizontal timings retrieval
        drm/i915: Don't leave old junk in ilk active watermarks on readout
        drm/i915: s/DPPL/DPLL/ for SKL DPLLs
        drm/i915: Fix gen8 semaphores id for legacy mode
        drm/i915: Set crtc_state->lane_count for HDMI
        drm/i915/BXT: Retrieving the horizontal timing for DSI
        drm/i915: Protect gen7 irq_seqno_barrier with uncore lock
        drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms
        drm/i915: Determine DP++ type 1 DVI adaptor presence based on VBT
        drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed
        drm/i915: Respect DP++ adaptor TMDS clock limit
        drm: Add helper for DP++ adaptors
      7fa1d27b
    • D
      Merge branch 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux into drm-next · 79b3c716
      Dave Airlie 提交于
      AMD GPU bugfixes:
      - Various powerplay bug fixes
      - Add some new polaris pci ids
      - misc bug fixes and code cleanups
      
      * 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux: (27 commits)
        drm/amd: add Kconfig dependency for ACP on DRM_AMDGPU
        drm/amdgpu: Fix hdmi deep color support.
        drm/amdgpu: fix bug in fence driver fini
        drm/amd/powerplay/hwmgr: use kmemdup
        drm/amd/powerplay/hwmgr: use kmemdup
        drm/amd/powerplay/hwmgr: use kmemdup
        drm/amd/powerplay: fix bugs of checking if dpm is running on Tonga
        drm/amdgpu: update Polaris11 golden setting
        drm/amdgpu: Add more Polaris 11 PCI IDs
        drm/amdgpu: update Polaris10 golden setting
        drm/amdgpu: add more Polaris10 DID
        drm/amd/amdgpu : Remove unused variable
        drm/amd/amdgpu : Remove unused variable
        drm/amd/amdgpu : Remove unused variable
        drm/amd/amdgpu/cz_dpm: Remove unused variable
        drm/amd/amdgpu : Remove unused variable
        drm/amd/powerplay: use ARRAY_SIZE() to calculate array size.
        drm/amdgpu: fix array out of bounds
        drm/radeon: fix array out of bounds
        drm/amd/powerplay: fix a bug on updating sclk for Tonga
        ...
      79b3c716
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · dc03c0f9
      Linus Torvalds 提交于
      Pull misc kbuild updates from Michal Marek:
       "This is the non-critical part of kbuild:
      
         - Coccinelle fixes, one semantic patch less in this round [Vaishali
           Thakkar, Wolfram Sang, Kees Cook]
      
         - rpm-pkg support for (open)SUSE's update-bootloader [Jiří Kosian]
      
         - rpm-pkg restored support for $RPMOPTS [Srinivas Pandruvada]
      
         - deb-pkg fixes for the linux-headers package [Bjørn Mork, Azriel
           Samson]"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        coccicheck: Fix missing 0 index in kill loop
        scripts/package/Makefile: rpmbuild add support of RPMOPTS
        builddeb: fix missing headers in linux-headers package
        builddeb: include objtool binary in headers package
        kbuild/mkspec: support 'update-bootloader'-based systems
        scripts: coccinelle: remove check to move constants to right
        Coccinelle: setup_timer: Add space in front of parentheses
      dc03c0f9
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · f429d355
      Linus Torvalds 提交于
      Pull kconfig update from Michal Marek:
      
       - fix for behavior of tristate choice items and fix for documentation
         of existing kconfig behavior [Dirk Gouders]
      
       - more helpful "unexpected data" kconfig warning [Paul Bolle]
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig/symbol.c: handle choice_values that depend on 'm' symbols
        kconfig-language: elaborate on the type of a choice
        kconfig-language: fix comment on dependency-generated menu structures.
        kconfig: add unexpected data itself to warning
      f429d355
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5b26fc88
      Linus Torvalds 提交于
      Pull kbuild updates from Michal Marek:
      
       - new option CONFIG_TRIM_UNUSED_KSYMS which does a two-pass build and
         unexports symbols which are not used in the current config [Nicolas
         Pitre]
      
       - several kbuild rule cleanups [Masahiro Yamada]
      
       - warning option adjustments for gcov etc [Arnd Bergmann]
      
       - a few more small fixes
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (31 commits)
        kbuild: move -Wunused-const-variable to W=1 warning level
        kbuild: fix if_change and friends to consider argument order
        kbuild: fix adjust_autoksyms.sh for modules that need only one symbol
        kbuild: fix ksym_dep_filter when multiple EXPORT_SYMBOL() on the same line
        gcov: disable -Wmaybe-uninitialized warning
        gcov: disable tree-loop-im to reduce stack usage
        gcov: disable for COMPILE_TEST
        Kbuild: disable 'maybe-uninitialized' warning for CONFIG_PROFILE_ALL_BRANCHES
        Kbuild: change CC_OPTIMIZE_FOR_SIZE definition
        kbuild: forbid kernel directory to contain spaces and colons
        kbuild: adjust ksym_dep_filter for some cmd_* renames
        kbuild: Fix dependencies for final vmlinux link
        kbuild: better abstract vmlinux sequential prerequisites
        kbuild: fix call to adjust_autoksyms.sh when output directory specified
        kbuild: Get rid of KBUILD_STR
        kbuild: rename cmd_as_s_S to cmd_cpp_s_S
        kbuild: rename cmd_cc_i_c to cmd_cpp_i_c
        kbuild: drop redundant "PHONY += FORCE"
        kbuild: delete unnecessary "@:"
        kbuild: mark help target as PHONY
        ...
      5b26fc88
    • L
      Merge branch 'akpm' (patches from Andrew) · e12fab28
      Linus Torvalds 提交于
      Merge fixes from Andrew Morton:
       "10 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
        update "mm/zsmalloc: don't fail if can't create debugfs info"
        dma-debug: avoid spinlock recursion when disabling dma-debug
        mm: oom_reaper: remove some bloat
        memcg: fix mem_cgroup_out_of_memory() return value.
        ocfs2: fix improper handling of return errno
        mm: slub: remove unused virt_to_obj()
        mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
        mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
        seqlock: fix raw_read_seqcount_latch()
      e12fab28
    • L
      Merge tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 478a1469
      Linus Torvalds 提交于
      Pull DAX locking updates from Ross Zwisler:
       "Filesystem DAX locking for 4.7
      
         - We use a bit in an exceptional radix tree entry as a lock bit and
           use it similarly to how page lock is used for normal faults.  This
           fixes races between hole instantiation and read faults of the same
           index.
      
         - Filesystem DAX PMD faults are disabled, and will be re-enabled when
           PMD locking is implemented"
      
      * tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dax: Remove i_mmap_lock protection
        dax: Use radix tree entry lock to protect cow faults
        dax: New fault locking
        dax: Allow DAX code to replace exceptional entries
        dax: Define DAX lock bit for radix tree exceptional entry
        dax: Make huge page handling depend of CONFIG_BROKEN
        dax: Fix condition for filling of PMD holes
      478a1469
    • L
      Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 315227f6
      Linus Torvalds 提交于
      Pull misc DAX updates from Vishal Verma:
       "DAX error handling for 4.7
      
         - Until now, dax has been disabled if media errors were found on any
           device.  This enables the use of DAX in the presence of these
           errors by making all sector-aligned zeroing go through the driver.
      
         - The driver (already) has the ability to clear errors on writes that
           are sent through the block layer using 'DSMs' defined in ACPI 6.1.
      
        Other misc changes:
      
         - When mounting DAX filesystems, check to make sure the partition is
           page aligned.  This is a requirement for DAX, and previously, we
           allowed such unaligned mounts to succeed, but subsequent
           reads/writes would fail.
      
         - Misc/cleanup fixes from Jan that remove unused code from DAX
           related to zeroing, writeback, and some size checks"
      
      * tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dax: fix a comment in dax_zero_page_range and dax_truncate_page
        dax: for truncate/hole-punch, do zeroing through the driver if possible
        dax: export a low-level __dax_zero_page_range helper
        dax: use sb_issue_zerout instead of calling dax_clear_sectors
        dax: enable dax in the presence of known media errors (badblocks)
        dax: fallback from pmd to pte on error
        block: Update blkdev_dax_capable() for consistency
        xfs: Add alignment check for DAX mount
        ext2: Add alignment check for DAX mount
        ext4: Add alignment check for DAX mount
        block: Add bdev_dax_supported() for dax mount checks
        block: Add vfs_msg() interface
        dax: Remove redundant inode size checks
        dax: Remove pointless writeback from dax_do_io()
        dax: Remove zeroing from dax_io()
        dax: Remove dead zeroing code from fault handlers
        ext2: Avoid DAX zeroing to corrupt data
        ext2: Fix block zeroing in ext2_get_blocks() for DAX
        dax: Remove complete_unwritten argument
        DAX: move RADIX_DAX_ definitions to dax.c
      315227f6
    • A
      drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4 · bbccb9c7
      Andrew Morton 提交于
      gcc-4.4 and thereabouts has issues with initializers of anonymous
      unions, and it generates the following warnings:
      
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: error: unknown field 'simple_funcs' specified in initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: missing braces around initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: (near initialization for 'byt_score_groups[0].<anonymous>')
        drivers/pinctrl/intel/pinctrl-baytrail.c:415: error: unknown field 'simple_funcs' specified in initializer
        drivers/pinctrl/intel/pinctrl-baytrail.c:417: error: unknown field 'simple_funcs' specified in initializer
        ...
      
      Work around this.
      Acked-by: NMika Westerberg <mika.westerberg@linux.intel.com>
      Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bbccb9c7
    • D
      update "mm/zsmalloc: don't fail if can't create debugfs info" · 4abaac9b
      Dan Streetman 提交于
      Some updates to commit d34f6157 ("mm/zsmalloc: don't fail if can't
      create debugfs info"):
      
       - add pr_warn to all stat failure cases
       - do not prevent module loading on stat failure
      
      Link: http://lkml.kernel.org/r/1463671123-5479-1-git-send-email-ddstreet@ieee.orgSigned-off-by: NDan Streetman <ddstreet@ieee.org>
      Reviewed-by: NGanesh Mahendran <opensource.ganesh@gmail.com>
      Acked-by: NMinchan Kim <minchan@kernel.org>
      Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Cc: Dan Streetman <dan.streetman@canonical.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4abaac9b
    • V
      dma-debug: avoid spinlock recursion when disabling dma-debug · 3017cd63
      Ville Syrjälä 提交于
      With netconsole (at least) the pr_err("...  disablingn") call can
      recurse back into the dma-debug code, where it'll try to grab
      free_entries_lock again.  Avoid the problem by doing the printk after
      dropping the lock.
      
      Link: http://lkml.kernel.org/r/1463678421-18683-1-git-send-email-ville.syrjala@linux.intel.comSigned-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3017cd63
    • M
      mm: oom_reaper: remove some bloat · 7ef949d7
      Michal Hocko 提交于
      mmput_async is currently used only from the oom_reaper which is defined
      only for CONFIG_MMU.  We can save work_struct in mm_struct for
      !CONFIG_MMU.
      
      [akpm@linux-foundation.org: fix typo, per Minchan]
      Link: http://lkml.kernel.org/r/20160520061658.GB19172@dhcp22.suse.czReported-by: NMinchan Kim <minchan@kernel.org>
      Signed-off-by: NMichal Hocko <mhocko@suse.com>
      Acked-by: NMinchan Kim <minchan@kernel.org>
      Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7ef949d7
    • T
      memcg: fix mem_cgroup_out_of_memory() return value. · 1ebab2db
      Tetsuo Handa 提交于
      mem_cgroup_out_of_memory() is returning "true" if it finds a TIF_MEMDIE
      task after an eligible task was found, "false" if it found a TIF_MEMDIE
      task before an eligible task is found.
      
      This difference confuses memory_max_write() which checks the return
      value of mem_cgroup_out_of_memory().  Since memory_max_write() wants to
      continue looping, mem_cgroup_out_of_memory() should return "true" in
      this case.
      
      This patch sets a dummy pointer in order to return "true".
      
      Link: http://lkml.kernel.org/r/1463753327-5170-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jpSigned-off-by: NTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Acked-by: NVladimir Davydov <vdavydov@virtuozzo.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1ebab2db
    • E
      ocfs2: fix improper handling of return errno · 1f3a437f
      Eric Ren 提交于
      Previously, if a bad inode was found in ocfs2_iget(), -ESTALE was
      returned back to the caller anyway.  Since commit d2b9d71a2da7 ("ocfs2:
      check/fix inode block for online file check") can handle with return
      value from ocfs2_read_locked_inode() now, we know the exact errno
      returned for us.
      
      Link: http://lkml.kernel.org/r/1463970656-18413-1-git-send-email-zren@suse.comSigned-off-by: NEric Ren <zren@suse.com>
      Reviewed-by: NJoseph Qi <joseph.qi@huawei.com>
      Cc: Mark Fasheh <mfasheh@suse.de>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Junxiao Bi <junxiao.bi@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1f3a437f
    • A
      mm: slub: remove unused virt_to_obj() · d96c84f8
      Andrey Ryabinin 提交于
      It's unused since commit 7ed2f9e6 ("mm, kasan: SLAB support")
      
      Link: http://lkml.kernel.org/r/1464020961-2242-1-git-send-email-aryabinin@virtuozzo.comSigned-off-by: NAndrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Pekka Enberg <penberg@kernel.org>
      Cc: Christoph Lameter <cl@linux.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d96c84f8
    • A
      mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta · 9725759a
      Andrey Ryabinin 提交于
      Commit cd11016e ("mm, kasan: stackdepot implementation.  Enable
      stackdepot for SLAB") added 'reserved' field, but never used it.
      
      Link: http://lkml.kernel.org/r/1464021054-2307-1-git-send-email-aryabinin@virtuozzo.comSigned-off-by: NAndrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Alexander Potapenko <glider@google.com>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9725759a
    • Y
      mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly · 95794924
      Yang Shi 提交于
      Per the suggestion from Michal Hocko [1], DEFERRED_STRUCT_PAGE_INIT
      requires some ordering wrt other initialization operations, e.g.
      page_ext_init has to happen after the whole memmap is initialized
      properly.
      
      For SPARSEMEM this requires to wait for page_alloc_init_late.  Other
      memory models (e.g.  flatmem) might have different initialization
      layouts (page_ext_init_flatmem).  Currently DEFERRED_STRUCT_PAGE_INIT
      depends on MEMORY_HOTPLUG which in turn
      
      	depends on SPARSEMEM || X86_64_ACPI_NUMA
      	depends on ARCH_ENABLE_MEMORY_HOTPLUG
      
      and X86_64_ACPI_NUMA depends on NUMA which in turn disable FLATMEM
      memory model:
      
      config ARCH_FLATMEM_ENABLE
      	def_bool y
      	depends on X86_32 && !NUMA
      
      so FLATMEM is ruled out via dependency maze.  Be explicit and disable
      FLATMEM for DEFERRED_STRUCT_PAGE_INIT so that we do not reintroduce
      subtle initialization bugs
      
      [1] http://lkml.kernel.org/r/20160523073157.GD2278@dhcp22.suse.cz
      
      Link: http://lkml.kernel.org/r/1464027356-32282-1-git-send-email-yang.shi@linaro.orgSigned-off-by: NYang Shi <yang.shi@linaro.org>
      Cc: Michal Hocko <mhocko@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      95794924
    • A
      seqlock: fix raw_read_seqcount_latch() · 50755bc1
      Alexey Dobriyan 提交于
      lockless_dereference() is supposed to take pointer not integer.
      
      Link: http://lkml.kernel.org/r/20160521201448.GA7429@p183.telecom.bySigned-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      50755bc1
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · a10c38a4
      Linus Torvalds 提交于
      Pull Ceph updates from Sage Weil:
       "This changeset has a few main parts:
      
         - Ilya has finished a huge refactoring effort to sync up the
           client-side logic in libceph with the user-space client code, which
           has evolved significantly over the last couple years, with lots of
           additional behaviors (e.g., how requests are handled when cluster
           is full and transitions from full to non-full).
      
           This structure of the code is more closely aligned with userspace
           now such that it will be much easier to maintain going forward when
           behavior changes take place.  There are some locking improvements
           bundled in as well.
      
         - Zheng adds multi-filesystem support (multiple namespaces within the
           same Ceph cluster)
      
         - Zheng has changed the readdir offsets and directory enumeration so
           that dentry offsets are hash-based and therefore stable across
           directory fragmentation events on the MDS.
      
         - Zheng has a smorgasbord of bug fixes across fs/ceph"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (71 commits)
        ceph: fix wake_up_session_cb()
        ceph: don't use truncate_pagecache() to invalidate read cache
        ceph: SetPageError() for writeback pages if writepages fails
        ceph: handle interrupted ceph_writepage()
        ceph: make ceph_update_writeable_page() uninterruptible
        libceph: make ceph_osdc_wait_request() uninterruptible
        ceph: handle -EAGAIN returned by ceph_update_writeable_page()
        ceph: make fault/page_mkwrite return VM_FAULT_OOM for -ENOMEM
        ceph: block non-fatal signals for fault/page_mkwrite
        ceph: make logical calculation functions return bool
        ceph: tolerate bad i_size for symlink inode
        ceph: improve fragtree change detection
        ceph: keep leaf frag when updating fragtree
        ceph: fix dir_auth check in ceph_fill_dirfrag()
        ceph: don't assume frag tree splits in mds reply are sorted
        ceph: fix inode reference leak
        ceph: using hash value to compose dentry offset
        ceph: don't forbid marking directory complete after forward seek
        ceph: record 'offset' for each entry of readdir result
        ceph: define 'end/complete' in readdir reply as bit flags
        ...
      a10c38a4
    • L
      Merge tag 'nfs-for-4.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · ea8ea737
      Linus Torvalds 提交于
      Pull NFS client updates from Anna Schumaker:
       "Highlights include:
      
        Features:
         - Add support for the NFS v4.2 COPY operation
         - Add support for NFS/RDMA over IPv6
      
        Bugfixes and cleanups:
         - Avoid race that crashes nfs_init_commit()
         - Fix oops in callback path
         - Fix LOCK/OPEN race when unlinking an open file
         - Choose correct stateids when using delegations in setattr, read and
           write
         - Don't send empty SETATTR after OPEN_CREATE
         - xprtrdma: Prevent server from writing a reply into memory client
           has released
         - xprtrdma: Support using Read list and Reply chunk in one RPC call"
      
      * tag 'nfs-for-4.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (61 commits)
        pnfs: pnfs_update_layout needs to consider if strict iomode checking is on
        nfs/flexfiles: Use the layout segment for reading unless it a IOMODE_RW and reading is disabled
        nfs/flexfiles: Helper function to detect FF_FLAGS_NO_READ_IO
        nfs: avoid race that crashes nfs_init_commit
        NFS: checking for NULL instead of IS_ERR() in nfs_commit_file()
        pnfs: make pnfs_layout_process more robust
        pnfs: rework LAYOUTGET retry handling
        pnfs: lift retry logic from send_layoutget to pnfs_update_layout
        pnfs: fix bad error handling in send_layoutget
        flexfiles: add kerneldoc header to nfs4_ff_layout_prepare_ds
        flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED
        pnfs: only tear down lsegs that precede seqid in LAYOUTRETURN args
        pnfs: keep track of the return sequence number in pnfs_layout_hdr
        pnfs: record sequence in pnfs_layout_segment when it's created
        pnfs: don't merge new ff lsegs with ones that have LAYOUTRETURN bit set
        pNFS/flexfiles: When initing reads or writes, we might have to retry connecting to DSes
        pNFS/flexfiles: When checking for available DSes, conditionally check for MDS io
        pNFS/flexfile: Fix erroneous fall back to read/write through the MDS
        NFS: Reclaim writes via writepage are opportunistic
        NFSv4: Use the right stateid for delegations in setattr, read and write
        ...
      ea8ea737
    • L
      Merge tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 0b9210c9
      Linus Torvalds 提交于
      Pull xfs updates from Dave Chinner:
       "A pretty average collection of fixes, cleanups and improvements in
        this request.
      
        Summary:
         - fixes for mount line parsing, sparse warnings, read-only compat
           feature remount behaviour
         - allow fast path symlink lookups for inline symlinks.
         - attribute listing cleanups
         - writeback goes direct to bios rather than indirecting through
           bufferheads
         - transaction allocation cleanup
         - optimised kmem_realloc
         - added configurable error handling for metadata write errors,
           changed default error handling behaviour from "retry forever" to
           "retry until unmount then fail"
         - fixed several inode cluster writeback lookup vs reclaim race
           conditions
         - fixed inode cluster writeback checking wrong inode after lookup
         - fixed bugs where struct xfs_inode freeing wasn't actually RCU safe
         - cleaned up inode reclaim tagging"
      
      * tag 'xfs-for-linus-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (39 commits)
        xfs: fix warning in xfs_finish_page_writeback for non-debug builds
        xfs: move reclaim tagging functions
        xfs: simplify inode reclaim tagging interfaces
        xfs: rename variables in xfs_iflush_cluster for clarity
        xfs: xfs_iflush_cluster has range issues
        xfs: mark reclaimed inodes invalid earlier
        xfs: xfs_inode_free() isn't RCU safe
        xfs: optimise xfs_iext_destroy
        xfs: skip stale inodes in xfs_iflush_cluster
        xfs: fix inode validity check in xfs_iflush_cluster
        xfs: xfs_iflush_cluster fails to abort on error
        xfs: remove xfs_fs_evict_inode()
        xfs: add "fail at unmount" error handling configuration
        xfs: add configuration handlers for specific errors
        xfs: add configuration of error failure speed
        xfs: introduce table-based init for error behaviors
        xfs: add configurable error support to metadata buffers
        xfs: introduce metadata IO error class
        xfs: configurable error behavior via sysfs
        xfs: buffer ->bi_end_io function requires irq-safe lock
        ...
      0b9210c9
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · c5436731
      Linus Torvalds 提交于
      Pull hwmon fixlets from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        Documentation/hwmon: Update links in max34440
        hwmon: (emc2103) Fix typo in MODULE_PARM_DESC
      c5436731
    • L
      Merge tag 'mmc-v4.7-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 0e77816e
      Linus Torvalds 提交于
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes intended for v4.7 rc1.  They are based on a
        commit earlier in the merge window and have been tested in linux-next
        for a while.
      
        MMC core:
         - Prevent re-tuning while serving requests for RPMB partitions
         - Extend timeout for long read time quirk to support more eMMCs
      
        MMC host:
         - sdhci-acpi: Ensure connected devices are powered when probing
         - sdhci-pci|acpi: Remove unreliable MMC_CAP_BUS_WIDTH_TEST for Intel HWs
         - dw_mmc: Correct the assigning of max_blk_size
         - dw_mmc-rockchip: Allow RPMB partitions to be created
         - dw_mmc-rockchip: Set the drive phase properly"
      
      * tag 'mmc-v4.7-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: sdhci-acpi: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
        mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
        mmc: longer timeout for long read time quirk
        mmc: dw_mmc: rockchip: Set the drive phase properly
        mmc: dw_mmc: fix the wrong max_blk_size
        mmc: dw_mmc-rockchip: add MMC_CAP_CMD23 capabilities
        mmc: sdhci-acpi: Ensure connected devices are powered when probing
        ACPI / PM: Export acpi_device_fix_up_power()
        mmc: block: Pause re-tuning while switched to the RPMB partition
        mmc: block: Always switch back to main area after RPMB access
        mmc: core: Add a facility to "pause" re-tuning
      0e77816e
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · bfb76444
      Linus Torvalds 提交于
      Pull thermal management updates from Zhang Rui:
      
       - Introduce generic ADC thermal driver, based on OF thermal (Laxman
         Dewangan)
      
       - Introduce new thermal driver for Tango chips (Marc Gonzalez)
      
       - Rockchip driver support for RK3399, RK3366, and some fixes (Caesar
         Wang, Elaine Zhang and Shawn Lin)
      
       - Add CPU power cooling model to Mediatek thermal driver (Dawei Chien)
      
       - Wider usage of dev_thermal_zone_of_sensor_register (Eduardo Valentin)
      
       - TI thermal driver gained a new maintainer (Keerthy).
      
       - Enabled powerclamp driver by checking CPU feature and package cstate
         counter instead of CPU whitelist (Jacob Pan)
      
       - Various fixes on thermal governor, OF thermal, Tegra, and RCAR
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (50 commits)
        thermal: tango: initialize TEMPSI_CFG
        thermal: rockchip: use the usleep_range instead of udelay
        thermal: rockchip: add the notes for better reading
        thermal: rockchip: Support RK3366 SoCs in the thermal driver
        thermal: rockchip: handle the power sequence for tsadc controller
        thermal: rockchip: update the tsadc table for rk3399
        thermal: rockchip: fixes the code_to_temp for tsadc driver
        thermal: rockchip: disable thermal->clk in err case
        thermal: tegra: add Tegra132 specific SOC_THERM driver
        thermal: fix ptr_ret.cocci warnings
        thermal: mediatek: Add cpu dynamic power cooling model.
        thermal: generic-adc: Add ADC based thermal sensor driver
        thermal: generic-adc: Add DT binding for ADC based thermal sensor
        thermal: tegra: fix static checker warning
        thermal: tegra: mark PM functions __maybe_unused
        thermal: add temperature sensor support for tango SoC
        thermal: hisilicon: fix IRQ imbalance enabling
        thermal: hisilicon: support to use any sensor
        thermal: rcar: Remove binding docs for r8a7794
        thermal: tegra: add PM support
        ...
      bfb76444
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 159d08f4
      Linus Torvalds 提交于
      Pull Yama locking fix from James Morris:
       "Fix for the Yama LSM"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Yama: fix double-spinlock and user access in atomic context
      159d08f4
  3. 26 5月, 2016 2 次提交