1. 25 6月, 2015 7 次提交
    • F
      configfs: unexport/make static config_item_init() · 5286d20c
      Fabian Frederick 提交于
      config_item_init() is only used in item.c
      Signed-off-by: NFabian Frederick <fabf@skynet.be>
      Cc: Joel Becker <jlbec@evilplan.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5286d20c
    • P
      NTFS: use kvfree() in ntfs_free() · b0cbeee7
      Pekka Enberg 提交于
      Use kvfree() instead of open-coding it.
      Signed-off-by: NPekka Enberg <penberg@kernel.org>
      Cc: Anton Altaparmakov <anton@tuxera.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b0cbeee7
    • N
      fsnotify: remove obsolete documentation · c3cddc4c
      Nikolay Borisov 提交于
      should_send_event is no longer part of struct fsnotify_ops, so remove it.
      Signed-off-by: NNikolay Borisov <kernel@kyup.com>
      Reviewed-by: NJan Kara <jack@suse.cz>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c3cddc4c
    • A
      powerpc: use for_each_sg() · 5935877a
      Akinobu Mita 提交于
      This replaces the plain loop over the sglist array with for_each_sg()
      macro which consists of sg_next() function calls.  Since powerpc does
      select ARCH_HAS_SG_CHAIN, it is necessary to use for_each_sg() in order
      to loop over each sg element.  This also help find problems with drivers
      that do not properly initialize their sg tables when CONFIG_DEBUG_SG is
      enabled.
      Signed-off-by: NAkinobu Mita <akinobu.mita@gmail.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5935877a
    • A
      metag: use for_each_sg() · ae70a7bb
      Akinobu Mita 提交于
      This replaces the plain loop over the sglist array with for_each_sg()
      macro which consists of sg_next() function calls.  Since metag doesn't
      select ARCH_HAS_SG_CHAIN, it is not necessary to use for_each_sg() in
      order to loop over each sg element.  But this can help find problems
      with drivers that do not properly initialize their sg tables when
      CONFIG_DEBUG_SG is enabled.
      Signed-off-by: NAkinobu Mita <akinobu.mita@gmail.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ae70a7bb
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e3d8238d
      Linus Torvalds 提交于
      Pull arm64 updates from Catalin Marinas:
       "Mostly refactoring/clean-up:
      
         - CPU ops and PSCI (Power State Coordination Interface) refactoring
           following the merging of the arm64 ACPI support, together with
           handling of Trusted (secure) OS instances
      
         - Using fixmap for permanent FDT mapping, removing the initial dtb
           placement requirements (within 512MB from the start of the kernel
           image).  This required moving the FDT self reservation out of the
           memreserve processing
      
         - Idmap (1:1 mapping used for MMU on/off) handling clean-up
      
         - Removing flush_cache_all() - not safe on ARM unless the MMU is off.
           Last stages of CPU power down/up are handled by firmware already
      
         - "Alternatives" (run-time code patching) refactoring and support for
           immediate branch patching, GICv3 CPU interface access
      
         - User faults handling clean-up
      
        And some fixes:
      
         - Fix for VDSO building with broken ELF toolchains
      
         - Fix another case of init_mm.pgd usage for user mappings (during
           ASID roll-over broadcasting)
      
         - Fix for FPSIMD reloading after CPU hotplug
      
         - Fix for missing syscall trace exit
      
         - Workaround for .inst asm bug
      
         - Compat fix for switching the user tls tpidr_el0 register"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (42 commits)
        arm64: use private ratelimit state along with show_unhandled_signals
        arm64: show unhandled SP/PC alignment faults
        arm64: vdso: work-around broken ELF toolchains in Makefile
        arm64: kernel: rename __cpu_suspend to keep it aligned with arm
        arm64: compat: print compat_sp instead of sp
        arm64: mm: Fix freeing of the wrong memmap entries with !SPARSEMEM_VMEMMAP
        arm64: entry: fix context tracking for el0_sp_pc
        arm64: defconfig: enable memtest
        arm64: mm: remove reference to tlb.S from comment block
        arm64: Do not attempt to use init_mm in reset_context()
        arm64: KVM: Switch vgic save/restore to alternative_insn
        arm64: alternative: Introduce feature for GICv3 CPU interface
        arm64: psci: fix !CONFIG_HOTPLUG_CPU build warning
        arm64: fix bug for reloading FPSIMD state after CPU hotplug.
        arm64: kernel thread don't need to save fpsimd context.
        arm64: fix missing syscall trace exit
        arm64: alternative: Work around .inst assembler bugs
        arm64: alternative: Merge alternative-asm.h into alternative.h
        arm64: alternative: Allow immediate branch as alternative instruction
        arm64: Rework alternate sequence for ARM erratum 845719
        ...
      e3d8238d
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 4e241557
      Linus Torvalds 提交于
      Pull first batch of KVM updates from Paolo Bonzini:
       "The bulk of the changes here is for x86.  And for once it's not for
        silicon that no one owns: these are really new features for everyone.
      
        Details:
      
         - ARM:
              several features are in progress but missed the 4.2 deadline.
              So here is just a smattering of bug fixes, plus enabling the
              VFIO integration.
      
         - s390:
              Some fixes/refactorings/optimizations, plus support for 2GB
              pages.
      
         - x86:
              * host and guest support for marking kvmclock as a stable
                scheduler clock.
              * support for write combining.
              * support for system management mode, needed for secure boot in
                guests.
              * a bunch of cleanups required for the above
              * support for virtualized performance counters on AMD
              * legacy PCI device assignment is deprecated and defaults to "n"
                in Kconfig; VFIO replaces it
      
              On top of this there are also bug fixes and eager FPU context
              loading for FPU-heavy guests.
      
         - Common code:
              Support for multiple address spaces; for now it is used only for
              x86 SMM but the s390 folks also have plans"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (124 commits)
        KVM: s390: clear floating interrupt bitmap and parameters
        KVM: x86/vPMU: Enable PMU handling for AMD PERFCTRn and EVNTSELn MSRs
        KVM: x86/vPMU: Implement AMD vPMU code for KVM
        KVM: x86/vPMU: Define kvm_pmu_ops to support vPMU function dispatch
        KVM: x86/vPMU: introduce kvm_pmu_msr_idx_to_pmc
        KVM: x86/vPMU: reorder PMU functions
        KVM: x86/vPMU: whitespace and stylistic adjustments in PMU code
        KVM: x86/vPMU: use the new macros to go between PMC, PMU and VCPU
        KVM: x86/vPMU: introduce pmu.h header
        KVM: x86/vPMU: rename a few PMU functions
        KVM: MTRR: do not map huge page for non-consistent range
        KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type
        KVM: MTRR: introduce mtrr_for_each_mem_type
        KVM: MTRR: introduce fixed_mtrr_addr_* functions
        KVM: MTRR: sort variable MTRRs
        KVM: MTRR: introduce var_mtrr_range
        KVM: MTRR: introduce fixed_mtrr_segment table
        KVM: MTRR: improve kvm_mtrr_get_guest_memory_type
        KVM: MTRR: do not split 64 bits MSR content
        KVM: MTRR: clean up mtrr default type
        ...
      4e241557
  2. 24 6月, 2015 25 次提交
    • L
      Merge tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 08d183e3
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
      
       - disable the 32-bit vdso when building LE, so we can build with a
         64-bit only toolchain.
      
       - EEH fixes from Gavin & Richard.
      
       - enable the sys_kcmp syscall from Laurent.
      
       - sysfs control for fastsleep workaround from Shreyas.
      
       - expose OPAL events as an irq chip by Alistair.
      
       - MSI ops moved to pci_controller_ops by Daniel.
      
       - fix for kernel to userspace backtraces for perf from Anton.
      
       - merge pseries and pseries_le defconfigs from Cyril.
      
       - CXL in-kernel API from Mikey.
      
       - OPAL prd driver from Jeremy.
      
       - fix for DSCR handling & tests from Anshuman.
      
       - Powernv flash mtd driver from Cyril.
      
       - dynamic DMA Window support on powernv from Alexey.
      
       - LLVM clang fixes & workarounds from Anton.
      
       - reworked version of the patch to abort syscalls when transactional.
      
       - fix the swap encoding to support 4TB, from Aneesh.
      
       - various fixes as usual.
      
       - Freescale updates from Scott: Highlights include more 8xx
         optimizations, an e6500 hugetlb optimization, QMan device tree nodes,
         t1024/t1023 support, and various fixes and cleanup.
      
      * tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (180 commits)
        cxl: Fix typo in debug print
        cxl: Add CXL_KERNEL_API config option
        powerpc/powernv: Fix wrong IOMMU table in pnv_ioda_setup_bus_dma()
        powerpc/mm: Change the swap encoding in pte.
        powerpc/mm: PTE_RPN_MAX is not used, remove the same
        powerpc/tm: Abort syscalls in active transactions
        powerpc/iommu/ioda2: Enable compile with IOV=on and IOMMU_API=off
        powerpc/include: Add opal-prd to installed uapi headers
        powerpc/powernv: fix construction of opal PRD messages
        powerpc/powernv: Increase opal-irqchip initcall priority
        powerpc: Make doorbell check preemption safe
        powerpc/powernv: pnv_init_idle_states() should only run on powernv
        macintosh/nvram: Remove as unused
        powerpc: Don't use gcc specific options on clang
        powerpc: Don't use -mno-strict-align on clang
        powerpc: Only use -mtraceback=no, -mno-string and -msoft-float if toolchain supports it
        powerpc: Only use -mabi=altivec if toolchain supports it
        powerpc: Fix duplicate const clang warning in user access code
        vfio: powerpc/spapr: Support Dynamic DMA windows
        vfio: powerpc/spapr: Register memory and define IOMMU v2
        ...
      08d183e3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 4b1f2af6
      Linus Torvalds 提交于
      Pull s390 updates from Martin Schwidefsky:
       "Pretty boring for a merge window pull.
      
        One change in behaviour is the patch for dasd driver, the module which
        provides the diagnose discipline is now loaded automatically.
      
        The SCLP code got a nice cleanup, a new global structure replaces a
        bunch of accessor functions.
      
        And a couple of random, small improvements"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/pci: improve handling of hotplug event 0x301
        s390/setup: fix DMA_API_DEBUG warnings
        s390/zcrypt: remove obsolete __constant
        s390/keyboard: avoid off-by-one when using strnlen_user()
        s390/sclp: pass timeout as HZ independent value
        s390/mm: s/specifiation/specification/, s/an specification/a specification/
        s390/sclp: Use DECLARE_BITMAP
        s390/dasd: Enable automatic loading of dasd_diag_mod
        s390/sclp: move sclp_facilities into "struct sclp"
        s390/sclp: get rid of sclp_get_mtid() and sclp_get_mtid_max()
        s390/sclp: unify basic sclp access by exposing "struct sclp"
        s390/sclp: prepare smp_fill_possible_mask for global "struct sclp"
      4b1f2af6
    • L
      Merge tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze · aaa64485
      Linus Torvalds 提交于
      Pull Microblaze updates from Michal Simek:
      
       - some PCI fixups
      
       - add new MB versions
      
       - sparse fixups
      
      * tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze/PCI: Remove unnecessary struct pci_dev declaration
        microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
        microblaze/PCI: Remove unused declarations
        microblaze: Label local function static
        microblaze: Add missing release version code
      aaa64485
    • L
      Merge tag 'iommu-updates-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 6eae81a5
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
       "This time with bigger changes than usual:
      
         - A new IOMMU driver for the ARM SMMUv3.
      
           This IOMMU is pretty different from SMMUv1 and v2 in that it is
           configured through in-memory structures and not through the MMIO
           register region.  The ARM SMMUv3 also supports IO demand paging for
           PCI devices with PRI/PASID capabilities, but this is not
           implemented in the driver yet.
      
         - Lots of cleanups and device-tree support for the Exynos IOMMU
           driver.  This is part of the effort to bring Exynos DRM support
           upstream.
      
         - Introduction of default domains into the IOMMU core code.
      
           The rationale behind this is to move functionalily out of the IOMMU
           drivers to common code to get to a unified behavior between
           different drivers.  The patches here introduce a default domain for
           iommu-groups (isolation groups).
      
           A device will now always be attached to a domain, either the
           default domain or another domain handled by the device driver.  The
           IOMMU drivers have to be modified to make use of that feature.  So
           long the AMD IOMMU driver is converted, with others to follow.
      
         - Patches for the Intel VT-d drvier to fix DMAR faults that happen
           when a kdump kernel boots.
      
           When the kdump kernel boots it re-initializes the IOMMU hardware,
           which destroys all mappings from the crashed kernel.  As this
           happens before the endpoint devices are re-initialized, any
           in-flight DMA causes a DMAR fault.  These faults cause PCI master
           aborts, which some devices can't handle properly and go into an
           undefined state, so that the device driver in the kdump kernel
           fails to initialize them and the dump fails.
      
           This is now fixed by copying over the mapping structures (only
           context tables and interrupt remapping tables) from the old kernel
           and keep the old mappings in place until the device driver of the
           new kernel takes over.  This emulates the the behavior without an
           IOMMU to the best degree possible.
      
         - A couple of other small fixes and cleanups"
      
      * tag 'iommu-updates-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (69 commits)
        iommu/amd: Handle large pages correctly in free_pagetable
        iommu/vt-d: Don't disable IR when it was previously enabled
        iommu/vt-d: Make sure copied over IR entries are not reused
        iommu/vt-d: Copy IR table from old kernel when in kdump mode
        iommu/vt-d: Set IRTA in intel_setup_irq_remapping
        iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping
        iommu/vt-d: Move QI initializationt to intel_setup_irq_remapping
        iommu/vt-d: Move EIM detection to intel_prepare_irq_remapping
        iommu/vt-d: Enable Translation only if it was previously disabled
        iommu/vt-d: Don't disable translation prior to OS handover
        iommu/vt-d: Don't copy translation tables if RTT bit needs to be changed
        iommu/vt-d: Don't do early domain assignment if kdump kernel
        iommu/vt-d: Allocate si_domain in init_dmars()
        iommu/vt-d: Mark copied context entries
        iommu/vt-d: Do not re-use domain-ids from the old kernel
        iommu/vt-d: Copy translation tables from old kernel
        iommu/vt-d: Detect pre enabled translation
        iommu/vt-d: Make root entry visible for hardware right after allocation
        iommu/vt-d: Init QI before root entry is allocated
        iommu/vt-d: Cleanup log messages
        ...
      6eae81a5
    • L
      Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd · 54245ed8
      Linus Torvalds 提交于
      Pull MTD updates from Brian Norris:
       "JFFS2:
         - fix a theoretical unbalanced locking issue; the lock handling was a
           bit unclean, but AFAICT, it didn't actually lead to real deadlocks
      
        NAND:
         - brcmnand driver: new driver supporting NAND controller found
           originally on Broadcom STB SoCs (BCM7xxx), but now also found on
           BCM63xxx, iProc (e.g., Cygnus, BCM5301x), BCM3xxx, and more
      
         - begin factoring out BBT code so it can be shared between
           traditional (parallel) NAND drivers and upcoming SPI NAND drivers
           (WIP)
      
         - add common DT-based init support, so nand_base can pick up some
           flash properties automatically, using established common NAND DT
           properties
      
         - mxc_nand: support 8-bit ECC
      
         - pxa3xx_nand:
           * fix build for ARM64
           * use a jiffies-based timeout
      
        SPI NOR:
         - add a few new IDs
      
         - clear out some unnecessary entries
      
         - make sure SECT_4K flags are correct for all (?) entries
      
        Core:
         - fix mtd->usecount race conditions (BUG_ON())
      
         - switch to modern PM ops
      
        Other:
         - CFI: save code space by de-inlining large functions
      
         - clean up some partition parser selection code across several
           drivers
      
         - various miscellaneous changes, mostly minor"
      
      * tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd: (57 commits)
        mtd: docg3: Fix kasprintf() usage
        mtd: docg3: Don't leak docg3->bbt in error path
        mtd: nandsim: Fix kasprintf() usage
        mtd: cs553x_nand: Fix kasprintf() usage
        mtd: r852: Fix device_create_file() usage
        mtd: brcmnand: drop unnecessary initialization
        mtd: propagate error codes from add_mtd_device()
        mtd: diskonchip: remove two-phase partitioning / registration
        mtd: dc21285: use raw spinlock functions for nw_gpio_lock
        mtd: chips: fixup dependencies, to prevent build error
        mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial
        mtd: cfi: deinline large functions
        mtd: lantiq-flash: use default partition parsers
        mtd: plat_nand: use default partition probe
        mtd: nand: correct indentation within conditional
        mtd: remove incorrect file name
        mtd: blktrans: use better error code for unimplemented ioctl()
        mtd: maps: Spelling s/reseved/reserved/
        mtd: blktrans: change blktrans_getgeo return value
        mtd: mxc_nand: generate nand_ecclayout for 8 bit ECC
        ...
      54245ed8
    • L
      Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 84e9c87e
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Changes to existing drivers:
         - Constify structures; throughout the subsystem
         - Move support to DT in; cros_ec
         - DT changes and documentation; cros-ec, max77693, max77686, arizona, da9063
         - ACPI changes and documentation; mfd-core
         - Use different platform specific API in; cros_ec_*, arizona-core
         - Remove unused parent field from; cros_ec_i2c
         - Add wake-up/reset delay in; cross_ec_spi, arizona-core
         - Staticise structures/functions in; cros_ec
         - Remove redundant code; arizona-core, max77686
         - Bugfix; twl4030-power
         - Allow compile test; aat2870, tps65910
         - MAINTAINERS adaptions; samsung, syscon
         - Resource Management (devm_*); arizona-core
         - Refactor Reset code; arizona-core
         - Insist on at least one full boot; arizona-core
         - Trivial formatting; arizona-core
         - Add low-power-sleep; arizona-core
         - IRQ ONESHOT changes; twl4030-irq, mc13xxx-core, wm831x-auxadc, htc-i2cpld,
                                wm8350-core, ab8500-debugfs, ab8500-gpadc, si476x-i2c
      
        (Re-)moved drivers:
         - Move protocol helpers out to drivers/platform; cros_ec
      
        New drivers/supported devices:
         - Add support for AXP22x into axp20x
         - Add support for OnKey into da9063-core
         - Add support for Pinctrl into mt6397-core
         - New STMicroelectronics LPC Watchdog driver
         - New STMicroelectronics LPC Real-Time Clock driver"
      
      * tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (59 commits)
        mfd: lpc_ich: Assign subdevice ids automatically
        mfd: si476x-i2c: Pass the IRQF_ONESHOT flag
        mfd: ab8500-gpadc: Pass the IRQF_ONESHOT flag
        mfd: ab8500-debugfs: Pass the IRQF_ONESHOT flag
        mfd: wm8350-core: Pass the IRQF_ONESHOT flag
        mfd: htc-i2cpld: Pass the IRQF_ONESHOT flag
        mfd: wm831x-auxadc: Pass the IRQF_ONESHOT flag
        mfd: mc13xxx-core: Pass the IRQF_ONESHOT flag
        mfd: twl4030-irq: Pass the IRQF_ONESHOT flag
        mfd: mt6397-core: Add GPIO sub-module support
        mfd: arizona: Add convience defines for micd_rate/micd_bias_starttime
        mfd: dt: Add bindings for DA9063 OnKey
        mfd: da9063: Add support for OnKey driver
        mfd: arizona: Fix incorrect Makefile conditionals
        mfd: arizona: Add stub for wm5102_patch()
        mfd: Check ACPI device companion before checking resources
        Documentation: Add WM8998/WM1814 device tree bindings
        mfd: arizona: Split INx_MODE into two fields
        mfd: wm5110: Add delay before releasing reset line
        mfd: arizona: Add better support for system suspend
        ...
      84e9c87e
    • L
      Merge tag 'regulator-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 7fe0bf90
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "Another fairly quiet release, some new drivers with generic handling
        for minor features but nothing that makes a substantial difference
        outside of the subsystem or for most boards:
      
         - support for a bunch of new parameters which are present on enough
           regulators to be worth having generic handling for in the
           framework.
      
         - fixes for some issues with printing constraints during boot which
           should probably have gone in for v4.1 but didn't.
      
         - new drivers for Dialog DA9062, Maxim MAX77621 and Qualcomm SPMI
           regulators"
      
      * tag 'regulator-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (45 commits)
        regulator: qcom_spmi: Fix calculating number of voltages
        regulator: qcom_spmi: Add missing braces for aligned code
        regulator: fix simple_return.cocci warnings
        regulator: Add QCOM SPMI regulator driver
        regulator: Add docbook for soft start
        regulator: Add input current limit support
        regulator: Add soft start support
        regulator: Add pull down support
        regulator: Add system_load constraint
        regulator: max8973: Fix up ramp_delay for MAX8973_RAMP_25mV_PER_US case
        regulator: core: replace sprintf with scnprintf
        regulator: core: fix constraints output buffer
        regulator: core: Don't corrupt display when printing uV offsets
        regulator: max8973: add support for MAX77621
        regulator: max8973: configure ramp delay through callback
        regulator: pwm-regulator: Diffientiate between dev (device) and rdev (regulator_dev)
        regulator: pwm-regulator: Remove superfluous is_enabled check
        regulator: pwm-regulator: Remove unnecessary descriptor attribute from ddata
        regulator: core: Don't spew backtraces on duplicate sysfs
        regulator: da9063: Fix up irq leak
        ...
      7fe0bf90
    • L
      Merge tag 'spi-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 5a602e15
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "No framework updates for the SPI API this time around aside from one
        small fix, just driver improvments.  Some highlights include:
      
         - New driver support for CSR USP, Mikrotik RB4xx and Zynq GQSPI
           controllers.
      
         - Modernisation of the OMAP McSPI controller driver, moving it to
           current APIs to enable support for a wider range of client drivers.
      
         - DMA support for the bcm2835 controller"
      
      * tag 'spi-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (60 commits)
        spi: zynq: Remove execute bit
        spi: atmel: add support to FIFOs
        spi: atmel: update DT bindings documentation
        spi: spi-fsl-dspi: Update DT binding documentation
        spi: pxa2xx: Constify ACPI device ids
        spi: Add support for Zynq Ultrascale+ MPSoC GQSPI controller
        spi: zynq: Add DT bindings documentation for Zynq Ultrascale+ MPSoC GQSPI controller
        spi: fsl-dspi: Use pinctrl PM helpers
        spi: davinci: change the lower limit of pre-scale divider to 1
        spi: spi-fsl-dspi: Change the way of increasing spi_message->actual_length
        spi: spi-fsl-dspi: Enable TCF interrupt mode support
        spi: atmel: add support for the internal chip-select of the spi controller
        spi: spi-pxa2xx: remove legacy PXA DMA bits
        spi: pxa2xx: Make LPSS SPI general register optional
        spi: pxa2xx: Prepare for new Intel LPSS SPI type
        spi: pxa2xx: Differentiate Intel LPSS types
        spi: restore rx/tx_buf in case of unset CONFIG_HAS_DMA
        spi: rspi: Re-do the returning value of qspi_transfer_out_in
        spi: rspi: modify the name of "qspi_trigger_transfer_out_int" function
        spi: orion: Fix extended baud rates for each Armada SoCs
        ...
      5a602e15
    • L
      Merge tag 'regmap-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · e12bdf0d
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "As well as a few fixes and updates for API changes there's two new
        features for the API:
      
         - Better support for handling a reset of the underlying hardware,
           marking the register map as needing a resync to the device when we
           need to do that automatically
      
         - Support for querying the size and stride of the register map,
           allowing higher level frameworks to configure themselves more
           readily"
      
      * tag 'regmap-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fix possible shift overflow in regmap_field_init()
        regmap: Fix regmap_bulk_read in BE mode
        regmap: kill off set_irq_flags usage
        regmap: irq: Fixed a typo error
        regmap: drop unneeded goto
        regmap: Introduce regmap_get_reg_stride
        regmap: Introduce regmap_get_max_register
        regmap: Use regcache_mark_dirty() to indicate power loss or reset
        regmap: Add a helper function for regcache sync test
        regmap: Constify irq_domain_ops
      e12bdf0d
    • L
      Merge tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 1a13e36a
      Linus Torvalds 提交于
      Pull fbdev updates from Tomi Valkeinen:
      
       - ssd1307fb: various fixes and improvements, SSD1305 support
      
       - use architecture agnostic functions instead of MTRR functions in
         various fbdev drivers
      
       - TI DRA7xx SoC display support (arch/arm/ side)
      
       - OMAPDSS componentization to fix probing order issues
      
       - OMAPDSS scaling fixes
      
       - msm_fb: remove obsoleted driver
      
      * tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits)
        msm: msm_fb: Remove dead code
        OMAPDSS: HDMI: wait for framedone when stopping video
        OMAPDSS: HDMI4: fix error handling
        OMAPDSS: DISPC: scaler debug print
        OMAPDSS: DISPC: do only y decimation on OMAP3
        OMAPDSS: DISPC: check if scaling setup failed
        OMAPDSS: DISPC: fix 64 bit issue in 5-tap
        OMAPDSS: DISPC: fix row_inc for OMAP3
        OMAPDSS: DISPC: add check for scaling limits
        OMAPDSS: DISPC: fix check_horiz_timing_omap3 args
        OMAPDSS: DISPC: fix predecimation for YUV modes
        OMAPDSS: DISPC: work-around for errata i631
        OMAPDSS: simplify submodule reg/unreg code
        OMAPDSS: componentize omapdss
        OMAPDSS: reorder uninit calls
        OMAPDSS: remove uses of __init/__exit
        OMAPDSS: fix dss_init_ports error handling
        OMAPDSS: refactor dss probe function
        OMAPDSS: move 'dss_initialized' to dss driver
        fbdev: propagate result of fb_videomode_from_videomode()
        ...
      1a13e36a
    • L
      Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6 · 36a1624d
      Linus Torvalds 提交于
      Pull power supply and reset updates from Sebastian Reichel:
      
       - new charger drivers: BQ24257, BQ25890, AXP288, RT9455
      
       - MAX17042 battery: add health & temperature support
      
       - BQ2415x charger: add ACPI support
      
       - misc fixes and cleanups
      
      * tag 'for-4.2' of git://git.infradead.org/battery-2.6: (32 commits)
        power_supply: Correct kerneldoc copy paste errors
        wm831x_power: Fix off-by-one at free_irq()
        power_supply: rt9455_charger: Fix error reported by static analysis tool
        power_supply: bq24257: use flags argument of devm_gpiod_get
        power_supply: bq25890: use flags argument of devm_gpiod_get
        sbs-battery: add option to always register battery
        power: Add devm_power_supply_get_by_phandle() helper function
        power_supply: max17042: Add OF support for setting thresholds
        power_supply: sysfs: Bring back write to writeable properties
        power_supply: rt9455_charger: Check if CONFIG_USB_PHY is enabled
        power: reset: gpio-restart: increase priority slightly
        power_supply: bq25890: make chip_id int
        power_supply: Add support for Richtek RT9455 battery charger
        Documentation: devicetree: Add Richtek RT9455 bindings
        of: Add vendor prefix for Richtek Technology Corporation
        power_supply: 88pm860x_charger: Do not call free_irq() twice
        power: bq24190_charger: Change first_time flag reset condition
        power: axp288_charger: axp288 charger driver
        power: max17042_battery: add HEALTH and TEMP_* properties support
        power_supply: Add support for TI BQ25890 charger chip
        ...
      36a1624d
    • L
      Merge tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 5262f25f
      Linus Torvalds 提交于
      Pull HSI updates from Sebastian Reichel:
       "Misc fixes"
      
      * tag 'hsi-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction
        HSI: nokia-modem: Reduce missing driver message to debug level
        HSI: cmt_speech: fix timestamp interface
      5262f25f
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · acd53127
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is the usual grab bag of driver updates (lpfc, hpsa,
        megaraid_sas, cxgbi, be2iscsi) plus an assortment of minor updates.
      
        There is also one new driver: the Cisco snic.  The advansys driver has
        been rewritten to get rid of the warning about converting it to the
        DMA API, the tape statistics patch got in and finally, there's a
        resuffle of SCSI header files to separate more cleanly initiator from
        target mode (and better share the common definitions)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (156 commits)
        snic: driver for Cisco SCSI HBA
        qla2xxx: Fix indentation
        qla2xxx: Comment out unreachable code
        fusion: remove dead MTRR code
        advansys: fix compilation errors and warnings when CONFIG_PCI is not set
        mptsas: fix depth param in scsi_track_queue_full
        megaraid: fix irq setup process regression
        lpfc: Update version to 10.7.0.0 for upstream patch set.
        lpfc: Fix to drop PLOGIs from fabric node till LOGO processing completes
        lpfc: Fix scsi task management error message.
        lpfc: Fix cq_id masking problem.
        lpfc: Fix scsi prep dma buf error.
        lpfc: Add support for using block multi-queue
        lpfc: Devices are not discovered during takeaway/giveback testing
        lpfc: Fix vport deletion failure.
        lpfc: Check for active portpeerbeacon.
        lpfc: Update driver version for upstream patch set 10.6.0.1.
        lpfc: Change buffer pool empty message to miscellaneous category
        lpfc: Fix incorrect log message reported for empty FCF record.
        lpfc: Fix rport leak.
        ...
      acd53127
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · f9d1b5a3
      Linus Torvalds 提交于
      Pull rdma updates from Doug Ledford:
      
       - a large cleanup of how device capabilities are checked for various
         features
      
       - additional cleanups in the MAD processing
      
       - update to the srp driver
      
       - creation and use of centralized log message helpers
      
       - add const to a number of args to calls and clean up call chain
      
       - add support for extended cq create verb
      
       - add support for timestamps on cq completion
      
       - add support for processing OPA MAD packets
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (92 commits)
        IB/mad: Add final OPA MAD processing
        IB/mad: Add partial Intel OPA MAD support
        IB/mad: Add partial Intel OPA MAD support
        IB/core: Add OPA MAD core capability flag
        IB/mad: Add support for additional MAD info to/from drivers
        IB/mad: Convert allocations from kmem_cache to kzalloc
        IB/core: Add ability for drivers to report an alternate MAD size.
        IB/mad: Support alternate Base Versions when creating MADs
        IB/mad: Create a generic helper for DR forwarding checks
        IB/mad: Create a generic helper for DR SMP Recv processing
        IB/mad: Create a generic helper for DR SMP Send processing
        IB/mad: Split IB SMI handling from MAD Recv handler
        IB/mad cleanup: Generalize processing of MAD data
        IB/mad cleanup: Clean up function params -- find_mad_agent
        IB/mlx4: Add support for CQ time-stamping
        IB/mlx4: Add mmap call to map the hardware clock
        IB/core: Pass hardware specific data in query_device
        IB/core: Add timestamp_mask and hca_core_clock to query_device
        IB/core: Extend ib_uverbs_create_cq
        IB/core: Add CQ creation time-stamping flag
        ...
      f9d1b5a3
    • L
      Merge branch 'for-linus-clk' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 2ad7b44f
      Linus Torvalds 提交于
      Pull clkdev updates from Russell King:
       "This series addresses some breakage in clkdev caused by a previous
        patch set from the clk tree which introduced per-user clk structures.
        This basically renamed the existing 'struct clk' to 'struct clk_hw',
        and introduced a new 'struct clk'.
      
        This change will break anyone using clk_add_alias() with the common
        clk code enabled.  Thankfully, the intersection of users of
        clk_add_alias() and those using the common clk code is practically
        zero, but this is something which should be fixed to keep the code
        sane.
      
        The problem is that clk_add_alias() does this:
      
              r = clk_get(...);
              l = clkdev_alloc(r, ...);
              clk_put(...);
      
        which causes the alias to store a pointer to 'r', which has been
        freed.
      
        The original patch set tried to work around this problem incorrectly -
        at clk_get() time, it tried to convert the struct clk to a struct
        clk_hw, and then creating a new struct clk from that.  Clearly, if the
        original struct clk has been freed, then we have a use-after-free bug.
      
        We have other places in the tree which do something similar, so this
        series also addresses those locations too.
      
        This series addresses this problem by converting clkdev to store and
        use the clk_hw pointer.  This allows clk_get() to only have to create
        it's per-user struct clk from the clk_hw.  We can also get to the
        desired clk_hw at clk_add_alias() or clk lookup creation time, when
        the struct clk is "alive".
      
        We also perform some cleanups of the code:
      
         - replacing looped calls to clkdev_add() with clkdev_add_table()
      
         - replacing open-coded lookup allocation (which should have been
           using clkdev_alloc()) and subsequent clkdev_add() with
           clkdev_create()
      
         - replacing open-coded clk_add_alias() with clk_add_alias()"
      
      * 'for-linus-clk' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        clk: s2mps11: use clkdev_create()
        ASoC: migor: use clkdev_create()
        ARM: omap2: use clkdev_add_alias()
        ARM: omap2: use clkdev_create()
        ARM: orion: use clkdev_create()
        ARM: lpc32xx: convert to use clkdev_add_table()
        SH: use clkdev_add_table()
        clkdev: add clkdev_create() helper
        clkdev: const-ify connection id to clk_add_alias()
        clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h
        clkdev: drop __init from clkdev_add_table()
        clk: update clk API documentation to clarify clk_round_rate()
        clkdev: use clk_hw internally
      2ad7b44f
    • L
      Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 43c9fad9
      Linus Torvalds 提交于
      Pull power management and ACPI updates from Rafael Wysocki:
       "The rework of backlight interface selection API from Hans de Goede
        stands out from the number of commits and the number of affected
        places perspective.  The cpufreq core fixes from Viresh Kumar are
        quite significant too as far as the number of commits goes and because
        they should reduce CPU online/offline overhead quite a bit in the
        majority of cases.
      
        From the new featues point of view, the ACPICA update (to upstream
        revision 20150515) adding support for new ACPI 6 material to ACPICA is
        the one that matters the most as some new significant features will be
        based on it going forward.  Also included is an update of the ACPI
        device power management core to follow ACPI 6 (which in turn reflects
        the Windows' device PM implementation), a PM core extension to support
        wakeup interrupts in a more generic way and support for the ACPI _CCA
        device configuration object.
      
        The rest is mostly fixes and cleanups all over and some documentation
        updates, including new DT bindings for Operating Performance Points.
      
        There is one fix for a regression introduced in the 4.1 cycle, but it
        adds quite a number of lines of code, it wasn't really ready before
        Thursday and you were on vacation, so I refrained from pushing it on
        the last minute for 4.1.
      
        Specifics:
      
         - ACPICA update to upstream revision 20150515 including basic support
           for ACPI 6 features: new ACPI tables introduced by ACPI 6 (STAO,
           XENV, WPBT, NFIT, IORT), changes related to the other tables (DTRM,
           FADT, LPIT, MADT), new predefined names (_BTH, _CR3, _DSD, _LPI,
           _MTL, _PRR, _RDI, _RST, _TFP, _TSN), fixes and cleanups (Bob Moore,
           Lv Zheng).
      
         - ACPI device power management core code update to follow ACPI 6
           which reflects the ACPI device power management implementation in
           Windows (Rafael J Wysocki).
      
         - rework of the backlight interface selection logic to reduce the
           number of kernel command line options and improve the handling of
           DMI quirks that may be involved in that and to make the code
           generally more straightforward (Hans de Goede).
      
         - fixes for the ACPI Embedded Controller (EC) driver related to the
           handling of EC transactions (Lv Zheng).
      
         - fix for a regression related to the ACPI resources management and
           resulting from a recent change of ACPI initialization code ordering
           (Rafael J Wysocki).
      
         - fix for a system initialization regression related to ACPI
           introduced during the 3.14 cycle and caused by running the code
           that switches the platform over to the ACPI mode too early in the
           initialization sequence (Rafael J Wysocki).
      
         - support for the ACPI _CCA device configuration object related to
           DMA cache coherence (Suravee Suthikulpanit).
      
         - ACPI/APEI fixes and cleanups (Jiri Kosina, Borislav Petkov).
      
         - ACPI battery driver cleanups (Luis Henriques, Mathias Krause).
      
         - ACPI processor driver cleanups (Hanjun Guo).
      
         - cleanups and documentation update related to the ACPI device
           properties interface based on _DSD (Rafael J Wysocki).
      
         - ACPI device power management fixes (Rafael J Wysocki).
      
         - assorted cleanups related to ACPI (Dominik Brodowski, Fabian
           Frederick, Lorenzo Pieralisi, Mathias Krause, Rafael J Wysocki).
      
         - fix for a long-standing issue causing General Protection Faults to
           be generated occasionally on return to user space after resume from
           ACPI-based suspend-to-RAM on 32-bit x86 (Ingo Molnar).
      
         - fix to make the suspend core code return -EBUSY consistently in all
           cases when system suspend is aborted due to wakeup detection (Ruchi
           Kandoi).
      
         - support for automated device wakeup IRQ handling allowing drivers
           to make their PM support more starightforward (Tony Lindgren).
      
         - new tracepoints for suspend-to-idle tracing and rework of the
           prepare/complete callbacks tracing in the PM core (Todd E Brandt,
           Rafael J Wysocki).
      
         - wakeup sources framework enhancements (Jin Qian).
      
         - new macro for noirq system PM callbacks (Grygorii Strashko).
      
         - assorted cleanups related to system suspend (Rafael J Wysocki).
      
         - cpuidle core cleanups to make the code more efficient (Rafael J
           Wysocki).
      
         - powernv/pseries cpuidle driver update (Shilpasri G Bhat).
      
         - cpufreq core fixes related to CPU online/offline that should reduce
           the overhead of these operations quite a bit, unless the CPU in
           question is physically going away (Viresh Kumar, Saravana Kannan).
      
         - serialization of cpufreq governor callbacks to avoid race
           conditions in some cases (Viresh Kumar).
      
         - intel_pstate driver fixes and cleanups (Doug Smythies, Prarit
           Bhargava, Joe Konno).
      
         - cpufreq driver (arm_big_little, cpufreq-dt, qoriq) updates (Sudeep
           Holla, Felipe Balbi, Tang Yuantian).
      
         - assorted cleanups in cpufreq drivers and core (Shailendra Verma,
           Fabian Frederick, Wang Long).
      
         - new Device Tree bindings for representing Operating Performance
           Points (Viresh Kumar).
      
         - updates for the common clock operations support code in the PM core
           (Rajendra Nayak, Geert Uytterhoeven).
      
         - PM domains core code update (Geert Uytterhoeven).
      
         - Intel Knights Landing support for the RAPL (Running Average Power
           Limit) power capping driver (Dasaratharaman Chandramouli).
      
         - fixes related to the floor frequency setting on Atom SoCs in the
           RAPL power capping driver (Ajay Thomas).
      
         - runtime PM framework documentation update (Ben Dooks).
      
         - cpupower tool fix (Herton R Krzesinski)"
      
      * tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (194 commits)
        cpuidle: powernv/pseries: Auto-promotion of snooze to deeper idle state
        x86: Load __USER_DS into DS/ES after resume
        PM / OPP: Add binding for 'opp-suspend'
        PM / OPP: Allow multiple OPP tables to be passed via DT
        PM / OPP: Add new bindings to address shortcomings of existing bindings
        ACPI: Constify ACPI device IDs in documentation
        ACPI / enumeration: Document the rules regarding the PRP0001 device ID
        ACPI / video: Make acpi_video_unregister_backlight() private
        acpi-video-detect: Remove old API
        toshiba-acpi: Port to new backlight interface selection API
        thinkpad-acpi: Port to new backlight interface selection API
        sony-laptop: Port to new backlight interface selection API
        samsung-laptop: Port to new backlight interface selection API
        msi-wmi: Port to new backlight interface selection API
        msi-laptop: Port to new backlight interface selection API
        intel-oaktrail: Port to new backlight interface selection API
        ideapad-laptop: Port to new backlight interface selection API
        fujitsu-laptop: Port to new backlight interface selection API
        eeepc-laptop: Port to new backlight interface selection API
        dell-wmi: Port to new backlight interface selection API
        ...
      43c9fad9
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · cb8a4dea
      Linus Torvalds 提交于
      Pull trivial tree updates from Jiri Kosina:
       "As usual, mostly comment, kerneldoc and printk() fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        lpfc: Grammar s/an negative/a negative/
        ARM: lib/lib1funcs.S: fix typo s/substractions/subtractions/
        cx25821: cx25821-medusa-reg.h: fix 0x0x prefix
        lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
        rapidio: Fix kerneldoc and comment
        qla4xxx: Fix printk() in qla4_83xx_read_reset_template() and qla4_83xx_pre_loopback_config()
        treewide: Kconfig: fix wording / spelling
        usb/serial: fix grammar in Kconfig help text for FTDI_SIO
        megaraid_sas: fix kerneldoc
        netfilter: ebtables: fix comment grammar
        drm/radeon: fix comment
        isdn: fix grammar in comment
        ARM: KVM: fix comment
      cb8a4dea
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0faef837
      Linus Torvalds 提交于
      Pull livepatching fixes from Jiri Kosina:
      
       - symbol lookup locking fix, from Miroslav Benes
      
       - error handling improvements in case of failure of the module coming
         notifier, from Minfei Huang
      
       - we were too pessimistic when kASLR has been enabled on x86 and were
         dropping address hints on the floor unnecessarily in such case.  Fix
         from Jiri Kosina
      
       - a few other small fixes and cleanups
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: add module locking around kallsyms calls
        livepatch: annotate klp_init() with __init
        livepatch: introduce patch/func-walking helpers
        livepatch: make kobject in klp_object statically allocated
        livepatch: Prevent patch inconsistencies if the coming module notifier fails
        livepatch: match return value to function signature
        x86: kaslr: fix build due to missing ALIGN definition
        livepatch: x86: make kASLR logic more accurate
        x86: introduce kaslr_offset()
      0faef837
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 67db8a80
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
      
       - spurious power/wakeup sysfs files removal for I2C-HID devices, from
         Andrew Duggan
      
       - Logitech M560 support, from Goffredo Baroncelli
      
       - a lot of housekeeping cleanups to hid-lg4ff driver, from Michal Maly
      
       - improved support for Plantronics devices, from Terry Junge
      
       - Sony Motion Controller and Navigation Controller support and
         subsequent cleanups of hid-sony driver, from Frank Praznik and Simon
         Wood
      
       - HW support improvements to the Wacom driver, from Jason Gerecke and
         Ping Cheng
      
       - assorted small cleanups and device ID additions all over the place
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (69 commits)
        HID: cypress: use swap() in cp_report_fixup()
        HID: microsoft: Add Surface Power Cover
        HID: hid-sony: Fix report descriptor for Navigation Controller
        HID: hid-sony: Navigation controller only has 1 LED and no rumble
        HID: hid-sony: Add BT support for Navigation Controller
        HID: wacom: Introduce new 'touch_input' device
        HID: wacom: Split apart 'wacom_setup_pentouch_input_capabilites'
        HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_type
        HID: wacom: Treat features->device_type values as flags
        HID: wacom: Simplify 'wacom_update_name'
        HID: rmi: Disable populating F30 when the touchpad has physical buttons
        HID: plantronics: Update to map volume up/down controls
        HID: sony: PS Move fix report descriptor
        HID: sony: PS3 Move enable LEDs and Rumble via BT
        HID: sony: Add support PS3 Move Battery via BT
        HID: sony: Add quirk for MOTION_CONTROLLER_BT
        HID: sony: Support PS3 Move Controller when connected via Bluetooth
        HID: i2c-hid: Do not set the ACPI companion field in the HID device
        usb, HID: Remove Vernier devices from lsusb and hid_ignore_list
        HID: hidpp: Add driver for mouse logitech M560
        ...
      67db8a80
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia · a394c6a0
      Linus Torvalds 提交于
      Pull PCMCIA update from Dominik Brodowski:
       "A few PCMCIA fixes and cleanups are available in the PCMCIA tree.
      
        Most of them are trivial and self-explanatory.  Of particular note are
        the last three patches which add an important hardware quirk for
        Toshiba ToPIC95 sockets (or BIOS breakage on systems with these
        sockets), fix resource leaks in yenta_socket enable/disable call
        paths, and fix a regression caused by patch 1c6c9b1d since v4.0.
      
        Alan stated he is OK with me pushing this patch upstream.  Once it
        works out well in your tree, I will push it to stable for 4.0/4.1 as
        well"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
        pcmcia: do not break rsrc_nonstatic when handling anonymous cards
        pcmcia: Fix resource leaks in yenta_probe() and _close()
        Disable write buffering on Toshiba ToPIC95
        pcmcia: Convert dev_printk to dev_<level>
        pcmcia/vrc4171: Remove typedefs for enums and struct
        pcmcia: Remove typedef in structs and emum
        pcmcia: Remove typedef tuple_flags
        drivers: pcmcia: electra_cf.c fix checkpatch error and warnings
        drivers: pcmcia: ds.c fix checkpatch errors
        PCMCIA: Remove commented references to dead class_device_create_file()
        drivers/pcmcia/electra_cf.c: add missing iounmap and kfree
        pcmcia: replace open-coded ARRAY_SIZE with macro
      a394c6a0
    • L
      Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · d8133356
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for the v4.2 merge window:
      
        Enumeration
          - Move pci_ari_enabled() to global header (Alex Williamson)
          - Account for ARI in _PRT lookups (Alex Williamson)
          - Remove unused pci_scan_bus_parented() (Yijing Wang)
      
        Resource management
          - Use host bridge _CRS info on systems with >32 bit addressing (Bjorn Helgaas)
          - Use host bridge _CRS info on Foxconn K8M890-8237A (Bjorn Helgaas)
          - Fix pci_address_to_pio() conversion of CPU address to I/O port (Zhichang Yuan)
          - Add pci_bus_addr_t (Yinghai Lu)
      
        PCI device hotplug
          - Wait for pciehp command completion where necessary (Alex Williamson)
          - Drop pointless ACPI-based "slot detection" check (Rafael J. Wysocki)
          - Check ignore_hotplug for all downstream devices (Rafael J. Wysocki)
          - Propagate the "ignore hotplug" setting to parent (Rafael J. Wysocki)
          - Inline pciehp "handle event" functions into the ISR (Bjorn Helgaas)
          - Clean up pciehp debug logging (Bjorn Helgaas)
      
        Power management
          - Remove redundant PCIe port type checking (Yijing Wang)
          - Add dev->has_secondary_link to track downstream PCIe links (Yijing Wang)
          - Use dev->has_secondary_link to find downstream links for ASPM (Yijing Wang)
          - Drop __pci_disable_link_state() useless "force" parameter (Bjorn Helgaas)
          - Simplify Clock Power Management setting (Bjorn Helgaas)
      
        Virtualization
          - Add ACS quirks for Intel 9-series PCH root ports (Alex Williamson)
          - Add function 1 DMA alias quirk for Marvell 9120 (Sakari Ailus)
      
        MSI
          - Disable MSI at enumeration even if kernel doesn't support MSI (Michael S. Tsirkin)
          - Remove unused pci_msi_off() (Bjorn Helgaas)
          - Rename msi_set_enable(), msix_clear_and_set_ctrl() (Michael S.  Tsirkin)
          - Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl() (Michael S. Tsirkin)
          - Drop pci_msi_off() calls during probe (Michael S. Tsirkin)
      
        APM X-Gene host bridge driver
          - Add APM X-Gene v1 PCIe MSI/MSIX termination driver (Duc Dang)
          - Add APM X-Gene PCIe MSI DTS nodes (Duc Dang)
          - Disable Configuration Request Retry Status for v1 silicon (Duc Dang)
          - Allow config access to Root Port even when link is down (Duc Dang)
      
        Broadcom iProc host bridge driver
          - Allow override of device tree IRQ mapping function (Hauke Mehrtens)
          - Add BCMA PCIe driver (Hauke Mehrtens)
          - Directly add PCI resources (Hauke Mehrtens)
          - Free resource list after registration (Hauke Mehrtens)
      
        Freescale i.MX6 host bridge driver
          - Add speed change timeout message (Troy Kisky)
          - Rename imx6_pcie_start_link() to imx6_pcie_establish_link() (Bjorn Helgaas)
      
        Freescale Layerscape host bridge driver
          - Use dw_pcie_link_up() consistently (Bjorn Helgaas)
          - Factor out ls_pcie_establish_link() (Bjorn Helgaas)
      
        Marvell MVEBU host bridge driver
          - Remove mvebu_pcie_scan_bus() (Yijing Wang)
      
        NVIDIA Tegra host bridge driver
          - Remove tegra_pcie_scan_bus() (Yijing Wang)
      
        Synopsys DesignWare host bridge driver
          - Consolidate outbound iATU programming functions (Jisheng Zhang)
          - Use iATU0 for cfg and IO, iATU1 for MEM (Jisheng Zhang)
          - Add support for x8 links (Zhou Wang)
          - Wait for link to come up with consistent style (Bjorn Helgaas)
          - Use pci_scan_root_bus() for simplicity (Yijing Wang)
      
        TI DRA7xx host bridge driver
          - Use dw_pcie_link_up() consistently (Bjorn Helgaas)
      
        Miscellaneous
          - Include <linux/pci.h>, not <asm/pci.h> (Bjorn Helgaas)
          - Remove unnecessary #includes of <asm/pci.h> (Bjorn Helgaas)
          - Remove unused pcibios_select_root() (again) (Bjorn Helgaas)
          - Remove unused pci_dma_burst_advice() (Bjorn Helgaas)
          - xen/pcifront: Don't use deprecated function pci_scan_bus_parented() (Arnd Bergmann)"
      
      * tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (58 commits)
        PCI: pciehp: Inline the "handle event" functions into the ISR
        PCI: pciehp: Rename queue_interrupt_event() to pciehp_queue_interrupt_event()
        PCI: pciehp: Make queue_interrupt_event() void
        PCI: xgene: Allow config access to Root Port even when link is down
        PCI: xgene: Disable Configuration Request Retry Status for v1 silicon
        PCI: pciehp: Clean up debug logging
        x86/PCI: Use host bridge _CRS info on systems with >32 bit addressing
        PCI: imx6: Add #define PCIE_RC_LCSR
        PCI: imx6: Use "u32", not "uint32_t"
        PCI: Remove unused pci_scan_bus_parented()
        xen/pcifront: Don't use deprecated function pci_scan_bus_parented()
        PCI: imx6: Add speed change timeout message
        PCI/ASPM: Simplify Clock Power Management setting
        PCI: designware: Wait for link to come up with consistent style
        PCI: layerscape: Factor out ls_pcie_establish_link()
        PCI: layerscape: Use dw_pcie_link_up() consistently
        PCI: dra7xx: Use dw_pcie_link_up() consistently
        x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A
        PCI: pciehp: Wait for hotplug command completion where necessary
        PCI: Remove unused pci_dma_burst_advice()
        ...
      d8133356
    • L
      Merge tag 'hwmon-for-linus-v4.2' of... · 234a56c8
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
      
       - new driver for Microchip TC74
      
       - support for ncpXXwf104 added to ntc_thermistor driver
      
       - minor cleanup
      
      * tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: add driver for Microchip TC74
        hwmon: (ntc_thermistor) Improve precision of resistance calculation
        hwmon: (ntc_thermistor) fix iio raw to microvolts conversion
        hwmon: (atxp1) Drop auto-detection
        hwmon: (atxp1) Drop FSF mailing address
        hwmon: Allow compile test of GPIO consumers if !GPIOLIB
        hwmon: (sht15) Constify platform_device_id
        hwmon: (max197) Constify platform_device_id
        hwmon: (ntc_thermistor) Add support for ncpXXwf104
      234a56c8
    • L
      Merge tag 'mmc-v4.2' of git://git.linaro.org/people/ulf.hansson/mmc · a57f14ba
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "Here are the changes for MMC for v4.2.
      
        MMC core:
         - Fix an error path in the mmc block layer
         - Fix PM domain attachment for the SDIO bus
         - Add support for driver strength selection
         - Increase a delay to let voltage stabilize
         - Add support for disabling write-protect detection
         - Add facility to support re-tuning
         - Re-tune and retry in the recovery path
         - Add reset option for SDIO
         - Consolidations and clean-ups
      
        MMC host:
         - Add Mediatek MMC driver
         - Constify platform_device_id for a couple of hosts
         - Fix modalias to make module auto-loading work for a couple of hosts
         - sdhci: Add support for sdhci-arasan4.9a
         - sdhci: Fix low memory corruption
         - sdhci: Restore behavior while creating OCR mask
         - sdhci: Add a callback to select drive strength
         - sdhci: Fix driver type B and D handling
         - sdhci: Add support for drive strength selection for SPT
         - sdhci: Enable HS400 for some Intel host controllers
         - sdhci: Convert to use the new re-tuning facility
         - sdhci: Various minor fixes and clean-ups
         - dw_mmc: Add support for hi6220
         - dw_mmc: Use core to handle absent write protect line
         - dw_mmc: Add support to switch voltage
         - tmio: Some fixes and modernizations
         - sh_mmcif: Improve clock rate calculation"
      
      * tag 'mmc-v4.2' of git://git.linaro.org/people/ulf.hansson/mmc: (98 commits)
        mmc: queue: prevent soft lockups on PREEMPT=n
        mmc: mediatek: Add PM support for MMC driver
        mmc: mediatek: Add Mediatek MMC driver
        mmc: dt-bindings: add Mediatek MMC bindings
        mmc: card: Fixup request missing in mmc_blk_issue_rw_rq
        mmc: sdhci: fix low memory corruption
        mmc: sdhci-pci: Change AMD SDHCI quirk application scope
        i2c-piix4: Use Macro for AMD CZ SMBus device ID
        pci_ids: Add AMD KERNCZ device ID support
        mmc: queue: use swap() in mmc_queue_thread()
        mmc: dw_mmc: insmod followed by rmmod will hung for eMMC
        mmc: sdhci: Restore behavior while creating OCR mask
        mmc: sdhci-pxav3: fix device wakeup initialization
        mmc: core: Attach PM domain prior probing of SDIO func driver
        mmc: core: Remove redundant ->power_restore() callback for SD
        mmc: core: Remove redundant ->power_restore() callback for MMC
        mmc: sdhci-bcm2835: Actually enable the clock
        mmc: sdhci-bcm2835: Clean up platform allocations if sdhci init fails.
        mmc: sdhci-of-esdhc: enable interrupt mode to detect card
        mmc: sdhci-esdhc-imx: add quirk SDHCI_QUIRK2_BROKEN_HS200 for imx6qdl
        ...
      a57f14ba
    • L
      Merge tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 10b4b096
      Linus Torvalds 提交于
      Pull gpio updates from Linus Walleij:
       "This is the big bulk of GPIO changes queued for the v4.2 kernel
        series:
      
         - a big set of cleanups to the aged sysfs interface from Johan
           Hovold.  To get these in, v4.1-rc3 was merged into the tree as the
           first patch in that series had to go into stable.  This makes the
           locking much more fine-grained (get rid of the "big GPIO lock(s)"
           and store states in the GPIO descriptors.
      
         - rename gpiod_[g|s]et_array() to gpiod_[g|s]et_array_value() to
           avoid confusions.
      
         - New drivers for:
            * NXP LPC18xx (currently LPC1850)
            * NetLogic XLP
            * Broadcom STB SoC's
            * Axis ETRAXFS
            * Zynq Ultrascale+ (subdriver)
      
         - ACPI:
            * make it possible to retrieve GpioInt resources from a GPIO
              device using acpi_dev_gpio_irq_get()
            * merge some dependent I2C changes exploiting this.
            * support the ARM X-Gene GPIO standby driver.
      
         - make it possible for the generic GPIO driver to read back the value
           set registers to reflect current status.
      
         - loads of OMAP IRQ handling fixes.
      
         - incremental improvements to Kona, max732x, OMAP, MXC, RCAR,
           PCA953x, STP-XWAY, PCF857x, Crystalcove, TB10x.
      
         - janitorial (constification, checkpatch cleanups)"
      
      * tag 'gpio-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (71 commits)
        gpio: Fix checkpatch.pl issues
        gpio: pcf857x: handle only enabled irqs
        gpio / ACPI: Return -EPROBE_DEFER if the gpiochip was not found
        GPIO / ACPI: export acpi_gpiochip_request(free)_interrupts for module use
        gpio: improve error reporting on own descriptors
        gpio: promote own request failure to pr_err()
        gpio: Added support to Zynq Ultrascale+ MPSoC
        gpio: add ETRAXFS GPIO driver
        fix documentation after renaming gpiod_set_array to gpiod_set_array_value
        gpio: Add GPIO support for Broadcom STB SoCs
        gpio: xgene: add ACPI support for APM X-Gene GPIO standby driver
        gpio: tb10x: Drop unneeded free_irq() call
        gpio: crystalcove: set IRQCHIP_SKIP_SET_WAKE for the irqchip
        gpio: stp-xway: Use the of_property_read_u32 helper
        gpio: pcf857x: Check for irq_set_irq_wake() failures
        gpio-stp-xway: Fix enabling the highest bit of the PHY LEDs
        gpio: Prevent an integer overflow in the pca953x driver
        gpio: omap: rework omap_gpio_irq_startup to handle current pin state properly
        gpio: omap: rework omap_gpio_request to touch only gpio specific registers
        gpio: omap: rework omap_x_irq_shutdown to touch only irqs specific registers
        ...
      10b4b096
    • L
      Merge tag 'pwm/for-4.2-rc1' of... · c70c5fb2
      Linus Torvalds 提交于
      Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This has a couple of fixes for Atmel, Samsung and Broadcom drivers.
      
        Some preparatory patches for more upcoming Intel work is included as
        well"
      
      * tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: lpss: pci: Add support for Broxton platform
        pwm: bcm-kona: Don't set polarity in probe
        pwm: Add pwmchip_add_with_polarity() API
        pwm: atmel: Fix incorrect CDTY value after disabling
        pwm: atmel: Fix incorrect CDTY value after enabling
        pwm: samsung: Use MODULE_DEVICE_TABLE() to include OF modalias
        pwm: Add support to remove registered consumer lookup tables
      c70c5fb2
  3. 23 6月, 2015 8 次提交