1. 29 7月, 2016 7 次提交
    • S
      vfs: ioctl: prevent double-fetch in dedupe ioctl · 10eec60c
      Scott Bauer 提交于
      This prevents a double-fetch from user space that can lead to to an
      undersized allocation and heap overflow.
      
      Fixes: 54dbc151 ("vfs: hoist the btrfs deduplication ioctl to the vfs")
      Signed-off-by: NScott Bauer <sbauer@plzdonthack.me>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      10eec60c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 884316de
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
      
       - new hid-alps driver for ALPS Touchpad-Stick device, from Masaki Ota
      
       - much improved and generalized HID led handling, and merge of
         specialized hid-thingm driver into this generic hid-led one, from
         Heiner Kallweit
      
       - i2c-hid power management improvements from Fu Zhonghui and Guohua
         Zhong
      
       - uhid initialization race fix from Roderick Colenbrander
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
        HID: add usb device id for Apple Magic Keyboard
        HID: hid-led: fix Delcom support on big endian systems
        HID: hid-led: add support for Greynut Luxafor
        HID: hid-led: add support for Delcom Visual Signal Indicator G2
        HID: hid-led: remove report id from struct hidled_config
        HID: alps: a few cleanups
        HID: remove ThingM blink(1) driver
        HID: hid-led: add support for ThingM blink(1)
        HID: hid-led: add support for reading from LED devices
        HID: hid-led: add support for devices with multiple independent LEDs
        HID: i2c-hid: set power sleep before shutdown
        HID: alps: match alps devices in core
        HID: thingm: simplify debug output code
        HID: alps: pass correct sizes to hid_hw_raw_request()
        HID: alps: struct u1_dev *priv is internal to the driver
        HID: add Alps I2C HID Touchpad-Stick support
        HID: led: fix config
        usb: misc: remove outdated USB LED driver
        HID: migrate USB LED driver from usb misc to hid
        HID: i2c_hid: enable i2c-hid devices to suspend/resume asynchronously
        ...
      884316de
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 69c42894
      Linus Torvalds 提交于
      Pull trivial tree updates from Jiri Kosina.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        fat: fix error message for bogus number of directory entries
        fat: fix typo s/supeblock/superblock/
        ASoC: max9877: Remove unused function declaration
        dw2102: don't output spurious blank lines to the kernel log
        init: fix Kconfig text
        ARM: io: fix comment grammar
        ocfs: fix ocfs2_xattr_user_get() argument name
        scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
      69c42894
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 76d5b28b
      Linus Torvalds 提交于
      Pull quota update from Jan Kara:
       "time64 support for quota"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: use time64_t internally
      76d5b28b
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 71e9dcc0
      Linus Torvalds 提交于
      Pull random driver fix from Ted Ts'o:
       "Fix a boot failure on systems with non-contiguous NUMA id's"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: use for_each_online_node() to iterate over NUMA nodes
      71e9dcc0
    • L
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 6784725a
      Linus Torvalds 提交于
      Pull vfs updates from Al Viro:
       "Assorted cleanups and fixes.
      
        Probably the most interesting part long-term is ->d_init() - that will
        have a bunch of followups in (at least) ceph and lustre, but we'll
        need to sort the barrier-related rules before it can get used for
        really non-trivial stuff.
      
        Another fun thing is the merge of ->d_iput() callers (dentry_iput()
        and dentry_unlink_inode()) and a bunch of ->d_compare() ones (all
        except the one in __d_lookup_lru())"
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
        fs/dcache.c: avoid soft-lockup in dput()
        vfs: new d_init method
        vfs: Update lookup_dcache() comment
        bdev: get rid of ->bd_inodes
        Remove last traces of ->sync_page
        new helper: d_same_name()
        dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_depends()
        vfs: clean up documentation
        vfs: document ->d_real()
        vfs: merge .d_select_inode() into .d_real()
        unify dentry_iput() and dentry_unlink_inode()
        binfmt_misc: ->s_root is not going anywhere
        drop redundant ->owner initializations
        ufs: get rid of redundant checks
        orangefs: constify inode_operations
        missed comment updates from ->direct_IO() prototype change
        file_inode(f)->i_mapping is f->f_mapping
        trim fsnotify hooks a bit
        9p: new helper - v9fs_parent_fid()
        debugfs: ->d_parent is never NULL or negative
        ...
      6784725a
    • L
      Merge branch 'salted-string-hash' · 554828ee
      Linus Torvalds 提交于
      This changes the vfs dentry hashing to mix in the parent pointer at the
      _beginning_ of the hash, rather than at the end.
      
      That actually improves both the hash and the code generation, because we
      can move more of the computation to the "static" part of the dcache
      setup, and do less at lookup runtime.
      
      It turns out that a lot of other hash users also really wanted to mix in
      a base pointer as a 'salt' for the hash, and so the slightly extended
      interface ends up working well for other cases too.
      
      Users that want a string hash that is purely about the string pass in a
      'salt' pointer of NULL.
      
      * merge branch 'salted-string-hash':
        fs/dcache.c: Save one 32-bit multiply in dcache lookup
        vfs: make the string hashes salt the hash
      554828ee
  2. 28 7月, 2016 23 次提交
    • J
      Merge branch 'for-4.8/hid-led' into for-linus · 8c2f421c
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-thingm.c
      8c2f421c
    • J
      Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid',... · e82a82c1
      Jiri Kosina 提交于
      Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus
      e82a82c1
    • T
      random: use for_each_online_node() to iterate over NUMA nodes · 59b8d4f1
      Theodore Ts'o 提交于
      This fixes a crash on s390 with fake NUMA enabled.
      Reported-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Fixes: 1e7f583a ("random: make /dev/urandom scalable for silly userspace programs")
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      59b8d4f1
    • L
      Add braces to avoid "ambiguous ‘else’" compiler warnings · 194dc870
      Linus Torvalds 提交于
      Some of our "for_each_xyz()" macro constructs make gcc unhappy about
      lack of braces around if-statements inside or outside the loop, because
      the loop construct itself has a "if-then-else" statement inside of it.
      
      The resulting warnings look something like this:
      
        drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_dump_lrc’:
        drivers/gpu/drm/i915/i915_debugfs.c:2103:6: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses]
           if (ctx != dev_priv->kernel_context)
              ^
      
      even if the code itself is fine.
      
      Since the warning is fairly easy to avoid by adding a braces around the
      if-statement near the for_each_xyz() construct, do so, rather than
      disabling the otherwise potentially useful warning.
      
      (The if-then-else statements used in the "for_each_xyz()" constructs are
      designed to be inherently safe even with no braces, but in this case
      it's quite understandable that gcc isn't really able to tell that).
      
      This finally leaves the standard "allmodconfig" build with just a
      handful of remaining warnings, so new and valid warnings hopefully will
      stand out.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      194dc870
    • L
      Disable "frame-address" warning · 124a3d88
      Linus Torvalds 提交于
      Newer versions of gcc warn about the use of __builtin_return_address()
      with a non-zero argument when "-Wall" is specified:
      
        kernel/trace/trace_irqsoff.c: In function ‘stop_critical_timings’:
        kernel/trace/trace_irqsoff.c:433:86: warning: calling ‘__builtin_return_address’ with a nonzero argument is unsafe [-Wframe-address]
           stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
        [ .. repeats a few times for other similar cases .. ]
      
      It is true that a non-zero argument is somewhat dangerous, and we do not
      actually have very many uses of that in the kernel - but the ftrace code
      does use it, and as Stephen Rostedt says:
      
       "We are well aware of the danger of using __builtin_return_address() of
        > 0.  In fact that's part of the reason for having the "thunk" code in
        x86 (See arch/x86/entry/thunk_{64,32}.S).  [..] it adds extra frames
        when tracking irqs off sections, to prevent __builtin_return_address()
        from accessing bad areas.  In fact the thunk_32.S states: 'Trampoline to
        trace irqs off.  (otherwise CALLER_ADDR1 might crash)'."
      
      For now, __builtin_return_address() with a non-zero argument is the best
      we can do, and the warning is not helpful and can end up making people
      miss other warnings for real problems.
      
      So disable the frame-address warning on compilers that need it.
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      124a3d88
    • L
      Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 8448cefe
      Linus Torvalds 提交于
      Pull HSI updates from Sebastian Reichel:
      
       - proper runtime pm support for omap-ssi and ssi-protocol
      
       - misc fixes
      
      * tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: (24 commits)
        HSI: omap_ssi: drop pm_runtime_irq_safe
        HSI: omap_ssi_port: use rpm autosuspend API
        HSI: omap_ssi: call msg->complete() from process context
        HSI: omap_ssi_port: ensure clocks are kept enabled during transfer
        HSI: omap_ssi_port: replace pm_runtime_put_sync with non-sync variant
        HSI: omap_ssi_port: avoid calling runtime_pm_*_sync inside spinlock
        HSI: omap_ssi_port: avoid pm_runtime_get_sync in ssi_start_dma and ssi_start_pio
        HSI: omap_ssi_port: switch to threaded pio irq
        HSI: omap_ssi_core: remove pm_runtime_get_sync call from tasklet
        HSI: omap_ssi_core: use pm_runtime_put instead of pm_runtime_put_sync
        HSI: omap_ssi_port: prepare start_tx/stop_tx for blocking pm_runtime calls
        HSI: core: switch port event notifier from atomic to blocking
        HSI: omap_ssi_port: replace wkin_cken with atomic bitmap operations
        HSI: omap_ssi: convert cawake irq handler to thread
        HSI: ssi_protocol: fix ssip_xmit invocation
        HSI: ssi_protocol: replace spin_lock with spin_lock_bh
        HSI: ssi_protocol: avoid ssi_waketest call with held spinlock
        HSI: omap_ssi: do not reset module
        HSI: omap_ssi_port: remove useless newline
        hsi: Only descend into hsi directory when CONFIG_HSI is set
        ...
      8448cefe
    • L
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 818e607b
      Linus Torvalds 提交于
      Pull random driver updates from Ted Ts'o:
       "A number of improvements for the /dev/random driver; the most
        important is the use of a ChaCha20-based CRNG for /dev/urandom, which
        is faster, more efficient, and easier to make scalable for
        silly/abusive userspace programs that want to read from /dev/urandom
        in a tight loop on NUMA systems.
      
        This set of patches also improves entropy gathering on VM's running on
        Microsoft Azure, and will take advantage of a hw random number
        generator (if present) to initialize the /dev/urandom pool"
      
      (It turns out that the random tree hadn't been in linux-next this time
      around, because it had been dropped earlier as being too quiet.  Oh
      well).
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: strengthen input validation for RNDADDTOENTCNT
        random: add backtracking protection to the CRNG
        random: make /dev/urandom scalable for silly userspace programs
        random: replace non-blocking pool with a Chacha20-based CRNG
        random: properly align get_random_int_hash
        random: add interrupt callback to VMBus IRQ handler
        random: print a warning for the first ten uninitialized random users
        random: initialize the non-blocking pool via add_hwgenerator_randomness()
      818e607b
    • L
      Merge tag 'media/v4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ff9a082f
      Linus Torvalds 提交于
      Pull media documentation updates from Mauro Carvalho Chehab:
       "This patch series does the conversion of all media documentation stuff
        to Restrutured Text markup format and add them to the
        Documentation/index.rst file.
      
        The media documentation was grouped into 4 books:
      
          - media uAPI
          - media kAPI
          - V4L driver-specific documentation
          - DVB driver-specific documentation
      
        It also contains several documentation improvements and one fixup
        patch for a core issue with cropcap.
      
        PS.  After this patch series, the media DocBook is deprecated and
        should be removed.  I'll add such patch on a future pull request"
      
      * tag 'media/v4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (322 commits)
        [media] cx23885-cardlist.rst: add a new card
        [media] doc-rst: add some needed escape codes
        [media] doc-rst: kapi: use :c:func: instead of :cpp:func
        doc-rst: kernel-doc: fix a change introduced by mistake
        [media] v4l2-ioctl.h add debug info for struct v4l2_ioctl_ops
        [media] dvb_ringbuffer.h: some documentation improvements
        [media] v4l2-ctrls.h: fully document the header file
        [media] doc-rst: Fix some typedef ugly warnings
        [media] doc-rst: reorganize the kAPI v4l2 chapters
        [media] rename v4l2-framework.rst to v4l2-intro.rst
        [media] move V4L2 clocks to a separate .rst file
        [media] v4l2-fh.rst: add cross references and markups
        [media] v4l2-fh.rst: add fh contents from v4l2-framework.rst
        [media] v4l2-fh.h: add documentation for it
        [media] v4l2-event.rst: add cross-references and markups
        [media] v4l2-event.h: document all functions
        [media] v4l2-event.rst: add text from v4l2-framework.rst
        [media] v4l2-framework.rst: remove videobuf quick chapter
        [media] v4l2-dev: add cross-references and improve markup
        [media] doc-rst: move v4l2-dev doc to a separate file
        ...
      ff9a082f
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 6a492b0f
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This update includes the usual round of driver updates (fcoe, lpfc,
        ufs, qla2xxx, hisi_sas).  The most important other change is removing
        the flag to allow non-blk_mq on a per host basis (it's unused); there
        is still a global module parameter for all of SCSI just in case.
      
        The rest are an assortment of minor fixes and typo updates"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (101 commits)
        scsi:libsas: fix oops caused by assigning a freed task to ->lldd_task
        fnic: pci_dma_mapping_error() doesn't return an error code
        scsi: lpfc: avoid harmless comparison warning
        fcoe: implement FIP VLAN responder
        fcoe: Rename 'fip_frame' to 'fip_vn2vn_notify_frame'
        lpfc: call lpfc_sli_validate_fcp_iocb() with the hbalock held
        scsi: ufs: remove unnecessary goto label
        hpsa: change hpsa_passthru_ioctl timeout
        hpsa: correct skipping masked peripherals
        qla2xxx: Update driver version to 8.07.00.38-k
        qla2xxx: Fix BBCR offset
        qla2xxx: Fix duplicate message id.
        qla2xxx: Disable the adapter and skip error recovery in case of register disconnect.
        qla2xxx: Separate ISP type bits out from device type.
        qla2xxx: Correction to function qla26xx_dport_diagnostics().
        qla2xxx: Add support to handle Loop Init error Asynchronus event.
        qla2xxx: Let DPORT be enabled purely by nvram.
        qla2xxx: Add bsg interface to support statistics counter reset.
        qla2xxx: Add bsg interface to support D_Port Diagnostics.
        qla2xxx: Check for device state before unloading the driver.
        ...
      6a492b0f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · d85486d4
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Updates for the input subsystem.  This contains the following new
        drivers promised in the last merge window:
      
         - driver for touchscreen controller found in Surface 3
         - driver for Pegasus Notetaker tablet
         - driver for Atmel Captouch Buttons
         - driver for Raydium I2C touchscreen controllers
         - powerkey driver for HISI 65xx SoC
      
        plus a few fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: tty/vt/keyboard - use memdup_user()
        Input: pegasus_notetaker - set device mode in reset_resume() if in use
        Input: pegasus_notetaker - cancel workqueue's work in suspend()
        Input: pegasus_notetaker - fix usb_autopm calls to be balanced
        Input: pegasus_notetaker - handle usb control msg errors
        Input: wacom_w8001 - handle errors from input_mt_init_slots()
        Input: wacom_w8001 - resolution wasn't set for ABS_MT_POSITION_X/Y
        Input: pixcir_ts - add support for axis inversion / swapping
        Input: icn8318 - use of_touchscreen helpers for inverting / swapping axes
        Input: edt-ft5x06 - add support for inverting / swapping axes
        Input: of_touchscreen - add support for inverted / swapped axes
        Input: synaptics-rmi4 - use the RMI_F11_REL_BYTES define in rmi_f11_rel_pos_report
        Input: synaptics-rmi4 - remove unneeded variable
        Input: synaptics-rmi4 - remove pointer to rmi_function in f12_data
        Input: synaptics-rmi4 - support regulator supplies
        Input: raydium_i2c_ts - check CRC of incoming packets
        Input: xen-kbdfront - prefer xenbus_write() over xenbus_printf() where possible
        Input: fix a double word "is is" in include/linux/input.h
        Input: add powerkey driver for HISI 65xx SoC
        Input: apanel - spelling mistake - "skiping" -> "skipping"
        ...
      d85486d4
    • L
      Merge branch 'i2c/for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 66304207
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       "Here is the I2C pull request for 4.8:
      
         - the core and i801 driver gained support for SMBus Host Notify
      
         - core support for more than one address in DT
      
         - i2c_add_adapter() has now better error messages.  We can remove all
           error messages from drivers calling it as a next step.
      
         - bigger updates to rk3x driver to support rk3399 SoC
      
         - the at24 eeprom driver got refactored and can now read special
           variants with unique serials or fixed MAC addresses.
      
        The rest is regular driver updates and bugfixes"
      
      * 'i2c/for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (66 commits)
        i2c: i801: use IS_ENABLED() instead of checking for built-in or module
        Documentation: i2c: slave: give proper example for pm usage
        Documentation: i2c: slave: describe buffer problems a bit better
        i2c: bcm2835: Don't complain on -EPROBE_DEFER from getting our clock
        i2c: i2c-smbus: drop useless stubs
        i2c: efm32: fix a failure path in efm32_i2c_probe()
        Revert "i2c: core: Cleanup I2C ACPI namespace"
        Revert "i2c: core: Add function for finding the bus speed from ACPI"
        i2c: Update the description of I2C_SMBUS
        i2c: i2c-smbus: fix i2c_handle_smbus_host_notify documentation
        eeprom: at24: tweak the loop_until_timeout() macro
        eeprom: at24: add support for at24mac series
        eeprom: at24: support reading the serial number for 24csxx
        eeprom: at24: platform_data: use BIT() macro
        eeprom: at24: split at24_eeprom_write() into specialized functions
        eeprom: at24: split at24_eeprom_read() into specialized functions
        eeprom: at24: hide the read/write loop behind a macro
        eeprom: at24: call read/write functions via function pointers
        eeprom: at24: coding style fixes
        eeprom: at24: move at24_read() below at24_eeprom_write()
        ...
      66304207
    • L
      Merge tag 'spi-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 7ae0ae4a
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "Quite a lot of cleanup and maintainence work going on this release in
        various drivers, and also a fix for a nasty locking issue in the core:
      
         - A fix for locking issues when external drivers explicitly locked
           the bus with spi_bus_lock() - we were using the same lock to both
           control access to the physical bus in multi-threaded I/O operations
           and exclude multiple callers.
      
           Confusion between these two caused us to have scenarios where we
           were dropping locks.  These are fixed by splitting into two
           separate locks like should have been done originally, making
           everything much clearer and correct.
      
         - Support for DMA in spi_flash_read().
      
         - Support for instantiating spidev on ACPI systems, including some
           test devices used in Windows validation.
      
         - Use of the core DMA mapping functionality in the McSPI driver.
      
         - Start of support for ThunderX SPI controllers, involving a very big
           set of changes to the Cavium driver.
      
         - Support for Braswell, Exynos 5433, Kaby Lake, Merrifield, RK3036,
           RK3228, RK3368 controllers"
      
      * tag 'spi-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (64 commits)
        spi: Split bus and I/O locking
        spi: octeon: Split driver into Octeon specific and common parts
        spi: octeon: Move include file from arch/mips to drivers/spi
        spi: octeon: Put register offsets into a struct
        spi: octeon: Store system clock freqency in struct octeon_spi
        spi: octeon: Convert driver to use readq()/writeq() functions
        spi: pic32-sqi: fixup wait_for_completion_timeout return handling
        spi: pic32: fixup wait_for_completion_timeout return handling
        spi: rockchip: limit transfers to (64K - 1) bytes
        spi: xilinx: Return IRQ_NONE if no interrupts were detected
        spi: xilinx: Handle errors from platform_get_irq()
        spi: s3c64xx: restore removed comments
        spi: s3c64xx: add Exynos5433 compatible for ioclk handling
        spi: s3c64xx: use error code from clk_prepare_enable()
        spi: s3c64xx: rename goto labels to meaningful names
        spi: s3c64xx: document the clocks and the clock-name property
        spi: s3c64xx: add exynos5433 spi compatible
        spi: s3c64xx: fix reference leak to master in s3c64xx_spi_remove()
        spi: spi-sh: Remove deprecated create_singlethread_workqueue
        spi: spi-topcliff-pch: Remove deprecated create_singlethread_workqueue
        ...
      7ae0ae4a
    • L
      Merge tag 'leds_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · 607e11ab
      Linus Torvalds 提交于
      Pull LED updates from Jacek Anaszewski:
       "New LED class driver:
         - LED driver for TI LP3952 6-Channel Color LED
      
        LED core improvements:
         - Only descend into leds directory when CONFIG_NEW_LEDS is set
         - Add no-op gpio_led_register_device when LED subsystem is disabled
         - MAINTAINERS: Add file patterns for led device tree bindings
      
        LED Trigger core improvements:
         - return error if invalid trigger name is provided via sysfs
      
        LED class drivers improvements
         - is31fl32xx: define complete i2c_device_id table
         - is31fl32xx: fix typo in id and match table names
         - leds-gpio: Set of_node for created LED devices
         - pca9532: Add device tree support
      
        Conversion of IDE trigger to common disk trigger:
         - leds: convert IDE trigger to common disk trigger
         - leds: documentation: 'ide-disk' to 'disk-activity'
         - unicore32: use the new LED disk activity trigger
         - parisc: use the new LED disk activity trigger
         - mips: use the new LED disk activity trigger
         - arm: use the new LED disk activity trigger
         - powerpc: use the new LED disk activity trigger"
      
      * tag 'leds_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: is31fl32xx: define complete i2c_device_id table
        leds: is31fl32xx: fix typo in id and match table names
        leds: LED driver for TI LP3952 6-Channel Color LED
        leds: leds-gpio: Set of_node for created LED devices
        leds: triggers: return error if invalid trigger name is provided via sysfs
        leds: Only descend into leds directory when CONFIG_NEW_LEDS is set
        leds: Add no-op gpio_led_register_device when LED subsystem is disabled
        unicore32: use the new LED disk activity trigger
        parisc: use the new LED disk activity trigger
        mips: use the new LED disk activity trigger
        arm: use the new LED disk activity trigger
        powerpc: use the new LED disk activity trigger
        leds: documentation: 'ide-disk' to 'disk-activity'
        leds: convert IDE trigger to common disk trigger
        leds: pca9532: Add device tree support
        MAINTAINERS: Add file patterns for led device tree bindings
      607e11ab
    • L
      Merge tag 'for-linus-4.8' of git://git.code.sf.net/p/openipmi/linux-ipmi · 78d51aee
      Linus Torvalds 提交于
      Pull IPMI updates from Corey Minyard:
       "Remove some old cruft that was disabled by default a long time ago.
      
        No modern hardware should need this, and anybody who really doesn't
        have something to automatically detect IPMI can add the device by hand
        on the module commandline or hot add it"
      
      * tag 'for-linus-4.8' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: remove trydefaults parameter and default init
      78d51aee
    • L
      Merge tag 'edac_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c79a14de
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
       "This last cycle, Thor was busy adding Arria10 eth FIFO support to the
        altera_edac driver along with other improvements.  We have two
        cleanups/fixes too.
      
        Summary:
      
         - Altera Arria10 ethernet FIFO buffer support (Thor Thayer)
      
         - Minor cleanups"
      
      * tag 'edac_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        ARM: dts: Add Arria10 Ethernet EDAC devicetree entry
        EDAC, altera: Add Arria10 Ethernet EDAC support
        EDAC, altera: Add Arria10 ECC memory init functions
        Documentation: dt: socfpga: Add Arria10 Ethernet binding
        EDAC, altera: Drop some ifdeffery
        EDAC, altera: Add panic flag check to A10 IRQ
        EDAC, altera: Check parent status for Arria10 EDAC block
        EDAC, altera: Make all private data structures static
        EDAC: Correct channel count limit
        EDAC, amd64_edac: Init opstate at the proper time during init
        EDAC, altera: Handle Arria10 SDRAM child node
        EDAC, altera: Add ECC Manager IRQ controller support
        Documentation: dt: socfpga: Add interrupt-controller to ecc-manager
      c79a14de
    • L
      Disable "maybe-uninitialized" warning globally · 6e8d666e
      Linus Torvalds 提交于
      Several build configurations had already disabled this warning because
      it generates a lot of false positives.  But some had not, and it was
      still enabled for "allmodconfig" builds, for example.
      
      Looking at the warnings produced, every single one I looked at was a
      false positive, and the warnings are frequent enough (and big enough)
      that they can easily hide real problems that you don't notice in the
      noise generated by -Wmaybe-uninitialized.
      
      The warning is good in theory, but this is a classic case of a warning
      that causes more problems than the warning can solve.
      
      If gcc gets better at avoiding false positives, we may be able to
      re-enable this warning.  But as is, we're better off without it, and I
      want to be able to see the *real* warnings.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6e8d666e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 468fc7ed
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
      
       1) Unified UDP encapsulation offload methods for drivers, from
          Alexander Duyck.
      
       2) Make DSA binding more sane, from Andrew Lunn.
      
       3) Support QCA9888 chips in ath10k, from Anilkumar Kolli.
      
       4) Several workqueue usage cleanups, from Bhaktipriya Shridhar.
      
       5) Add XDP (eXpress Data Path), essentially running BPF programs on RX
          packets as soon as the device sees them, with the option to mirror
          the packet on TX via the same interface.  From Brenden Blanco and
          others.
      
       6) Allow qdisc/class stats dumps to run lockless, from Eric Dumazet.
      
       7) Add VLAN support to b53 and bcm_sf2, from Florian Fainelli.
      
       8) Simplify netlink conntrack entry layout, from Florian Westphal.
      
       9) Add ipv4 forwarding support to mlxsw spectrum driver, from Ido
          Schimmel, Yotam Gigi, and Jiri Pirko.
      
      10) Add SKB array infrastructure and convert tun and macvtap over to it.
          From Michael S Tsirkin and Jason Wang.
      
      11) Support qdisc packet injection in pktgen, from John Fastabend.
      
      12) Add neighbour monitoring framework to TIPC, from Jon Paul Maloy.
      
      13) Add NV congestion control support to TCP, from Lawrence Brakmo.
      
      14) Add GSO support to SCTP, from Marcelo Ricardo Leitner.
      
      15) Allow GRO and RPS to function on macsec devices, from Paolo Abeni.
      
      16) Support MPLS over IPV4, from Simon Horman.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1622 commits)
        xgene: Fix build warning with ACPI disabled.
        be2net: perform temperature query in adapter regardless of its interface state
        l2tp: Correctly return -EBADF from pppol2tp_getname.
        net/mlx5_core/health: Remove deprecated create_singlethread_workqueue
        net: ipmr/ip6mr: update lastuse on entry change
        macsec: ensure rx_sa is set when validation is disabled
        tipc: dump monitor attributes
        tipc: add a function to get the bearer name
        tipc: get monitor threshold for the cluster
        tipc: make cluster size threshold for monitoring configurable
        tipc: introduce constants for tipc address validation
        net: neigh: disallow transition to NUD_STALE if lladdr is unchanged in neigh_update()
        MAINTAINERS: xgene: Add driver and documentation path
        Documentation: dtb: xgene: Add MDIO node
        dtb: xgene: Add MDIO node
        drivers: net: xgene: ethtool: Use phy_ethtool_gset and sset
        drivers: net: xgene: Use exported functions
        drivers: net: xgene: Enable MDIO driver
        drivers: net: xgene: Add backward compatibility
        drivers: net: phy: xgene: Add MDIO driver
        ...
      468fc7ed
    • L
      Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 08fd8c17
      Linus Torvalds 提交于
      Pull xen updates from David Vrabel:
       "Features and fixes for 4.8-rc0:
      
         - ACPI support for guests on ARM platforms.
         - Generic steal time support for arm and x86.
         - Support cases where kernel cpu is not Xen VCPU number (e.g., if
           in-guest kexec is used).
         - Use the system workqueue instead of a custom workqueue in various
           places"
      
      * tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (47 commits)
        xen: add static initialization of steal_clock op to xen_time_ops
        xen/pvhvm: run xen_vcpu_setup() for the boot CPU
        xen/evtchn: use xen_vcpu_id mapping
        xen/events: fifo: use xen_vcpu_id mapping
        xen/events: use xen_vcpu_id mapping in events_base
        x86/xen: use xen_vcpu_id mapping when pointing vcpu_info to shared_info
        x86/xen: use xen_vcpu_id mapping for HYPERVISOR_vcpu_op
        xen: introduce xen_vcpu_id mapping
        x86/acpi: store ACPI ids from MADT for future usage
        x86/xen: update cpuid.h from Xen-4.7
        xen/evtchn: add IOCTL_EVTCHN_RESTRICT
        xen-blkback: really don't leak mode property
        xen-blkback: constify instance of "struct attribute_group"
        xen-blkfront: prefer xenbus_scanf() over xenbus_gather()
        xen-blkback: prefer xenbus_scanf() over xenbus_gather()
        xen: support runqueue steal time on xen
        arm/xen: add support for vm_assist hypercall
        xen: update xen headers
        xen-pciback: drop superfluous variables
        xen-pciback: short-circuit read path used for merging write values
        ...
      08fd8c17
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · e831101a
      Linus Torvalds 提交于
      Pull arm64 updates from Catalin Marinas:
      
       - Kexec support for arm64
      
       - Kprobes support
      
       - Expose MIDR_EL1 and REVIDR_EL1 CPU identification registers to sysfs
      
       - Trapping of user space cache maintenance operations and emulation in
         the kernel (CPU errata workaround)
      
       - Clean-up of the early page tables creation (kernel linear mapping,
         EFI run-time maps) to avoid splitting larger blocks (e.g.  pmds) into
         smaller ones (e.g.  ptes)
      
       - VDSO support for CLOCK_MONOTONIC_RAW in clock_gettime()
      
       - ARCH_HAS_KCOV enabled for arm64
      
       - Optimise IP checksum helpers
      
       - SWIOTLB optimisation to only allocate/initialise the buffer if the
         available RAM is beyond the 32-bit mask
      
       - Properly handle the "nosmp" command line argument
      
       - Fix for the initialisation of the CPU debug state during early boot
      
       - vdso-offsets.h build dependency workaround
      
       - Build fix when RANDOMIZE_BASE is enabled with MODULES off
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (64 commits)
        arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype
        arm64: Only select ARM64_MODULE_PLTS if MODULES=y
        arm64: mm: run pgtable_page_ctor() on non-swapper translation table pages
        arm64: mm: make create_mapping_late() non-allocating
        arm64: Honor nosmp kernel command line option
        arm64: Fix incorrect per-cpu usage for boot CPU
        arm64: kprobes: Add KASAN instrumentation around stack accesses
        arm64: kprobes: Cleanup jprobe_return
        arm64: kprobes: Fix overflow when saving stack
        arm64: kprobes: WARN if attempting to step with PSTATE.D=1
        arm64: debug: remove unused local_dbg_{enable, disable} macros
        arm64: debug: remove redundant spsr manipulation
        arm64: debug: unmask PSTATE.D earlier
        arm64: localise Image objcopy flags
        arm64: ptrace: remove extra define for CPSR's E bit
        kprobes: Add arm64 case in kprobe example module
        arm64: Add kernel return probes support (kretprobes)
        arm64: Add trampoline code for kretprobes
        arm64: kprobes instruction simulation support
        arm64: Treat all entry code as non-kprobe-able
        ...
      e831101a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · f9abf53a
      Linus Torvalds 提交于
      Pull tile architecture updates from Chris Metcalf:
       "A few stray changes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
        tile: support gcc 7 optimization to use __multi3
        tile 32-bit big-endian: fix bugs in syscall argument order
        tile: allow disabling CONFIG_EARLY_PRINTK
      f9abf53a
    • L
      Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · ba4f6789
      Linus Torvalds 提交于
      Pull dlm updates from David Teigland:
       "This set includes two trivial changes, one to use kmemdup and another
        to control the log level of recovery messages"
      
      * tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: Use kmemdup instead of kmalloc and memcpy
        dlm: add log_info config option
      ba4f6789
    • L
      Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 4fc29c1a
      Linus Torvalds 提交于
      Pull f2fs updates from Jaegeuk Kim:
       "The major change in this version is mitigating cpu overheads on write
        paths by replacing redundant inode page updates with mark_inode_dirty
        calls.  And we tried to reduce lock contentions as well to improve
        filesystem scalability.  Other feature is setting F2FS automatically
        when detecting host-managed SMR.
      
        Enhancements:
         - ioctl to move a range of data between files
         - inject orphan inode errors
         - avoid flush commands congestion
         - support lazytime
      
        Bug fixes:
         - return proper results for some dentry operations
         - fix deadlock in add_link failure
         - disable extent_cache for fcollapse/finsert"
      
      * tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (68 commits)
        f2fs: clean up coding style and redundancy
        f2fs: get victim segment again after new cp
        f2fs: handle error case with f2fs_bug_on
        f2fs: avoid data race when deciding checkpoin in f2fs_sync_file
        f2fs: support an ioctl to move a range of data blocks
        f2fs: fix to report error number of f2fs_find_entry
        f2fs: avoid memory allocation failure due to a long length
        f2fs: reset default idle interval value
        f2fs: use blk_plug in all the possible paths
        f2fs: fix to avoid data update racing between GC and DIO
        f2fs: add maximum prefree segments
        f2fs: disable extent_cache for fcollapse/finsert inodes
        f2fs: refactor __exchange_data_block for speed up
        f2fs: fix ERR_PTR returned by bio
        f2fs: avoid mark_inode_dirty
        f2fs: move i_size_write in f2fs_write_end
        f2fs: fix to avoid redundant discard during fstrim
        f2fs: avoid mismatching block range for discard
        f2fs: fix incorrect f_bfree calculation in ->statfs
        f2fs: use percpu_rw_semaphore
        ...
      4fc29c1a
    • L
      Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 0e6acf02
      Linus Torvalds 提交于
      Pull xfs updates from Dave Chinner:
       "The major addition is the new iomap based block mapping
        infrastructure.  We've been kicking this about locally for years, but
        there are other filesystems want to use it too (e.g. gfs2).  Now it
        is fully working, reviewed and ready for merge and be used by other
        filesystems.
      
        There are a lot of other fixes and cleanups in the tree, but those are
        XFS internal things and none are of the scale or visibility of the
        iomap changes.  See below for details.
      
        I am likely to send another pull request next week - we're just about
        ready to merge some new functionality (on disk block->owner reverse
        mapping infrastructure), but that's a huge chunk of code (74 files
        changed, 7283 insertions(+), 1114 deletions(-)) so I'm keeping that
        separate to all the "normal" pull request changes so they don't get
        lost in the noise.
      
        Summary of changes in this update:
         - generic iomap based IO path infrastructure
         - generic iomap based fiemap implementation
         - xfs iomap based Io path implementation
         - buffer error handling fixes
         - tracking of in flight buffer IO for unmount serialisation
         - direct IO and DAX io path separation and simplification
         - shortform directory format definition changes for wider platform
           compatibility
         - various buffer cache fixes
         - cleanups in preparation for rmap merge
         - error injection cleanups and fixes
         - log item format buffer memory allocation restructuring to prevent
           rare OOM reclaim deadlocks
         - sparse inode chunks are now fully supported"
      
      * tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (53 commits)
        xfs: remove EXPERIMENTAL tag from sparse inode feature
        xfs: bufferhead chains are invalid after end_page_writeback
        xfs: allocate log vector buffers outside CIL context lock
        libxfs: directory node splitting does not have an extra block
        xfs: remove dax code from object file when disabled
        xfs: skip dirty pages in ->releasepage()
        xfs: remove __arch_pack
        xfs: kill xfs_dir2_inou_t
        xfs: kill xfs_dir2_sf_off_t
        xfs: split direct I/O and DAX path
        xfs: direct calls in the direct I/O path
        xfs: stop using generic_file_read_iter for direct I/O
        xfs: split xfs_file_read_iter into buffered and direct I/O helpers
        xfs: remove s_maxbytes enforcement in xfs_file_read_iter
        xfs: kill ioflags
        xfs: don't pass ioflags around in the ioctl path
        xfs: track and serialize in-flight async buffers against unmount
        xfs: exclude never-released buffers from buftarg I/O accounting
        xfs: don't reset b_retries to 0 on every failure
        xfs: remove extraneous buffer flag changes
        ...
      0e6acf02
  3. 27 7月, 2016 10 次提交
    • T
      ipmi: remove trydefaults parameter and default init · b07b58a3
      Tony Camuso 提交于
      Parameter trydefaults=1 causes the ipmi_init to initialize ipmi through
      the legacy port io space that was designated for ipmi. Architectures
      that do not map legacy port io can panic when trydefaults=1.
      
      Rather than implement build-time conditional exceptions for each
      architecture that does not map legacy port io, we have removed legacy
      port io from the driver.
      
      Parameter 'trydefaults' has been removed. Attempts to use it hereafter
      will evoke the "Unknown symbol in module, or unknown parameter" message.
      
      The patch was built against a number of architectures and tested for
      regressions and functionality on x86_64 and ARM64.
      Signed-off-by: NTony Camuso <tcamuso@redhat.com>
      
      Removed the config entry and the address source entry for default,
      since neither were used any more.
      Signed-off-by: NCorey Minyard <cminyard@mvista.com>
      b07b58a3
    • M
      Merge branch 'topic/docs-next' into v4l_for_linus · 85538b1a
      Mauro Carvalho Chehab 提交于
      * topic/docs-next: (322 commits)
        [media] cx23885-cardlist.rst: add a new card
        [media] doc-rst: add some needed escape codes
        [media] doc-rst: kapi: use :c:func: instead of :cpp:func
        doc-rst: kernel-doc: fix a change introduced by mistake
        [media] v4l2-ioctl.h add debug info for struct v4l2_ioctl_ops
        [media] dvb_ringbuffer.h: some documentation improvements
        [media] v4l2-ctrls.h: fully document the header file
        [media] doc-rst: Fix some typedef ugly warnings
        [media] doc-rst: reorganize the kAPI v4l2 chapters
        [media] rename v4l2-framework.rst to v4l2-intro.rst
        [media] move V4L2 clocks to a separate .rst file
        [media] v4l2-fh.rst: add cross references and markups
        [media] v4l2-fh.rst: add fh contents from v4l2-framework.rst
        [media] v4l2-fh.h: add documentation for it
        [media] v4l2-event.rst: add cross-references and markups
        [media] v4l2-event.h: document all functions
        [media] v4l2-event.rst: add text from v4l2-framework.rst
        [media] v4l2-framework.rst: remove videobuf quick chapter
        [media] v4l2-dev: add cross-references and improve markup
        [media] doc-rst: move v4l2-dev doc to a separate file
        ...
      85538b1a
    • C
      arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype · fd6380b7
      Catalin Marinas 提交于
      Commit 0a8ea52c ("arm64: Add HAVE_REGS_AND_STACK_ACCESS_API
      feature") inadvertently removed the arch/arm prototype instead of the
      arm64 one introduced by the original patch. There should not be any
      bisection issues since this function is not called from anywhere else
      (it could as well be removed from arch/arm at some point).
      
      Fixes: 0a8ea52c ("arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature")
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      fd6380b7
    • D
      xgene: Fix build warning with ACPI disabled. · 36232012
      David S. Miller 提交于
      drivers/net/ethernet/apm/xgene/xgene_enet_hw.c: In function 'xgene_enet_phy_connect':
      drivers/net/ethernet/apm/xgene/xgene_enet_hw.c:759:22: warning: unused variable 'adev' [-Wunused-variable]
      
      Fixes: 8089a96f ("drivers: net: xgene: Add backward compatibility")
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      36232012
    • G
      be2net: perform temperature query in adapter regardless of its interface state · d3480615
      Guilherme G. Piccoli 提交于
      The be2net driver performs fw temperature queries on be_worker() routine,
      which is executed each second for each be_adapter. There is a frequency
      threshold to avoid fw query to happens at each call to be_worker();
      instead, currently a fw query occurs once in 64 runs of the procedure.
      
      Nevertheless, this fw temperature query is invoked only for adapters which
      interface is up, so we can see I/O errors on read of hwmon counters from
      userspace (from tools like lm-sensors) in case we have adapters' functions
      which interface is down.
      
      This patch moves the fw query code to be invoked even if interface is down.
      No functional changes were introduced.
      Signed-off-by: NGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
      Acked-by: NSathya Perla <sathya.perla@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d3480615
    • L
      Merge branch 'akpm' (patches from Andrew) · 0e06f5c0
      Linus Torvalds 提交于
      Merge updates from Andrew Morton:
      
       - a few misc bits
      
       - ocfs2
      
       - most(?) of MM
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (125 commits)
        thp: fix comments of __pmd_trans_huge_lock()
        cgroup: remove unnecessary 0 check from css_from_id()
        cgroup: fix idr leak for the first cgroup root
        mm: memcontrol: fix documentation for compound parameter
        mm: memcontrol: remove BUG_ON in uncharge_list
        mm: fix build warnings in <linux/compaction.h>
        mm, thp: convert from optimistic swapin collapsing to conservative
        mm, thp: fix comment inconsistency for swapin readahead functions
        thp: update Documentation/{vm/transhuge,filesystems/proc}.txt
        shmem: split huge pages beyond i_size under memory pressure
        thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE
        khugepaged: add support of collapse for tmpfs/shmem pages
        shmem: make shmem_inode_info::lock irq-safe
        khugepaged: move up_read(mmap_sem) out of khugepaged_alloc_page()
        thp: extract khugepaged from mm/huge_memory.c
        shmem, thp: respect MADV_{NO,}HUGEPAGE for file mappings
        shmem: add huge pages support
        shmem: get_unmapped_area align huge page
        shmem: prepare huge= mount option and sysfs knob
        mm, rmap: account shmem thp pages
        ...
      0e06f5c0
    • L
      Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · f7816ad0
      Linus Torvalds 提交于
      Pull power supply and reset updates from Sebastian Reichel:
       - introduce reboot mode driver
       - add DT support to max8903
       - add power supply support for axp221
       - misc fixes
      
      * tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        power: reset: add reboot mode driver
        dt-bindings: power: reset: add document for reboot-mode driver
        power_supply: fix return value of get_property
        power: qcom_smbb: Make an extcon for usb cable detection
        max8903: adds support for initiation via device tree
        max8903: adds documentation for device tree bindings.
        max8903: remove unnecessary 'out of memory' error message.
        max8903: removes non zero validity checks on gpios.
        max8903: adds requesting of gpios.
        max8903: cleans up confusing relationship between dc_valid, dok and dcm.
        max8903: store pointer to pdata instead of copying it.
        power_supply: bq27xxx_battery: Group register mappings into one table
        docs: Move brcm,bcm21664-resetmgr.txt
        power/reset: make syscon_poweroff() static
        power: axp20x_usb: Add support for usb power-supply on axp22x pmics
        power_supply: bq27xxx_battery: Index register numbers by enum
        power_supply: bq27xxx_battery: Fix copy/paste error in header comment
        MAINTAINERS: Add file patterns for power supply device tree bindings
        power: reset: keystone: Enable COMPILE_TEST
      f7816ad0
    • L
      Merge tag 'regulator-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 6097d55e
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "A quiet regulator API release, a few new drivers and some fixes but
        nothing too notable.  There will also be some updates for the PWM
        regulator coming through the PWM tree which provide much smoother
        operation when taking over an already running PWM regulator after boot
        using some new PWM APIs.
      
        Summary:
      
         - Support for configuration of the initial suspend state from DT.
      
         - New drivers for Mediatek MT6323, Ricoh RN5T567 and X-Powers AXP809"
      
      * tag 'regulator-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (38 commits)
        regulator: da9053/52: Fix incorrectly stated minimum and maximum voltage limits
        regulator: mt6323: Constify struct regulator_ops
        regulator: mt6323: Fix module description
        regulator: mt6323: Add support for MT6323 regulator
        regulator: Add document for MT6323 regulator
        regulator: da9210: addition of device tree support
        regulator: act8865: Fix missing of_node_put() in act8865_pdata_from_dt()
        regulator: qcom_smd: Avoid overlapping linear voltage ranges
        regulator: s2mps11: Fix the voltage linear range for s2mps15
        regulator: pwm: Fix regulator ramp delay for continuous mode
        regulator: da9211: add descriptions for da9212/da9214
        mfd: rn5t618: Register restart handler
        mfd: rn5t618: Register power off callback optionally
        regulator: rn5t618: Add RN5T567 PMIC support
        mfd: rn5t618: Add Ricoh RN5T567 PMIC support
        ARM: dts: meson: minix-neo-x8: define PMIC as power controller
        regulator: tps65218: force set power-up/down strobe to 3 for dcdc3
        regulator: tps65218: Enable suspend configuration
        regulator: tps65217: Enable suspend configuration
        regulator: qcom_spmi: Add support for get_mode/set_mode on switches
        ...
      6097d55e
    • L
      Merge tag 'regmap-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · ae979997
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "Several small updates and API enhancements:
      
         - provide transparent unrolling of bulk writes into individual writes
           so they can be used with devices without raw formatting.
      
         - fix compatibility between I2C controllers supporting block commands
           and devices with more than 8 bit wide registers.
      
         - add some helpers for iopoll-like functionality and workarounds for
           weird interrupt controllers"
      
      * tag 'regmap-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: add iopoll-like polling macro
        regmap: Support bulk writes for devices without raw formatting
        regmap-i2c: Use i2c block command only if register value width is 8 bit
        regmap: irq: Add support to call client specific pre/post interrupt service
        regmap: Add file patterns for regmap device tree bindings
      ae979997
    • L
      Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 1cd04d29
      Linus Torvalds 提交于
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.8 kernel cycle.  The big
        news is the completion of the chardev ABI which I'm very happy about
        and apart from that it's an ordinary, quite busy cycle.  The details
        are below.
      
        The patches are tested in linux-next for some time, patches to other
        subsystem mostly have ACKs.
      
        I got overly ambitious with configureing lines as input for IRQ lines
        but it turns out that some controllers have their interrupt-enable and
        input-enabling in orthogonal settings so the assumption that all IRQ
        lines are input lines does not hold.  Oh well, revert and back to the
        drawing board with that.
      
        Core changes:
      
         - The big item is of course the completion of the character device
           ABI.  It has now replaced and surpassed the former unmaintainable
           sysfs ABI: we can now hammer (bitbang) individual lines or sets of
           lines and read individual lines or sets of lines from userspace,
           and we can also register to listen to GPIO events from userspace.
      
           As a tie-in we have two new tools in tools/gpio: gpio-hammer and
           gpio-event-mon that illustrate the proper use of the new ABI.  As
           someone said: the wild west days of GPIO are now over.
      
         - Continued to remove the pointless ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB
           Kconfig symbols.  I'm patching hexagon, openrisc, powerpc, sh,
           unicore, ia64 and microblaze.  These are either ACKed by their
           maintainers or patched anyways after a grace period and no response
           from maintainers.
      
           Some archs (ARM) come in from their trees, and others (x86) are
           still not fixed, so I might send a second pull request to root it
           out later in this merge window, or just defer to v4.9.
      
         - The GPIO tools are moved to the tools build system.
      
        New drivers:
      
         - New driver for the MAX77620/MAX20024.
      
         - New driver for the Intel Merrifield.
      
         - Enabled PCA953x for the TI PCA9536.
      
         - Enabled PCA953x for the Intel Edison.
      
         - Enabled R8A7792 in the RCAR driver.
      
        Driver improvements:
      
         - The STMPE and F7188x now supports the .get_direction() callback.
      
         - The Xilinx driver supports setting multiple lines at once.
      
         - ACPI support for the Vulcan GPIO controller.
      
         - The MMIO GPIO driver supports device tree probing.
      
         - The Acer One 10 is supported through the _DEP ACPI attribute.
      
        Cleanups:
      
         - A major cleanup of the OF/DT support code.  It is way easier to
           read and understand now, probably this improves performance too.
      
         - Drop a few redundant .owner assignments.
      
         - Remove CLPS711x boardfile support: we are 100% DT"
      
      * tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (67 commits)
        MAINTAINERS: Add INTEL MERRIFIELD GPIO entry
        gpio: dwapb: add missing fwnode_handle_put() in dwapb_gpio_get_pdata()
        gpio: merrifield: Protect irq_ack() and gpio_set() by lock
        gpio: merrifield: Introduce GPIO driver to support Merrifield
        gpio: intel-mid: Make it depend to X86_INTEL_MID
        gpio: intel-mid: Sort header block alphabetically
        gpio: intel-mid: Remove potentially harmful code
        gpio: rcar: add R8A7792 support
        gpiolib: remove duplicated include from gpiolib.c
        Revert "gpio: convince line to become input in irq helper"
        gpiolib: of_find_gpio(): Don't discard errors
        gpio: of: Allow overriding the device node
        gpio: free handles in fringe cases
        gpio: tps65218: Add platform_device_id table
        gpio: max77620: get gpio value based on direction
        gpio: lynxpoint: avoid potential warning on error path
        tools/gpio: add install section
        tools/gpio: move to tools buildsystem
        gpio: intel-mid: switch to devm_gpiochip_add_data()
        gpio: 74x164: Use spi_write() helper instead of open coding
        ...
      1cd04d29