1. 14 Dec, 2016 25 commits
    • Linus Torvalds's avatar
      Merge tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · bbcd9c53
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
      
       - new driver for Intel PIIX4
      
       - lots of module autoload fixes
      
       - misc fixes
      
      * tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        power_supply: wm97xx_battery: use power_supply_get_drvdata
        wm8350_power: use permission-specific DEVICE_ATTR variants
        power: ipaq_micro_battery: fix alias
        power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
        bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
        power: supply: lp8788: remove an unneeded NULL check
        power: reset: zx-reboot: Fix module autoload
        power: reset: syscon-reboot-mode: Fix module autoload
        power: reset: at91-poweroff: Fix module autoload
        power: reset: at91-reset: Fix module autoload
        power: supply: axp288_fuel_gauge: Fix module autoload
        power: supply: max8997_charger: Fix module autoload
        power: supply: max17040: Change register transaction length from 8 bits to 16 bits
        power: supply: bq27xxx_battery: don't update poll_interval param if same
        power: supply: improve function-level documentation
        power: reset: Add Intel PIIX4 poweroff driver
      bbcd9c53
    • Linus Torvalds's avatar
      Merge tag 'sound-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ce38207f
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "No dramatic changes are found in this development cycle, but as usual,
        many commits are applied in a wide range of drivers.
      
        Most of big changes are in ASoC, where a few bits of framework work
        and quite a lot of cleanups and improvements to existing code have
        been done. The rest are usual stuff, a few HD-audio and USB-audio
        quirks and fixes, as well as the drop of kthread usages in the whole
        subsystem.
      
        Below are some highlights:
      
        ASoC:
         - support for stereo DAPM controls
         - some initial work on the of-graph sound card
         - regmap conversions of the remaining AC'97 drivers
         - a new version of the topology ABI; this should be backward
           compatible
         - updates / cleanups of rsnd, sunxi, sti, nau8825, samsung, arizona,
           Intel skylake, atom-sst
         - new drivers for Cirrus Logic CS42L42, Qualcomm MSM8916-WCD, and
           Realtek RT5665
      
        USB-audio:
         - yet another race fix at disconnection
         - tolerated packet size calculation for some Android devices
         - quirks for Axe-Fx II, QuickCam, TEAC 501/503
      
        HD-audio:
         - improvement of Dell pin fixup mapping
         - quirks for HP Z1 Gen3, Alienware 15 R2 2016 and ALC622 headset mic
      
        Misc:
         - replace all kthread usages with simple works"
      
      * tag 'sound-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (296 commits)
        ALSA: hiface: Fix M2Tech hiFace driver sampling rate change
        ALSA: usb-audio: Eliminate noise at the start of DSD playback.
        ALSA: usb-audio: Add native DSD support for TEAC 501/503 DAC
        ASoC: wm_adsp: wm_adsp_buf_alloc should use kfree in error path
        ASoC: topology: avoid uninitialized kcontrol_type
        ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks
        ALSA: usb-audio: add implicit fb quirk for Axe-Fx II
        ASoC: zte: spdif: correct ZX_SPDIF_CLK_RAT define
        ASoC: zte: spdif and i2s drivers are not zx296702 specific
        ASoC: rsnd: setup BRGCKR/BRRA/BRRB when starting
        ASoC: rsnd: enable/disable ADG when suspend/resume timing
        ASoC: rsnd: tidyup ssi->usrcnt counter check in hw_params
        ALSA: cs46xx: add a new line
        ASoC: Intel: update bxt_da7219_max98357a to support quad ch dmic capture
        ASoC: nau8825: disable sinc filter for high THD of ADC
        ALSA: usb-audio: more tolerant packetsize
        ALSA: usb-audio: avoid setting of sample rate multiple times on bus
        ASoC: cs35l34: Simplify the logic to set CS35L34_MCLK_CTL setting
        ALSA: hda - Gate the mic jack on HP Z1 Gen3 AiO
        ALSA: hda: when comparing pin configurations, ignore assoc in addition to seq
        ...
      ce38207f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · a9042def
      Linus Torvalds authored
      Pull trivial updates from Jiri Kosina.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        NTB: correct ntb_spad_count comment typo
        misc: ibmasm: fix typo in error message
        Remove references to dead make variable LINUX_INCLUDE
        Remove last traces of ikconfig.h
        treewide: Fix printk() message errors
        Documentation/device-mapper: s/getsize/getsz/
      a9042def
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 6960d582
      Linus Torvalds authored
      Pull livepatch update from Jiri Kosina:
       "This is just a small documentation update (as the work on the hybrid
        model is still underway)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        Documentation/livepatch: Fix stale link to gmame
      6960d582
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f39fdf2a
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - support for new Wacom "MobileStudio Pro" class of tablets from Jason
         Gerecke
      
       - Microsoft Surface 3 support from Benjamin Tissoires and Microsoft
         Surface 4 support from Daniel Keller
      
       - uDraw PS3 tablet support from Bastien Nocera
      
       - timeout scheduling fixes for intel-ish-hid from Even Xu
      
       - HID_QUIRK_MULTI_INPUT in order to simplify LED handling from Benjamin
         Tissoires
      
       - support for Sony DS4 dongle and various other fixes to Sony driver
         from Roderick Colenbrander
      
       - other assorted smaller fixes and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (63 commits)
        HID: fix missing irq field
        HID: i2c-hid: fix build
        HID: i2c-hid: Disable IRQ before freeing buffers
        HID: usbhid: fix improper return value
        HID: wacom: generic: Don't sync input on empty input packets
        HID: wacom: generic: Pad supports more than buttons
        HID: wacom: generic: Send data only when the interface is defined
        HID: wacom: generic: Don't return a value for wacom_wac_event
        HID: intel_ish-hid: use %pUL for uuid formatting
        HID: cp2112: explicitly require irqchip support in gpiolib
        HID: asus: Add i2c touchpad support
        HID: intel-ish-hid: Fix potential race condition
        HID: sony: Support DS4 dongle
        HID: sony: Comply to Linux gamepad spec for DS4
        HID: sony: Make the DS4 touchpad a separate device
        HID: sony: Fix memory issue when connecting device using both Bluetooth and USB
        HID: cp2112: add IRQ chip handling
        HID: i2c-hid: force the IRQ level trigger only when not set
        HID: multitouch: do not retrieve all reports for all devices
        HID: multitouch: enable the Surface 3 Type Cover to report multitouch data
        ...
      f39fdf2a
    • Linus Torvalds's avatar
      Merge tag 'dm-4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 775a2e29
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - various fixes and improvements to request-based DM and DM multipath
      
       - some locking improvements in DM bufio
      
       - add Kconfig option to disable the DM block manager's extra locking
         which mainly serves as a developer tool
      
       - a few bug fixes to DM's persistent-data
      
       - a couple changes to prepare for multipage biovec support in the block
         layer
      
       - various improvements and cleanups in the DM core, DM cache, DM raid
         and DM crypt
      
       - add ability to have DM crypt use keys from the kernel key retention
         service
      
       - add a new "error_writes" feature to the DM flakey target, reads are
         left unchanged in this mode
      
      * tag 'dm-4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (40 commits)
        dm flakey: introduce "error_writes" feature
        dm cache policy smq: use hash_32() instead of hash_32_generic()
        dm crypt: reject key strings containing whitespace chars
        dm space map: always set ev if sm_ll_mutate() succeeds
        dm space map metadata: skip useless memcpy in metadata_ll_init_index()
        dm space map metadata: fix 'struct sm_metadata' leak on failed create
        Documentation: dm raid: define data_offset status field
        dm raid: fix discard support regression
        dm raid: don't allow "write behind" with raid4/5/6
        dm mpath: use hw_handler_params if attached hw_handler is same as requested
        dm crypt: add ability to use keys from the kernel key retention service
        dm array: remove a dead assignment in populate_ablock_with_values()
        dm ioctl: use offsetof() instead of open-coding it
        dm rq: simplify use_blk_mq initialization
        dm: use blk_set_queue_dying() in __dm_destroy()
        dm bufio: drop the lock when doing GFP_NOIO allocation
        dm bufio: don't take the lock in dm_bufio_shrink_count
        dm bufio: avoid sleeping while holding the dm_bufio lock
        dm table: simplify dm_table_determine_type()
        dm table: an 'all_blk_mq' table must be loaded for a blk-mq DM device
        ...
      775a2e29
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 2a4c32ed
      Linus Torvalds authored
      Pull MD updates from Shaohua Li:
      
       - a raid5 writeback cache feature.
      
         The goal is to aggregate writes to make full stripe write and reduce
         read-modify-write. It's helpful for workload which does sequential
         write and follows fsync for example. This feature is experimental and
         off by default right now.
      
       - FAILFAST support.
      
         This fails IOs to broken raid disks quickly, so can improve latency.
         It's mainly for DASD storage, but some patches help normal raid array
         too.
      
       - support bad block for raid array with external metadata
      
       - AVX2 instruction support for raid6 parity calculation
      
       - normalize MD info output
      
       - add missing blktrace
      
       - other bug fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: (66 commits)
        md: separate flags for superblock changes
        md: MD_RECOVERY_NEEDED is set for mddev->recovery
        md: takeover should clear unrelated bits
        md/r5cache: after recovery, increase journal seq by 10000
        md/raid5-cache: fix crc in rewrite_data_only_stripes()
        md/raid5-cache: no recovery is required when create super-block
        md: fix refcount problem on mddev when stopping array.
        md/r5cache: do r5c_update_log_state after log recovery
        md/raid5-cache: adjust the write position of the empty block if no data blocks
        md/r5cache: run_no_space_stripes() when R5C_LOG_CRITICAL == 0
        md/raid5: limit request size according to implementation limits
        md/raid5-cache: do not need to set STRIPE_PREREAD_ACTIVE repeatedly
        md/raid5-cache: remove the unnecessary next_cp_seq field from the r5l_log
        md/raid5-cache: release the stripe_head at the appropriate location
        md/raid5-cache: use ring add to prevent overflow
        md/raid5-cache: remove unnecessary function parameters
        raid5-cache: don't set STRIPE_R5C_PARTIAL_STRIPE flag while load stripe into cache
        raid5-cache: add another check conditon before replaying one stripe
        md/r5cache: enable IRQs on error path
        md/r5cache: handle alloc_page failure
        ...
      2a4c32ed
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · b9f98bd4
      Linus Torvalds authored
      Pull another MMC update from Ulf Hansson:
       "Here's a second pull request for MMC for v4.10.
      
        As a matter of fact it's only one change that moves some mmc files
        around. I thought it was a good idea to get this into v4.10, as it
        gives us a nice and fresh base for v4.11. Summary:
      
        MMC core:
      
         - Move files from the card directory to the core directory to enable
           future clean-ups of the generic mmc header files and interfaces"
      
      * tag 'mmc-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: block: Move files to core
      b9f98bd4
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · a829a844
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This update includes the usual round of major driver updates (ncr5380,
        lpfc, hisi_sas, megaraid_sas, ufs, ibmvscsis, mpt3sas).
      
        There's also an assortment of minor fixes, mostly in error legs or
        other not very user visible stuff. The major change is the
        pci_alloc_irq_vectors replacement for the old pci_msix_.. calls; this
        effectively makes IRQ mapping generic for the drivers and allows
        blk_mq to use the information"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (256 commits)
        scsi: qla4xxx: switch to pci_alloc_irq_vectors
        scsi: hisi_sas: support deferred probe for v2 hw
        scsi: megaraid_sas: switch to pci_alloc_irq_vectors
        scsi: scsi_devinfo: remove synchronous ALUA for NETAPP devices
        scsi: be2iscsi: set errno on error path
        scsi: be2iscsi: set errno on error path
        scsi: hpsa: fallback to use legacy REPORT PHYS command
        scsi: scsi_dh_alua: Fix RCU annotations
        scsi: hpsa: use %phN for short hex dumps
        scsi: hisi_sas: fix free'ing in probe and remove
        scsi: isci: switch to pci_alloc_irq_vectors
        scsi: ipr: Fix runaway IRQs when falling back from MSI to LSI
        scsi: dpt_i2o: double free on error path
        scsi: cxlflash: Migrate scsi command pointer to AFU command
        scsi: cxlflash: Migrate IOARRIN specific routines to function pointers
        scsi: cxlflash: Cleanup queuecommand()
        scsi: cxlflash: Cleanup send_tmf()
        scsi: cxlflash: Remove AFU command lock
        scsi: cxlflash: Wait for active AFU commands to timeout upon tear down
        scsi: cxlflash: Remove private command pool
        ...
      a829a844
    • Linus Torvalds's avatar
      Merge tag 'configfs-for-4.10' of git://git.infradead.org/users/hch/configfs · 84b60791
      Linus Torvalds authored
      Pull configfs update from Christoph Hellwig:
       "Just one simple change from Andrzej to drop the pointless return value
        from the ->drop_link method"
      
      * tag 'configfs-for-4.10' of git://git.infradead.org/users/hch/configfs:
        fs: configfs: don't return anything from drop_link
      84b60791
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 5084fdf0
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "This merge request includes the dax-4.0-iomap-pmd branch which is
        needed for both ext4 and xfs dax changes to use iomap for DAX. It also
        includes the fscrypt branch which is needed for ubifs encryption work
        as well as ext4 encryption and fscrypt cleanups.
      
        Lots of cleanups and bug fixes, especially making sure ext4 is robust
        against maliciously corrupted file systems --- especially maliciously
        corrupted xattr blocks and a maliciously corrupted superblock. Also
        fix ext4 support for 64k block sizes so it works well on ppcle. Fixed
        mbcache so we don't miss some common xattr blocks that can be merged"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (86 commits)
        dax: Fix sleep in atomic contex in grab_mapping_entry()
        fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL
        fscrypt: Delay bounce page pool allocation until needed
        fscrypt: Cleanup page locking requirements for fscrypt_{decrypt,encrypt}_page()
        fscrypt: Cleanup fscrypt_{decrypt,encrypt}_page()
        fscrypt: Never allocate fscrypt_ctx on in-place encryption
        fscrypt: Use correct index in decrypt path.
        fscrypt: move the policy flags and encryption mode definitions to uapi header
        fscrypt: move non-public structures and constants to fscrypt_private.h
        fscrypt: unexport fscrypt_initialize()
        fscrypt: rename get_crypt_info() to fscrypt_get_crypt_info()
        fscrypto: move ioctl processing more fully into common code
        fscrypto: remove unneeded Kconfig dependencies
        MAINTAINERS: fscrypto: recommend linux-fsdevel for fscrypto patches
        ext4: do not perform data journaling when data is encrypted
        ext4: return -ENOMEM instead of success
        ext4: reject inodes with negative size
        ext4: remove another test in ext4_alloc_file_blocks()
        Documentation: fix description of ext4's block_validity mount option
        ext4: fix checks for data=ordered and journal_async_commit options
        ...
      5084fdf0
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 09cb6464
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This patch series contains several performance tuning patches
        regarding to the IO submission flow, in addition to supporting new
        features such as a ZBC-base drive and multiple devices.
      
        It also includes some major bug fixes such as:
         - checkpoint version control
         - fdatasync-related roll-forward recovery routine
         - memory boundary or null-pointer access in corner cases
         - missing error cases
      
        It has various minor clean-up patches as well"
      
      * tag 'for-f2fs-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (66 commits)
        f2fs: fix a missing size change in f2fs_setattr
        f2fs: fix to access nullified flush_cmd_control pointer
        f2fs: free meta pages if sanity check for ckpt is failed
        f2fs: detect wrong layout
        f2fs: call sync_fs when f2fs is idle
        Revert "f2fs: use percpu_counter for # of dirty pages in inode"
        f2fs: return AOP_WRITEPAGE_ACTIVATE for writepage
        f2fs: do not activate auto_recovery for fallocated i_size
        f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack
        f2fs: fix 32-bit build
        f2fs: set ->owner for debugfs status file's file_operations
        f2fs: fix incorrect free inode count in ->statfs
        f2fs: drop duplicate header timer.h
        f2fs: fix wrong AUTO_RECOVER condition
        f2fs: do not recover i_size if it's valid
        f2fs: fix fdatasync
        f2fs: fix to account total free nid correctly
        f2fs: fix an infinite loop when flush nodes in cp
        f2fs: don't wait writeback for datas during checkpoint
        f2fs: fix wrong written_valid_blocks counting
        ...
      09cb6464
    • Linus Torvalds's avatar
      Merge tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 19d37ce2
      Linus Torvalds authored
      Pull dlm fixes from David Teigland:
       "This set fixes error reporting for dlm sockets, removes the unbound
        property on the dlm callback workqueue to improve performance, and
        includes a couple trivial changes"
      
      * tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: fix error return code in sctp_accept_from_sock()
        dlm: don't specify WQ_UNBOUND for the ast callback workqueue
        dlm: remove lock_sock to avoid scheduling while atomic
        dlm: don't save callbacks after accept
        dlm: audit and remove any unnecessary uses of module.h
        dlm: make genl_ops const
      19d37ce2
    • Linus Torvalds's avatar
      Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy · 3e5cecf2
      Linus Torvalds authored
      Pull jfs update from David Kleikamp:
       "The jfs piece of the current_time() series"
      
      * tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy:
        fs: jfs: Replace CURRENT_TIME_SEC by current_time()
      3e5cecf2
    • Aaron Sierra's avatar
      NTB: correct ntb_spad_count comment typo · 74dcba35
      Aaron Sierra authored
      The comment for ntb_spad_count incorrectly referred to ntb_mw_count.
      Signed-off-by: default avatarAaron Sierra <asierra@xes-inc.com>
      Acked-by: default avatarAllen Hubbe <Allen.Hubbe@dell.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      74dcba35
    • Colin Ian King's avatar
      misc: ibmasm: fix typo in error message · ecbf1288
      Colin Ian King authored
      Trivial fix to typo "repsonse" to "response" in error message.
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      ecbf1288
    • Paul Bolle's avatar
      Remove references to dead make variable LINUX_INCLUDE · 846221cf
      Paul Bolle authored
      Commit 4fd06960 ("Use the new x86 setup code for i386") introduced a
      reference to the make variable LINUX_INCLUDE. That reference got moved
      around a bit and copied twice and now there are three references to it.
      
      There has never been a definition of that variable. (Presumably that is
      because it started out as a mistyped reference to LINUXINCLUDE.) So this
      reference has always been an empty string. Let's remove it before it
      spreads any further.
      Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      846221cf
    • Paul Bolle's avatar
      Remove last traces of ikconfig.h · d06505b2
      Paul Bolle authored
      The build system stopped generating ikconfig.h in v2.6.8. Remove an entry
      for it in dontdiff. There's also a reference to it in a small comment.
      Remove that comment too, as it is of little help in any case.
      Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      d06505b2
    • Masanari Iida's avatar
      treewide: Fix printk() message errors · 9165dabb
      Masanari Iida authored
      This patch fix spelling typos in printk and kconfig.
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      9165dabb
    • Michael Witten's avatar
      Documentation/device-mapper: s/getsize/getsz/ · 95f21c5c
      Michael Witten authored
      According to `man blockdev':
      
        --getsize
               Print device size (32-bit!) in sectors.
               Deprecated in favor of the --getsz option.
        ...
        --getsz
               Get size in 512-byte sectors.
      
      Hence, occurrences of `--getsize' should be replaced with `--getsz',
      which this commit has achieved as follows:
      
        $ cd "$repo"
        $ git grep -l -e --getsz
        Documentation/device-mapper/delay.txt
        Documentation/device-mapper/dm-crypt.txt
        Documentation/device-mapper/linear.txt
        Documentation/device-mapper/log-writes.txt
        Documentation/device-mapper/striped.txt
        Documentation/device-mapper/switch.txt
        $ cd Documentation/device-mapper
        $ sed -i s/getsize/getsz/g *
      Signed-off-by: default avatarMichael Witten <mfwitten@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      95f21c5c
    • Jiri Kosina's avatar
      Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower',... · 96e132eb
      Jiri Kosina authored
      Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for-4.10/intel-ish', 'for-4.10/mayflash', 'for-4.10/microsoft-surface-3', 'for-4.10/multitouch', 'for-4.10/sony', 'for-4.10/udraw-ps3', 'for-4.10/upstream' and 'for-4.10/wacom/generic' into for-linus
      96e132eb
    • Linus Torvalds's avatar
      Revert "nvme: add support for the Write Zeroes command" · cdb98c26
      Linus Torvalds authored
      This reverts commit 6d31e3ba.
      
      This causes bootup problems for me both on my laptop and my desktop.
      What they have in common is that they have NVMe disks with dm-crypt, but
      it's not the same controller, so it's not controller-specific.
      
      Jens does not see it on his machine (also NVMe), so it's presumably
      something that triggers just on bootup.  Possibly related to dm-crypt
      and the fact that I mark my luks volume with "allow-discards" in
      /etc/crypttab.
      
      It's 100% repeatable for me, which made it fairly straightforward to
      bisect the problem to this commit. Small mercies.
      
      So we don't know what the reason is yet, but the revert is needed to get
      things going again.
      Acked-by: default avatarJens Axboe <axboe@fb.com>
      Cc: Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cdb98c26
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · f4000cd9
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
      
       - struct thread_info moved off-stack (also touching
         include/linux/thread_info.h and include/linux/restart_block.h)
      
       - cpus_have_cap() reworked to avoid __builtin_constant_p() for static
         key use (also touching drivers/irqchip/irq-gic-v3.c)
      
       - uprobes support (currently only for native 64-bit tasks)
      
       - Emulation of kernel Privileged Access Never (PAN) using TTBR0_EL1
         switching to a reserved page table
      
       - CPU capacity information passing via DT or sysfs (used by the
         scheduler)
      
       - support for systems without FP/SIMD (IOW, kernel avoids touching
         these registers; there is no soft-float ABI, nor kernel emulation for
         AArch64 FP/SIMD)
      
       - handling of hardware watchpoint with unaligned addresses, varied
         lengths and offsets from base
      
       - use of the page table contiguous hint for kernel mappings
      
       - hugetlb fixes for sizes involving the contiguous hint
      
       - remove unnecessary I-cache invalidation in flush_cache_range()
      
       - CNTHCTL_EL2 access fix for CPUs with VHE support (ARMv8.1)
      
       - boot-time checks for writable+executable kernel mappings
      
       - simplify asm/opcodes.h and avoid including the 32-bit ARM counterpart
         and make the arm64 kernel headers self-consistent (Xen headers patch
         merged separately)
      
       - Workaround for broken .inst support in certain binutils versions
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (60 commits)
        arm64: Disable PAN on uaccess_enable()
        arm64: Work around broken .inst when defective gas is detected
        arm64: Add detection code for broken .inst support in binutils
        arm64: Remove reference to asm/opcodes.h
        arm64: Get rid of asm/opcodes.h
        arm64: smp: Prevent raw_smp_processor_id() recursion
        arm64: head.S: Fix CNTHCTL_EL2 access on VHE system
        arm64: Remove I-cache invalidation from flush_cache_range()
        arm64: Enable HIBERNATION in defconfig
        arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
        arm64: xen: Enable user access before a privcmd hvc call
        arm64: Handle faults caused by inadvertent user access with PAN enabled
        arm64: Disable TTBR0_EL1 during normal kernel execution
        arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
        arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
        arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
        arm64: Update the synchronous external abort fault description
        selftests: arm64: add test for unaligned/inexact watchpoint handling
        arm64: Allow hw watchpoint of length 3,5,6 and 7
        arm64: hw_breakpoint: Handle inexact watchpoint addresses
        ...
      f4000cd9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 2ec4584e
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The main bulk of the s390 patches for the 4.10 merge window:
      
         - Add support for the contiguous memory allocator.
      
         - The recovery for I/O errors in the dasd device driver is improved,
           the driver will now remove channel paths that are not working
           properly.
      
         - Additional fields are added to /proc/sysinfo, the extended
           partition name and the partition UUID.
      
         - New naming for PCI devices with system defined UIDs.
      
         - The last few remaining alloc_bootmem calls are converted to
           memblock.
      
         - The thread_info structure is stripped down and moved to the
           task_struct. The only field left in thread_info is the flags field.
      
         - Rework of the arch topology code to fix a fake numa issue.
      
         - Refactoring of the atomic primitives and add a new preempt_count
           implementation.
      
         - Clocksource steering for the STP sync check offsets.
      
         - The s390 specific headers are changed to make them usable with
           CLANG.
      
         - Bug fixes and cleanup"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (70 commits)
        s390/cpumf: Use configuration level indication for sampling data
        s390: provide memmove implementation
        s390: cleanup arch/s390/kernel Makefile
        s390: fix initrd corruptions with gcov/kcov instrumented kernels
        s390: exclude early C code from gcov profiling
        s390/dasd: channel path aware error recovery
        s390/dasd: extend dasd path handling
        s390: remove unused labels from entry.S
        s390/vmlogrdr: fix IUCV buffer allocation
        s390/crypto: unlock on error in prng_tdes_read()
        s390/sysinfo: show partition extended name and UUID if available
        s390/numa: pin all possible cpus to nodes early
        s390/numa: establish cpu to node mapping early
        s390/topology: use cpu_topology array instead of per cpu variable
        s390/smp: initialize cpu_present_mask in setup_arch
        s390/topology: always use s390 specific sched_domain_topology_level
        s390/smp: use smp_get_base_cpu() helper function
        s390/numa: always use logical cpu and core ids
        s390: Remove VLAIS in ptff() and clear_table()
        s390: fix machine check panic stack switch
        ...
      2ec4584e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · aa3ecf38
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
       "Xen features and fixes for 4.10
      
        These are some fixes, a move of some arm related headers to share them
        between arm and arm64 and a series introducing a helper to make code
        more readable.
      
        The most notable change is David stepping down as maintainer of the
        Xen hypervisor interface. This results in me sending you the pull
        requests for Xen related code from now on"
      
      * tag 'for-linus-4.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (29 commits)
        xen/balloon: Only mark a page as managed when it is released
        xenbus: fix deadlock on writes to /proc/xen/xenbus
        xen/scsifront: don't request a slot on the ring until request is ready
        xen/x86: Increase xen_e820_map to E820_X_MAX possible entries
        x86: Make E820_X_MAX unconditionally larger than E820MAX
        xen/pci: Bubble up error and fix description.
        xen: xenbus: set error code on failure
        xen: set error code on failures
        arm/xen: Use alloc_percpu rather than __alloc_percpu
        arm/arm64: xen: Move shared architecture headers to include/xen/arm
        xen/events: use xen_vcpu_id mapping for EVTCHNOP_status
        xen/gntdev: Use VM_MIXEDMAP instead of VM_IO to avoid NUMA balancing
        xen-scsifront: Add a missing call to kfree
        MAINTAINERS: update XEN HYPERVISOR INTERFACE
        xenfs: Use proc_create_mount_point() to create /proc/xen
        xen-platform: use builtin_pci_driver
        xen-netback: fix error handling output
        xen: make use of xenbus_read_unsigned() in xenbus
        xen: make use of xenbus_read_unsigned() in xen-pciback
        xen: make use of xenbus_read_unsigned() in xen-fbfront
        ...
      aa3ecf38
  2. 13 Dec, 2016 15 commits
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb · b5cab0da
      Linus Torvalds authored
      Pull swiotlb updates from Konrad Rzeszutek Wilk:
      
       - minor fixes (rate limiting), remove certain functions
      
       - support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization
         in the DMA API
      
      * 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
        swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support
        swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC
        swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
        swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg
        swiotlb: Rate-limit printing when running out of SW-IOMMU space
      b5cab0da
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 93173b5b
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "Small release, the most interesting stuff is x86 nested virt
        improvements.
      
        x86:
         - userspace can now hide nested VMX features from guests
         - nested VMX can now run Hyper-V in a guest
         - support for AVX512_4VNNIW and AVX512_FMAPS in KVM
         - infrastructure support for virtual Intel GPUs.
      
        PPC:
         - support for KVM guests on POWER9
         - improved support for interrupt polling
         - optimizations and cleanups.
      
        s390:
         - two small optimizations, more stuff is in flight and will be in
           4.11.
      
        ARM:
         - support for the GICv3 ITS on 32bit platforms"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (94 commits)
        arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest
        KVM: arm/arm64: timer: Check for properly initialized timer on init
        KVM: arm/arm64: vgic-v2: Limit ITARGETSR bits to number of VCPUs
        KVM: x86: Handle the kthread worker using the new API
        KVM: nVMX: invvpid handling improvements
        KVM: nVMX: check host CR3 on vmentry and vmexit
        KVM: nVMX: introduce nested_vmx_load_cr3 and call it on vmentry
        KVM: nVMX: propagate errors from prepare_vmcs02
        KVM: nVMX: fix CR3 load if L2 uses PAE paging and EPT
        KVM: nVMX: load GUEST_EFER after GUEST_CR0 during emulated VM-entry
        KVM: nVMX: generate MSR_IA32_CR{0,4}_FIXED1 from guest CPUID
        KVM: nVMX: fix checks on CR{0,4} during virtual VMX operation
        KVM: nVMX: support restore of VMX capability MSRs
        KVM: nVMX: generate non-true VMX MSRs based on true versions
        KVM: x86: Do not clear RFLAGS.TF when a singlestep trap occurs.
        KVM: x86: Add kvm_skip_emulated_instruction and use it.
        KVM: VMX: Move skip_emulated_instruction out of nested_vmx_check_vmcs12
        KVM: VMX: Reorder some skip_emulated_instruction calls
        KVM: x86: Add a return value to kvm_emulate_cpuid
        KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h
        ...
      93173b5b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.10' of... · 1c59e1ed
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
      
       - new drivers for TMP108 and TC654
      
       - hwmon core code cleanup
      
       - coretemp driver cleanup
      
       - fix overflow issues in several drivers
      
       - minor fixes, cleanups and enhancements in various drivers
      
      * tag 'hwmon-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (41 commits)
        hwmon: (g762) Fix overflows and crash seen when writing limit attributes
        hwmon: (emcw201) Fix overflows seen when writing into limit attributes
        hwmon: (emc2103) Fix overflows seen when temperature limit attributes
        hwmon: (lm85) Fix overflows seen when writing voltage limit attributes
        hwmon: (lm87) Fix overflow seen when writing voltage limit attributes
        hwmon: (nct7802) Fix overflows seen when writing into limit attributes
        hwmon: (adt7470) Fix overflows seen when writing into limit attributes
        hwmon: (adt7462) Fix overflows seen when writing into limit attributes
        hwmon: (adm1026) Fix overflows seen when writing into limit attributes
        hwmon: (adm1025) Fix overflows seen when writing voltage limits
        hwmon: (via-cputemp) Convert to hotplug state machine
        devicetree: hwmon: Add documentation for TMP108 driver.
        hwmon: Add Texas Instruments TMP108 temperature sensor driver.
        hwmon: (core) Simplify sysfs attribute name allocation
        hwmon: (core) Rename groups parameter in API to extra_groups
        hwmon: (core) Explain why at least two attribute groups are allocated
        hwmon: (core) Make is_visible callback truly mandatory
        hwmon: (core) Deprecate hwmon_device_register()
        hwmon: (core) Clarify use of chip attributes
        hwmon: (core) Add support for string attributes to new API
        ...
      1c59e1ed
    • Linus Torvalds's avatar
      Merge tag 'spi-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · bb3dd056
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "The nicest things about this release for me is seeing some older
        drivers getting some cleanups and modernization, it's really good to
        see things moving forwards even for older drivers.
      
        In content terms it's a fairly humdrum release but where the work has
        been happening is great.
      
         - Support for simultaneous use of internal and GPIO chip selects for
           devices that require the use of the internal select even if it's
           not connected and a GPIO is actually routed to the slave device.
      
         - A major rework and cleanup of the fsl-espi driver from Heiner
           Kallweit which should make it work substantially better.
      
         - DMA support for Freescale DSPI IPs.
      
         - New drivers for Freescale LPSPI IPs and Marvell Armada 3700.
      
         - Support for Allwinner H3"
      
      * tag 'spi-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (85 commits)
        spi: mvebu: fix baudrate calculation for armada variant
        spi: Add support for Armada 3700 SPI Controller
        spi: armada-3700: Add documentation for the Armada 3700 SPI Controller
        spi: fsl-lpspi: quit reading rx fifo under error condition
        spi: fsl-lpspi: use GPL as module license
        spi: fsl-espi: fix ioread16/iowrite16 endianness
        spi: fsl-espi: remove unused linearization code
        spi: fsl-espi: eliminate need for linearization when reading from hardware
        spi: fsl-espi: eliminate need for linearization when writing to hardware
        spi: fsl-espi: determine need for byte swap only once
        spi: fsl-lpspi: read lpspi tx/rx fifo size in probe()
        spi: fsl-lpspi: use wait_for_completion_timeout() while waiting transfer done
        spi: orion: fix comment to mention MVEBU
        spi: atmel: remove the use of private channel fields
        spi: atmel: trivial: remove unused fields in DMA structure
        spi: atmel: Use SPI core DMA mapping framework
        spi: atmel: Use core SPI_MASTER_MUST_[RT]X handling
        spi: atmel: trivial: move info banner to latest probe action
        spi: imx: replace schedule() with cond_resched()
        spi: imx: fix potential shift truncation
        ...
      bb3dd056
    • Linus Torvalds's avatar
      Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 7b882cb8
      Linus Torvalds authored
      Pull another libata patch from Tejun Heo:
       "One more patch from Adam added.
      
        It makes libata skip probing for NCQ prio unless the feature is
        explicitly requested by the user. This is necessary because some
        controllers lock up after the optional feature is probed"
      
      * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ata: avoid probing NCQ Prio Support if not explicitly requested
      7b882cb8
    • Adam Manzanares's avatar
      ata: avoid probing NCQ Prio Support if not explicitly requested · 9f56eca3
      Adam Manzanares authored
      Previously, when the ata device was being initialized we were
      probing for NCQ prio support by checking the identify information
      and also checking the log page that holds information about ncq prio
      support.
      
      This caused an error on an Intel HBA so the code is now updated to
      only probe for NCQ prio support when the sysfs variable controlling
      NCQ prio support is enabled.
      
      tj: Update formatting, switch to spin_[un]lock_irq() and update
          locking a bit, use REVALIDATE instead of RESET, and return -EIO
          instead of -EINVAL on config failure.
      Signed-off-by: default avatarAdam Manzanares <adam.manzanares@wdc.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      9f56eca3
    • Linus Torvalds's avatar
      Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · b92e09bb
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
      
       - Adam added opt-in ATA command priority support.
      
       - There are machines which hide multiple nvme devices behind an ahci
         BAR. Dan Williams proposed a solution to force-switch the mode but
         deemed too hackishd. People are gonna discuss the proper way to
         handle the situation in nvme standard meetings. For now, detect and
         warn about the situation.
      
       - Low level driver specific changes.
      
      Christoph Hellwig pipes in about the hidden nvme warning:
       "I wish that was the case. We've pretty much agreed that we'll want to
        implement it as a virtual PCIe root bridge, similar to Intels other
        'innovation' VMD that we work around that way.
      
        But Intel management has apparently decided that they don't want to
        spend more cycles on this now that Lenovo has an optional BIOS that
        doesn't force this broken mode anymore, and no one outside of Intel
        has enough information to implement something like this.
      
        So for now I guess this warning is it, until Intel reconsideres and
        spends resources on fixing up the damage their Chipset people caused"
      
      * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: warn about remapped NVMe devices
        ahci-remap.h: add ahci remapping definitions
        nvme: move NVMe class code to pci_ids.h
        pata: imx: support controller modes up to PIO4
        pata: imx: add support of setting timings for PIO modes
        pata: imx: set controller PIO mode with .set_piomode callback
        pata: imx: sort headers out
        ata: set ncq_prio_enabled iff device has support
        ata: ATA Command Priority Disabled By Default
        ata: Enabling ATA Command Priorities
        block: Add iocontext priority to request
        ahci: qoriq: added ls1046a platform support
      b92e09bb
    • Linus Torvalds's avatar
      Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · c11a6cfb
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Mostly patches to initialize workqueue subsystem earlier and get rid
        of keventd_up().
      
        The patches were headed for the last merge cycle but got delayed due
        to a bug found late minute, which is fixed now.
      
        Also, to help debugging, destroy_workqueue() is more chatty now on a
        sanity check failure."
      
      * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: move wq_numa_init() to workqueue_init()
        workqueue: remove keventd_up()
        debugobj, workqueue: remove keventd_up() usage
        slab, workqueue: remove keventd_up() usage
        power, workqueue: remove keventd_up() usage
        tty, workqueue: remove keventd_up() usage
        mce, workqueue: remove keventd_up() usage
        workqueue: make workqueue available early during boot
        workqueue: dump workqueue state on sanity check failures in destroy_workqueue()
      c11a6cfb
    • Shaohua Li's avatar
      Merge branch 'md-next' into md-linus · 20737738
      Shaohua Li authored
      20737738
    • Linus Torvalds's avatar
      Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · e6efef72
      Linus Torvalds authored
      Pull percpu update from Tejun Heo:
       "This includes just one patch to reject non-power-of-2 alignments and
        trigger warning. Interestingly, this actually caught a bug in XEN
        ARM64"
      
      * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: ensure the requested alignment is power of two
      e6efef72
    • Linus Torvalds's avatar
      Merge tag 'char-misc-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · b78b499a
      Linus Torvalds authored
      Pull char/misc driver updates from Greg KH:
       "Here's the big char/misc driver patches for 4.10-rc1. Lots of tiny
        changes over lots of "minor" driver subsystems, the largest being some
        new FPGA drivers. Other than that, a few other new drivers, but no new
        driver subsystems added for this kernel cycle, a nice change.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'char-misc-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (107 commits)
        uio-hv-generic: store physical addresses instead of virtual
        Tools: hv: kvp: configurable external scripts path
        uio-hv-generic: new userspace i/o driver for VMBus
        vmbus: add support for dynamic device id's
        hv: change clockevents unbind tactics
        hv: acquire vmbus_connection.channel_mutex in vmbus_free_channels()
        hyperv: Fix spelling of HV_UNKOWN
        mei: bus: enable non-blocking RX
        mei: fix the back to back interrupt handling
        mei: synchronize irq before initiating a reset.
        VME: Remove shutdown entry from vme_driver
        auxdisplay: ht16k33: select framebuffer helper modules
        MAINTAINERS: add git url for fpga
        fpga: Clarify how write_init works streaming modes
        fpga zynq: Fix incorrect ISR state on bootup
        fpga zynq: Remove priv->dev
        fpga zynq: Add missing \n to messages
        fpga: Add COMPILE_TEST to all drivers
        uio: pruss: add clk_disable()
        char/pcmcia: add some error checking in scr24x_read()
        ...
      b78b499a
    • Mike Snitzer's avatar
      dm flakey: introduce "error_writes" feature · ef548c55
      Mike Snitzer authored
      Recent dm-flakey fixes, to have reads error out during the "down"
      interval, made it so that the previous read behaviour is no longer
      available.
      
      It is useful to have reads complete like normal but have writes error
      out, so make it possible again with a new "error_writes" feature.
      Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
      ef548c55
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.10-rc1' of... · 098c3055
      Linus Torvalds authored
      Merge tag 'driver-core-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core updates from Greg KH:
       "Here's the new driver core patches for 4.10-rc1.
      
        Big thing here is the nice addition of "functional dependencies" to
        the driver core. The idea has been talked about for a very long time,
        great job to Rafael for stepping up and implementing it. It's been
        tested for longer than the 4.9-rc1 date, we held off on merging it
        earlier in order to feel more comfortable about it.
      
        Other than that, it's just a handful of small other patches, some good
        cleanups to the mess that is the firmware class code, and we have a
        test driver for the deferred probe logic.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'driver-core-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (30 commits)
        firmware: Correct handling of fw_state_wait() return value
        driver core: Silence device links sphinx warning
        firmware: remove warning at documentation generation time
        drivers: base: dma-mapping: Fix typo in dmam_alloc_non_coherent comments
        driver core: test_async: fix up typo found by 0-day
        firmware: move fw_state_is_done() into UHM section
        firmware: do not use fw_lock for fw_state protection
        firmware: drop bit ops in favor of simple state machine
        firmware: refactor loading status
        firmware: fix usermode helper fallback loading
        driver core: firmware_class: convert to use class_groups
        driver core: devcoredump: convert to use class_groups
        driver core: class: add class_groups support
        kernfs: Declare two local data structures static
        driver-core: fix platform_no_drv_owner.cocci warnings
        drivers/base/memory.c: Remove unused 'first_page' variable
        driver core: add CLASS_ATTR_WO()
        drivers: base: cacheinfo: support DT overrides for cache properties
        drivers: base: cacheinfo: add pr_fmt logging
        drivers: base: cacheinfo: fix boot error message when acpi is enabled
        ...
      098c3055
    • Linus Torvalds's avatar
      Merge tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 72cca7ba
      Linus Torvalds authored
      Pull staging/IIO updates from Greg KH:
       "Here's the "big" staging/iio pull request for 4.10-rc1.
      
        Not as big as 4.9 was, but still just over a thousand changes. We
        almost broke even of lines added vs. removed, as the slicoss driver
        was removed (got a "clean" driver for the same hardware through the
        netdev tree), and some iio drivers were also dropped, but I think we
        ended up adding a few thousand lines to the source tree in the end.
        Other than that it's a lot of minor fixes all over the place, nothing
        major stands out at all.
      
        All of these have been in linux-next for a while. There will be a
        merge conflict with Al's vfs tree in the lustre code, but the
        resolution for that should be pretty simple, that too has been in
        linux-next"
      
      * tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1002 commits)
        staging: comedi: comedidev.h: Document usage of 'detach' handler
        staging: fsl-mc: remove unnecessary info prints from bus driver
        staging: fsl-mc: add sysfs ABI doc
        staging/lustre/o2iblnd: Fix misspelled attemps->attempts
        staging/lustre/o2iblnd: Fix misspelling intialized->intialized
        staging/lustre: Convert all bare unsigned to unsigned int
        staging/lustre/socklnd: Fix whitespace problem
        staging/lustre/o2iblnd: Add missing space
        staging/lustre/lnetselftest: Fix potential integer overflow
        staging: greybus: audio_module: remove redundant OOM message
        staging: dgnc: Fix lines longer than 80 characters
        staging: dgnc: fix blank line after '{' warnings.
        staging/android: remove Sync Framework tasks from TODO
        staging/lustre/osc: Revert erroneous list_for_each_entry_safe use
        staging: slicoss: remove the staging driver
        staging: lustre: libcfs: remove lnet upcall code
        staging: lustre: remove set but unused variables
        staging: lustre: osc: set lock data for readahead lock
        staging: lustre: import: don't reconnect during connect interpret
        staging: lustre: clio: remove mtime check in vvp_io_fault_start()
        ...
      72cca7ba
    • Linus Torvalds's avatar
      Merge tag 'tty-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 5266e703
      Linus Torvalds authored
      Pull tty/serial updates from Greg KH:
       "Here's the tty/serial patchset for 4.10-rc1.
      
        It's been a quiet kernel cycle for this subsystem, just a small number
        of changes. A few new serial drivers, and some cleanups to the old
        vgacon logic, and other minor serial driver changes as well.
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'tty-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (54 commits)
        serial: 8250_mid fix calltrace when hotplug 8250 serial controller
        console: Move userspace I/O out of console_lock to fix lockdep warning
        tty: nozomi: avoid sprintf buffer overflow
        serial: 8250_pci: Detach low-level driver during PCI error recovery
        serial: core: don't check port twice in a row
        mxs-auart: count FIFO overrun errors
        serial: 8250_dw: Add support for IrDA SIR mode
        serial: 8250: Expose set_ldisc function
        serial: 8250: Add IrDA to UART capabilities
        serial: 8250_dma: power off device after TX is done
        serial: 8250_port: export serial8250_rpm_{get|put}_tx()
        serial: sunsu: Free memory when probe fails
        serial: sunhv: Free memory when remove() is called
        vt: fix Scroll Lock LED trigger name
        tty: typo in comments in drivers/tty/vt/keyboard.c
        tty: amba-pl011: Add earlycon support for SBSA UART
        tty: nozomi: use permission-specific DEVICE_ATTR variants
        tty: serial: Make the STM32 serial port depend on it's arch
        serial: ifx6x60: Free memory when probe fails
        serial: ioc4_serial: Free memory when kzalloc fails during probe
        ...
      5266e703