1. 15 Dec, 2016 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block · 80eabba7
      Linus Torvalds authored
      Pull fs meta data unmap optimization from Jens Axboe:
       "A series from Jan Kara, providing a more efficient way for unmapping
        meta data from in the buffer cache than doing it block-by-block.
      
        Provide a general helper that existing callers can use"
      
      * 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block:
        fs: Remove unmap_underlying_metadata
        fs: Add helper to clean bdev aliases under a bh and use it
        ext2: Use clean_bdev_aliases() instead of iteration
        ext4: Use clean_bdev_aliases() instead of iteration
        direct-io: Use clean_bdev_aliases() instead of handmade iteration
        fs: Provide function to unmap metadata for a range of blocks
      80eabba7
    • Linus Torvalds's avatar
      docs: add back 'Documentation/Changes' file (as symlink) · 852d21ae
      Linus Torvalds authored
      Jaegeuk Kim reports that the debian kernel package build gets confused
      by the lack of Documentation/Changes file.  We also refer to that path
      name in ver_linux and various how-to files and Kconfig files.
      
      The file got renamed away in commit 186128f7 ("docs-rst: add
      documents to development-process"), and as Jaegeuk Kim points out, the
      commit message for that change says "use symlinks instead of renames",
      but then the commit itself actually does renames after all.
      
      Maybe we should do the other files too, but for now this just adds the
      minimal symlink back to the historical name, so that people looking for
      Documentation/Changes will actually find what they are looking for, and
      the debian scripts continue to work.
      Reported-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      852d21ae
  2. 14 Dec, 2016 38 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 412ac77a
      Linus Torvalds authored
      Pull namespace updates from Eric Biederman:
       "After a lot of discussion and work we have finally reachanged a basic
        understanding of what is necessary to make unprivileged mounts safe in
        the presence of EVM and IMA xattrs which the last commit in this
        series reflects. While technically it is a revert the comments it adds
        are important for people not getting confused in the future. Clearing
        up that confusion allows us to seriously work on unprivileged mounts
        of fuse in the next development cycle.
      
        The rest of the fixes in this set are in the intersection of user
        namespaces, ptrace, and exec. I started with the first fix which
        started a feedback cycle of finding additional issues during review
        and fixing them. Culiminating in a fix for a bug that has been present
        since at least Linux v1.0.
      
        Potentially these fixes were candidates for being merged during the rc
        cycle, and are certainly backport candidates but enough little things
        turned up during review and testing that I decided they should be
        handled as part of the normal development process just to be certain
        there were not any great surprises when it came time to backport some
        of these fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC"
        exec: Ensure mm->user_ns contains the execed files
        ptrace: Don't allow accessing an undumpable mm
        ptrace: Capture the ptracer's creds not PT_PTRACE_CAP
        mm: Add a user_ns owner to mm_struct and fix ptrace permission checks
      412ac77a
    • Linus Torvalds's avatar
      Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit · dcdaa2f9
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "After the small number of patches for v4.9, we've got a much bigger
        pile for v4.10.
      
        The bulk of these patches involve a rework of the audit backlog queue
        to enable us to move the netlink multicasting out of the task/thread
        that generates the audit record and into the kernel thread that emits
        the record (just like we do for the audit unicast to auditd).
      
        While we were playing with the backlog queue(s) we fixed a number of
        other little problems with the code, and from all the testing so far
        things look to be in much better shape now. Doing this also allowed us
        to re-enable disabling IRQs for some netns operations ("netns: avoid
        disabling irq for netns id").
      
        The remaining patches fix some small problems that are well documented
        in the commit descriptions, as well as adding session ID filtering
        support"
      
      * 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit:
        audit: use proper refcount locking on audit_sock
        netns: avoid disabling irq for netns id
        audit: don't ever sleep on a command record/message
        audit: handle a clean auditd shutdown with grace
        audit: wake up kauditd_thread after auditd registers
        audit: rework audit_log_start()
        audit: rework the audit queue handling
        audit: rename the queues and kauditd related functions
        audit: queue netlink multicast sends just like we do for unicast sends
        audit: fixup audit_init()
        audit: move kaudit thread start from auditd registration to kaudit init (#2)
        audit: add support for session ID user filter
        audit: fix formatting of AUDIT_CONFIG_CHANGE events
        audit: skip sessionid sentinel value when auto-incrementing
        audit: tame initialization warning len_abuf in audit_log_execve_info
        audit: less stack usage for /proc/*/loginuid
      dcdaa2f9
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 683b96f4
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "Generally pretty quiet for this release. Highlights:
      
        Yama:
         - allow ptrace access for original parent after re-parenting
      
        TPM:
         - add documentation
         - many bugfixes & cleanups
         - define a generic open() method for ascii & bios measurements
      
        Integrity:
         - Harden against malformed xattrs
      
        SELinux:
         - bugfixes & cleanups
      
        Smack:
         - Remove unnecessary smack_known_invalid label
         - Do not apply star label in smack_setprocattr hook
         - parse mnt opts after privileges check (fixes unpriv DoS vuln)"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (56 commits)
        Yama: allow access for the current ptrace parent
        tpm: adjust return value of tpm_read_log
        tpm: vtpm_proxy: conditionally call tpm_chip_unregister
        tpm: Fix handling of missing event log
        tpm: Check the bios_dir entry for NULL before accessing it
        tpm: return -ENODEV if np is not set
        tpm: cleanup of printk error messages
        tpm: replace of_find_node_by_name() with dev of_node property
        tpm: redefine read_log() to handle ACPI/OF at runtime
        tpm: fix the missing .owner in tpm_bios_measurements_ops
        tpm: have event log use the tpm_chip
        tpm: drop tpm1_chip_register(/unregister)
        tpm: replace dynamically allocated bios_dir with a static array
        tpm: replace symbolic permission with octal for securityfs files
        char: tpm: fix kerneldoc tpm2_unseal_trusted name typo
        tpm_tis: Allow tpm_tis to be bound using DT
        tpm, tpm_vtpm_proxy: add kdoc comments for VTPM_PROXY_IOC_NEW_DEV
        tpm: Only call pm_runtime_get_sync if device has a parent
        tpm: define a generic open() method for ascii & bios measurements
        Documentation: tpm: add the Physical TPM device tree binding documentation
        ...
      683b96f4
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 0f1d6dfe
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
       "Here is the crypto update for 4.10:
      
        API:
         - add skcipher walk interface
         - add asynchronous compression (acomp) interface
         - fix algif_aed AIO handling of zero buffer
      
        Algorithms:
         - fix unaligned access in poly1305
         - fix DRBG output to large buffers
      
        Drivers:
         - add support for iMX6UL to caam
         - fix givenc descriptors (used by IPsec) in caam
         - accelerated SHA256/SHA512 for ARM64 from OpenSSL
         - add SSE CRCT10DIF and CRC32 to ARM/ARM64
         - add AEAD support to Chelsio chcr
         - add Armada 8K support to omap-rng"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (148 commits)
        crypto: testmgr - fix overlap in chunked tests again
        crypto: arm/crc32 - accelerated support based on x86 SSE implementation
        crypto: arm64/crc32 - accelerated support based on x86 SSE implementation
        crypto: arm/crct10dif - port x86 SSE implementation to ARM
        crypto: arm64/crct10dif - port x86 SSE implementation to arm64
        crypto: testmgr - add/enhance test cases for CRC-T10DIF
        crypto: testmgr - avoid overlap in chunked tests
        crypto: chcr - checking for IS_ERR() instead of NULL
        crypto: caam - check caam_emi_slow instead of re-lookup platform
        crypto: algif_aead - fix AIO handling of zero buffer
        crypto: aes-ce - Make aes_simd_algs static
        crypto: algif_skcipher - set error code when kcalloc fails
        crypto: caam - make aamalg_desc a proper module
        crypto: caam - pass key buffers with typesafe pointers
        crypto: arm64/aes-ce-ccm - Fix AEAD decryption length
        MAINTAINERS: add crypto headers to crypto entry
        crypt: doc - remove misleading mention of async API
        crypto: doc - fix header file name
        crypto: api - fix comment typo
        crypto: skcipher - Add separate walker for AEAD decryption
        ..
      0f1d6dfe
    • Linus Torvalds's avatar
      vfs,mm: fix return value of read() at s_maxbytes · d05c5f7b
      Linus Torvalds authored
      We truncated the possible read iterator to s_maxbytes in commit
      c2a9737f ("vfs,mm: fix a dead loop in truncate_inode_pages_range()"),
      but our end condition handling was wrong: it's not an error to try to
      read at the end of the file.
      
      Reading past the end should return EOF (0), not EINVAL.
      
      See for example
      
        https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1649342
        http://lists.gnu.org/archive/html/bug-coreutils/2016-12/msg00008.html
      
      where a md5sum of a maximally sized file fails because the final read is
      exactly at s_maxbytes.
      
      Fixes: c2a9737f ("vfs,mm: fix a dead loop in truncate_inode_pages_range()")
      Reported-by: default avatarJoseph Salisbury <joseph.salisbury@canonical.com>
      Cc: Wei Fang <fangwei1@huawei.com>
      Cc: Christoph Hellwig <hch@infradead.org>
      Cc: Dave Chinner <david@fromorbit.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d05c5f7b
    • Linus Torvalds's avatar
      Merge tag 'acpi-urgent-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7ae123ed
      Linus Torvalds authored
      Pull two ACPI CPPC fixes from Rafael Wysocki:
       "One of them fixes a crash in KVM encountered by Sebastian in
        linux-next and introduced by a recent intel_pstate change that caused
        the driver to use the ACPI CPPC code and uncovered a missing NULL
        pointer check in it.
      
        The other one fixes a possible use-after-free in the same code area.
      
        Summary:
      
         - Fix a crash in KVM encountered in linux-next and introduced by a
           recent intel_pstate change that caused the driver to use the ACPI
           CPPC code and uncovered a missing NULL pointer check in it
           (Sebastian Andrzej Siewior).
      
         - Fix a possible use-after-free in the same code area (Rafael
           Wysocki)"
      
      * tag 'acpi-urgent-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / CPPC: Fix per-CPU pointer management in acpi_cppc_processor_probe()
        ACPI / CPPC: Fix crash in acpi_cppc_processor_exit()
      7ae123ed
    • 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
    • Richard Guy Briggs's avatar
      audit: use proper refcount locking on audit_sock · 533c7b69
      Richard Guy Briggs authored
      Resetting audit_sock appears to be racy.
      
      audit_sock was being copied and dereferenced without using a refcount on
      the source sock.
      
      Bump the refcount on the underlying sock when we store a refrence in
      audit_sock and release it when we reset audit_sock.  audit_sock
      modification needs the audit_cmd_mutex.
      
      See: https://lkml.org/lkml/2016/11/26/232
      
      Thanks to Eric Dumazet <edumazet@google.com> and Cong Wang
      <xiyou.wangcong@gmail.com> on ideas how to fix it.
      Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
      Reviewed-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      [PM: fixed the comment block text formatting for auditd_reset()]
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      533c7b69
    • Paul Moore's avatar
      netns: avoid disabling irq for netns id · fba143c6
      Paul Moore authored
      Bring back commit bc51dddf ("netns: avoid disabling irq for netns
      id") now that we've fixed some audit multicast issues that caused
      problems with original attempt.  Additional information, and history,
      can be found in the links below:
      
       * https://github.com/linux-audit/audit-kernel/issues/22
       * https://github.com/linux-audit/audit-kernel/issues/23Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      fba143c6
    • Paul Moore's avatar
      audit: don't ever sleep on a command record/message · a09cfa47
      Paul Moore authored
      Sleeping on a command record/message in audit_log_start() could slow
      something, e.g. auditd, from doing something important, e.g. clean
      shutdown, which could present problems on a heavily loaded system.
      This patch allows tasks to bypass any queue restrictions if they are
      logging a command record/message.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      a09cfa47
    • Paul Moore's avatar
      audit: handle a clean auditd shutdown with grace · 6c54e789
      Paul Moore authored
      When auditd stops cleanly it sets 'auditd_pid' to 0 with an
      AUDIT_SET message, in this case we should reset our backlog
      queues via the auditd_reset() function.  This patch also adds
      a 'auditd_pid' check to the top of kauditd_send_unicast_skb()
      so we can fail quicker.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      6c54e789
    • Paul Moore's avatar
      audit: wake up kauditd_thread after auditd registers · e1d16621
      Paul Moore authored
      This patch was suggested by Richard Briggs back in 2015, see the link
      to the mail archive below.  Unfortunately, that patch is no longer
      even remotely valid due to other changes to the code.
      
      * https://www.redhat.com/archives/linux-audit/2015-October/msg00075.htmlSuggested-by: default avatarRichard Guy Briggs <rgb@redhat.com>
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      e1d16621
    • Paul Moore's avatar
      audit: rework audit_log_start() · 31975424
      Paul Moore authored
      The backlog queue handling in audit_log_start() is a little odd with
      some questionable design decisions, this patch attempts to rectify
      this with the following changes:
      
      * Never make auditd wait, ignore any backlog limits as we need auditd
      awake so it can drain the backlog queue.
      
      * When we hit a backlog limit and start dropping records, don't wake
      all the tasks sleeping on the backlog, that's silly.  Instead, let
      kauditd_thread() take care of waking everyone once it has had a chance
      to drain the backlog queue.
      
      * Don't keep a global backlog timeout countdown, make it per-task.  A
      per-task timer means we won't have all the sleeping tasks waking at
      the same time and hammering on an already stressed backlog queue.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      31975424
    • Paul Moore's avatar
      audit: rework the audit queue handling · c6480207
      Paul Moore authored
      The audit record backlog queue has always been a bit of a mess, and
      the moving the multicast send into kauditd_thread() from
      audit_log_end() only makes things worse.  This patch attempts to fix
      the backlog queue with a better design that should hold up better
      under load and have less of a performance impact at syscall
      invocation time.
      
      While it looks like there is a log going on in this patch, the main
      change is the move from a single backlog queue to three queues:
      
      * A queue for holding records generated from audit_log_end() that
      haven't been consumed by kauditd_thread() (audit_queue).
      
      * A queue for holding records that have been sent via multicast but
      had a temporary failure when sending via unicast and need a resend
      (audit_retry_queue).
      
      * A queue for holding records that haven't been sent via unicast
      because no one is listening (audit_hold_queue).
      
      Special care is taken in this patch to ensure that the proper
      record ordering is preserved, e.g. we send everything in the hold
      queue first, then the retry queue, and finally the main queue.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      c6480207
    • Paul Moore's avatar
      audit: rename the queues and kauditd related functions · af8b824f
      Paul Moore authored
      The audit queue names can be shortened and the record sending
      helpers associated with the kauditd task could be named better, do
      these small cleanups now to make life easier once we start reworking
      the queues and kauditd code.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      af8b824f
    • Paul Moore's avatar
      audit: queue netlink multicast sends just like we do for unicast sends · 4aa83872
      Paul Moore authored
      Sending audit netlink multicast messages is bad for all the same
      reasons that sending audit netlink unicast messages is bad, so this
      patch reworks things so that we don't do the multicast send in
      audit_log_end(), we do it from the dedicated kauditd_thread thread just
      as we do for unicast messages.
      
      See the GitHub issues below for more information/history:
      
       * https://github.com/linux-audit/audit-kernel/issues/23
       * https://github.com/linux-audit/audit-kernel/issues/22Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      4aa83872
    • Paul Moore's avatar
      audit: fixup audit_init() · 6c925564
      Paul Moore authored
      Make sure everything is initialized before we start the kauditd_thread
      and don't emit the "initialized" record until everything is finished.
      We also panic with a descriptive message if we can't start the
      kauditd_thread.
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      6c925564
    • Richard Guy Briggs's avatar
      audit: move kaudit thread start from auditd registration to kaudit init (#2) · 55a6f170
      Richard Guy Briggs authored
      Richard made this change some time ago but Eric backed it out because
      the rest of the supporting code wasn't ready.  In order to move the
      netlink multicast send to kauditd_thread we need to ensure the
      kauditd_thread is always running, so restore commit 6ff5e459 ("audit:
      move kaudit thread start from auditd registration to kaudit init").
      Signed-off-by: default avatarRichard Guy Briggs <rbriggs@redhat.com>
      [PM: brought forward and merged based on Richard's old patch]
      Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
      55a6f170
    • 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