1. 23 9月, 2019 4 次提交
    • L
      Merge tag 'soundwire-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire · 8d7ead5c
      Linus Torvalds 提交于
      Pull soundwire updates from Vinod Koul:
       "This includes DT support thanks to Srini and more work done by Intel
        (Pierre) on improving cadence and intel support.
      
        Summary:
      
         - Add DT bindings and DT support in core
      
         - Add debugfs support for soundwire properties
      
         - Improvements on streaming handling to core
      
         - Improved handling of Cadence module
      
         - More updates and improvements to Intel driver"
      
      * tag 'soundwire-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire: (30 commits)
        soundwire: stream: make stream name a const pointer
        soundwire: Add compute_params callback
        soundwire: core: add device tree support for slave devices
        dt-bindings: soundwire: add slave bindings
        soundwire: bus: set initial value to port_status
        soundwire: intel: handle disabled links
        soundwire: intel: add debugfs register dump
        soundwire: cadence_master: add debugfs register dump
        soundwire: add debugfs support
        soundwire: intel: remove unused variables
        soundwire: intel: move shutdown() callback and don't export symbol
        soundwire: cadence_master: add kernel parameter to override interrupt mask
        soundwire: intel_init: add kernel module parameter to filter out links
        soundwire: cadence_master: fix divider setting in clock register
        soundwire: cadence_master: make use of mclk_freq property
        soundwire: intel: read mclk_freq property from firmware
        soundwire: add new mclk_freq field for properties
        soundwire: stream: remove unnecessary variable initializations
        soundwire: stream: fix disable sequence
        soundwire: include mod_devicetable.h to avoid compiling warnings
        ...
      8d7ead5c
    • L
      Merge tag 'modules-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · e0703556
      Linus Torvalds 提交于
      Pull modules updates from Jessica Yu:
       "The main bulk of this pull request introduces a new exported symbol
        namespaces feature. The number of exported symbols is increasingly
        growing with each release (we're at about 31k exports as of 5.3-rc7)
        and we currently have no way of visualizing how these symbols are
        "clustered" or making sense of this huge export surface.
      
        Namespacing exported symbols allows kernel developers to more
        explicitly partition and categorize exported symbols, as well as more
        easily limiting the availability of namespaced symbols to other parts
        of the kernel. For starters, we have introduced the USB_STORAGE
        namespace to demonstrate the API's usage. I have briefly summarized
        the feature and its main motivations in the tag below.
      
        Summary:
      
         - Introduce exported symbol namespaces.
      
           This new feature allows subsystem maintainers to partition and
           categorize their exported symbols into explicit namespaces. Module
           authors are now required to import the namespaces they need.
      
           Some of the main motivations of this feature include: allowing
           kernel developers to better manage the export surface, allow
           subsystem maintainers to explicitly state that usage of some
           exported symbols should only be limited to certain users (think:
           inter-module or inter-driver symbols, debugging symbols, etc), as
           well as more easily limiting the availability of namespaced symbols
           to other parts of the kernel.
      
           With the module import requirement, it is also easier to spot the
           misuse of exported symbols during patch review.
      
           Two new macros are introduced: EXPORT_SYMBOL_NS() and
           EXPORT_SYMBOL_NS_GPL(). The API is thoroughly documented in
           Documentation/kbuild/namespaces.rst.
      
         - Some small code and kbuild cleanups here and there"
      
      * tag 'modules-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        module: Remove leftover '#undef' from export header
        module: remove unneeded casts in cmp_name()
        module: move CONFIG_UNUSED_SYMBOLS to the sub-menu of MODULES
        module: remove redundant 'depends on MODULES'
        module: Fix link failure due to invalid relocation on namespace offset
        usb-storage: export symbols in USB_STORAGE namespace
        usb-storage: remove single-use define for debugging
        docs: Add documentation for Symbol Namespaces
        scripts: Coccinelle script for namespace dependencies.
        modpost: add support for generating namespace dependencies
        export: allow definition default namespaces in Makefiles or sources
        module: add config option MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS
        modpost: add support for symbol namespaces
        module: add support for symbol namespaces.
        export: explicitly align struct kernel_symbol
        module: support reading multiple values per modinfo tag
      e0703556
    • L
      Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 8808cf8c
      Linus Torvalds 提交于
      Pull ARM updates from Russell King:
      
       - fix various clang build and cppcheck issues
      
       - switch ARM to use new common outgoing-CPU-notification code
      
       - add some additional explanation about the boot code
      
       - kbuild "make clean" fixes
      
       - get rid of another "(____ptrval____)", this time for the VDSO code
      
       - avoid treating cache maintenance faults as a write
      
       - add a frame pointer unwinder implementation for clang
      
       - add EDAC support for Aurora L2 cache
      
       - improve robustness of adjust_lowmem_bounds() finding the bounds of
         lowmem.
      
       - add reset control for AMBA primecell devices
      
      * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (24 commits)
        ARM: 8906/1: drivers/amba: add reset control to amba bus probe
        ARM: 8905/1: Emit __gnu_mcount_nc when using Clang 10.0.0 or newer
        ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
        ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address
        ARM: 8891/1: EDAC: armada_xp: Add support for more SoCs
        ARM: 8888/1: EDAC: Add driver for the Marvell Armada XP SDRAM and L2 cache ECC
        ARM: 8892/1: EDAC: Add missing debugfs_create_x32 wrapper
        ARM: 8890/1: l2x0: add marvell,ecc-enable property for aurora
        ARM: 8889/1: dt-bindings: document marvell,ecc-enable binding
        ARM: 8886/1: l2x0: support parity-enable/disable on aurora
        ARM: 8885/1: aurora-l2: add defines for parity and ECC registers
        ARM: 8887/1: aurora-l2: add prefix to MAX_RANGE_SIZE
        ARM: 8902/1: l2c: move cache-aurora-l2.h to asm/hardware
        ARM: 8900/1: UNWINDER_FRAME_POINTER implementation for Clang
        ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes
        ARM: 8896/1: VDSO: Don't leak kernel addresses
        ARM: 8895/1: visit mach-* and plat-* directories when cleaning
        ARM: 8894/1: boot: Replace open-coded nop with macro
        ARM: 8893/1: boot: Explain the 8 nops
        ARM: 8876/1: fix O= building with CONFIG_FPE_FASTFPE
        ...
      8808cf8c
    • L
      Merge tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · 5c6bd5de
      Linus Torvalds 提交于
      Pull MIPS updates from Paul Burton:
       "Main MIPS changes:
      
         - boot_mem_map is removed, providing a nice cleanup made possible by
           the recent removal of bootmem.
      
         - Some fixes to atomics, in general providing compiler barriers for
           smp_mb__{before,after}_atomic plus fixes specific to Loongson CPUs
           or MIPS32 systems using cmpxchg64().
      
         - Conversion to the new generic VDSO infrastructure courtesy of
           Vincenzo Frascino.
      
         - Removal of undefined behavior in set_io_port_base(), fixing the
           behavior of some MIPS kernel configurations when built with recent
           clang versions.
      
         - Initial MIPS32 huge page support, functional on at least Ingenic
           SoCs.
      
         - pte_special() is now supported for some configurations, allowing
           among other things generic fast GUP to be used.
      
         - Miscellaneous fixes & cleanups.
      
        And platform specific changes:
      
         - Major improvements to Ingenic SoC support from Paul Cercueil,
           mostly enabled by the inclusion of the new TCU (timer-counter unit)
           drivers he's spent a very patient year or so working on. Plus some
           fixes for X1000 SoCs from Zhou Yanjie.
      
         - Netgear R6200 v1 systems are now supported by the bcm47xx platform.
      
         - DT updates for BMIPS, Lantiq & Microsemi Ocelot systems"
      
      * tag 'mips_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (89 commits)
        MIPS: Detect bad _PFN_SHIFT values
        MIPS: Disable pte_special() for MIPS32 with RiXi
        MIPS: ralink: deactivate PCI support for SOC_MT7621
        mips: compat: vdso: Use legacy syscalls as fallback
        MIPS: Drop Loongson _CACHE_* definitions
        MIPS: tlbex: Remove cpu_has_local_ebase
        MIPS: tlbex: Simplify r3k check
        MIPS: Select R3k-style TLB in Kconfig
        MIPS: PCI: refactor ioc3 special handling
        mips: remove ioremap_cachable
        mips/atomic: Fix smp_mb__{before,after}_atomic()
        mips/atomic: Fix loongson_llsc_mb() wreckage
        mips/atomic: Fix cmpxchg64 barriers
        MIPS: Octeon: remove duplicated include from dma-octeon.c
        firmware: bcm47xx_nvram: Allow COMPILE_TEST
        firmware: bcm47xx_nvram: Correct size_t printf format
        MIPS: Treat Loongson Extensions as ASEs
        MIPS: Remove dev_err() usage after platform_get_irq()
        MIPS: dts: mscc: describe the PTP ready interrupt
        MIPS: dts: mscc: describe the PTP register range
        ...
      5c6bd5de
  2. 22 9月, 2019 15 次提交
    • L
      Merge tag 'gfs2-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · f7c3bf8f
      Linus Torvalds 提交于
      Pull gfs2 updates from Andreas Gruenbacher:
      
       - Use asynchronous glocks and timeouts to recover from deadlocks during
         rename and exchange: the lock ordering constraints the vfs uses are
         not sufficient to prevent deadlocks across multiple nodes.
      
       - Add support for IOMAP_ZERO and use iomap_zero_range to replace gfs2
         specific code.
      
       - Various other minor fixes and cleanups.
      
      * tag 'gfs2-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps
        gfs2: Improve mmap write vs. truncate consistency
        gfs2: Use async glocks for rename
        gfs2: create function gfs2_glock_update_hold_time
        gfs2: separate holder for rgrps in gfs2_rename
        gfs2: Delete an unnecessary check before brelse()
        gfs2: Minor PAGE_SIZE arithmetic cleanups
        gfs2: Fix recovery slot bumping
        gfs2: Fix possible fs name overflows
        gfs2: untangle the logic in gfs2_drevalidate
        gfs2: Always mark inode dirty in fallocate
        gfs2: Minor gfs2_alloc_inode cleanup
        gfs2: implement gfs2_block_zero_range using iomap_zero_range
        gfs2: Add support for IOMAP_ZERO
        gfs2: gfs2_iomap_begin cleanup
      f7c3bf8f
    • L
      Merge tag 'f2fs-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · fbc246a1
      Linus Torvalds 提交于
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, we introduced casefolding support in f2fs, and fixed
        various bugs in individual features such as IO alignment,
        checkpoint=disable, quota, and swapfile.
      
        Enhancement:
         - support casefolding w/ enhancement in ext4
         - support fiemap for directory
         - support FS_IO_GET|SET_FSLABEL
      
        Bug fix:
         - fix IO stuck during checkpoint=disable
         - avoid infinite GC loop
         - fix panic/overflow related to IO alignment feature
         - fix livelock in swap file
         - fix discard command leak
         - disallow dio for atomic_write"
      
      * tag 'f2fs-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (51 commits)
        f2fs: add a condition to detect overflow in f2fs_ioc_gc_range()
        f2fs: fix to add missing F2FS_IO_ALIGNED() condition
        f2fs: fix to fallback to buffered IO in IO aligned mode
        f2fs: fix to handle error path correctly in f2fs_map_blocks
        f2fs: fix extent corrupotion during directIO in LFS mode
        f2fs: check all the data segments against all node ones
        f2fs: Add a small clarification to CONFIG_FS_F2FS_FS_SECURITY
        f2fs: fix inode rwsem regression
        f2fs: fix to avoid accessing uninitialized field of inode page in is_alive()
        f2fs: avoid infinite GC loop due to stale atomic files
        f2fs: Fix indefinite loop in f2fs_gc()
        f2fs: convert inline_data in prior to i_size_write
        f2fs: fix error path of f2fs_convert_inline_page()
        f2fs: add missing documents of reserve_root/resuid/resgid
        f2fs: fix flushing node pages when checkpoint is disabled
        f2fs: enhance f2fs_is_checkpoint_ready()'s readability
        f2fs: clean up __bio_alloc()'s parameter
        f2fs: fix wrong error injection path in inc_valid_block_count()
        f2fs: fix to writeout dirty inode during node flush
        f2fs: optimize case-insensitive lookups
        ...
      fbc246a1
    • L
      Merge tag 'for_v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 7ce1e15d
      Linus Torvalds 提交于
      Pull ext2, quota, udf fixes and cleanups from Jan Kara:
      
       - two small quota fixes (in grace time handling and possible missed
         accounting of preallocated blocks beyond EOF).
      
       - some ext2 cleanups
      
       - udf fixes for better compatibility with Windows 10 generated media
         (named streams, write-protection using domain-identifier, placement
         of volume recognition sequence)
      
       - some udf cleanups
      
      * tag 'for_v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: fix wrong condition in is_quota_modification()
        fs-udf: Delete an unnecessary check before brelse()
        ext2: Delete an unnecessary check before brelse()
        udf: Drop forward function declarations
        udf: Verify domain identifier fields
        udf: augment UDF permissions on new inodes
        udf: Use dynamic debug infrastructure
        udf: reduce leakage of blocks related to named streams
        udf: prevent allocation beyond UDF partition
        quota: fix condition for resetting time limit in do_set_dqblk()
        ext2: code cleanup for ext2_free_blocks()
        ext2: fix block range in ext2_data_block_valid()
        udf: support 2048-byte spacing of VRS descriptors on 4K media
        udf: refactor VRS descriptor identification
      7ce1e15d
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 70cb0d02
      Linus Torvalds 提交于
      Pull ext4 updates from Ted Ts'o:
       "Added new ext4 debugging ioctls to allow userspace to get information
        about the state of the extent status cache.
      
        Dropped workaround for pre-1970 dates which were encoded incorrectly
        in pre-4.4 kernels. Since both the kernel correctly generates, and
        e2fsck detects and fixes this issue for the past four years, it'e time
        to drop the workaround. (Also, it's not like files with dates in the
        distant past were all that common in the first place.)
      
        A lot of miscellaneous bug fixes and cleanups, including some ext4
        Documentation fixes. Also included are two minor bug fixes in
        fs/unicode"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (21 commits)
        unicode: make array 'token' static const, makes object smaller
        unicode: Move static keyword to the front of declarations
        ext4: add missing bigalloc documentation.
        ext4: fix kernel oops caused by spurious casefold flag
        ext4: fix integer overflow when calculating commit interval
        ext4: use percpu_counters for extent_status cache hits/misses
        ext4: fix potential use after free after remounting with noblock_validity
        jbd2: add missing tracepoint for reserved handle
        ext4: fix punch hole for inline_data file systems
        ext4: rework reserved cluster accounting when invalidating pages
        ext4: documentation fixes
        ext4: treat buffers with write errors as containing valid data
        ext4: fix warning inside ext4_convert_unwritten_extents_endio
        ext4: set error return correctly when ext4_htree_store_dirent fails
        ext4: drop legacy pre-1970 encoding workaround
        ext4: add new ioctl EXT4_IOC_GET_ES_CACHE
        ext4: add a new ioctl EXT4_IOC_GETSTATE
        ext4: add a new ioctl EXT4_IOC_CLEAR_ES_CACHE
        jbd2: flush_descriptor(): Do not decrease buffer head's ref count
        ext4: remove unnecessary error check
        ...
      70cb0d02
    • L
      Merge tag 'upstream-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · 104c0d6b
      Linus Torvalds 提交于
      Pull UBI, UBIFS and JFFS2 updates from Richard Weinberger:
       "UBI:
         - Be less stupid when placing a fastmap anchor
         - Try harder to get an empty PEB in case of contention
         - Make ubiblock to warn if image is not a multiple of 512
      
        UBIFS:
         - Various fixes in error paths
      
        JFFS2:
         - Various fixes in error paths"
      
      * tag 'upstream-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        jffs2: Fix memory leak in jffs2_scan_eraseblock() error path
        jffs2: Remove jffs2_gc_fetch_page and jffs2_gc_release_page
        jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()
        ubi: block: Warn if volume size is not multiple of 512
        ubifs: Fix memory leak bug in alloc_ubifs_info() error path
        ubifs: Fix memory leak in __ubifs_node_verify_hmac error path
        ubifs: Fix memory leak in read_znode() error path
        ubi: ubi_wl_get_peb: Increase the number of attempts while getting PEB
        ubi: Don't do anchor move within fastmap area
        ubifs: Remove redundant assignment to pointer fname
      104c0d6b
    • L
      Merge tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 9dca3432
      Linus Torvalds 提交于
      Pull UML updates from Richard Weinberger:
      
       - virtio support
      
       - fixes for our new time travel mode
      
       - various improvements to make lockdep and kasan work better
      
       - SPDX header updates
      
      * tag 'for-linus-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (25 commits)
        um: irq: Fix LAST_IRQ usage in init_IRQ()
        um: Add SPDX headers for files in arch/um/include
        um: Add SPDX headers for files in arch/um/os-Linux
        um: Add SPDX headers to files in arch/um/kernel/
        um: Add SPDX headers for files in arch/um/drivers
        um: virtio: Implement VHOST_USER_PROTOCOL_F_REPLY_ACK
        um: virtio: Implement VHOST_USER_PROTOCOL_F_SLAVE_REQ
        um: drivers: Add virtio vhost-user driver
        um: Use real DMA barriers
        um: Don't use generic barrier.h
        um: time-travel: Restrict time update in IRQ handler
        um: time-travel: Fix periodic timers
        um: Enable CONFIG_CONSTRUCTORS
        um: Place (soft)irq text with macros
        um: Fix VDSO compiler warning
        um: Implement TRACE_IRQFLAGS_SUPPORT
        um: Remove misleading #define ARCh_IRQ_ENABLED
        um: Avoid using uninitialized regs
        um: Remove sig_info[SIGALRM]
        um: Error handling fixes in vector drivers
        ...
      9dca3432
    • L
      Merge tag 'mtd/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · 4553d469
      Linus Torvalds 提交于
      Pull MTD updates from Richard Weinberger:
       "MTD core changes:
         - add debugfs nodes for querying the flash name and id
         - mtd parser reorganization
      
        SPI NOR core changes:
         - always use bounce buffer for register read/writes
         - move m25p80 code in spi-nor.c
         - rework hwcaps selection for the spi-mem case
         - rework the core in order to move the manufacturer specific code out
           of it:
             - regroup flash parameters in 'struct spi_nor_flash_parameter'
             - add default_init() and post_sfdp() hooks to tweak the flash
               parameters
             - introduce the ->set_4byte(), ->convert_addr() and ->setup()
               methods, to deal with manufacturer specific code
             - rework the SPI NOR lock/unlock logic
         - fix an error code in spi_nor_read_raw()
         - fix a memory leak bug
         - enable the debugfs for the partname and partid
         - add support for few flashes
      
        SPI NOR controller drivers changes:
         - intel-spi:
             - Whitelist 4B read commands
             - Add support for Intel Tiger Lake SPI serial flash
         - aspeed-smc: Add of_node_put()
         - hisi-sfc: add of_node_put()
         - cadence-quadspi: Fix QSPI RCU Schedule Stall
      
        NAND core:
         - Fixing typos
         - Adding missing of_node_put() in various drivers
      
        Raw NAND controller drivers:
         - Macronix: new controller driver
         - Omap2: fix the number of bitflips returned
         - Brcmnand: fix a pointer not iterating over all the page chunks
         - W90x900: driver removed
         - Onenand: fix a memory leak
         - Sharpsl: missing include guard
         - STM32: avoid warnings when building with W=1
         - Ingenic: fix a coccinelle warning
         - r852: call a helper to simplify the code
      
        CFI core:
         - Kill useless initializer in mtd_do_chip_probe()
         - Fix a rare write failure seen on some cfi_cmdset_0002 compliant
           Parallel NORs
         - Bunch of cleanups for cfi_cmdset_0002 driver's write functions by
           Tokunori Ikegami"
      
      * tag 'mtd/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (77 commits)
        mtd: pmc551: Remove set but not used variable 'soff_lo'
        mtd: cfi_cmdset_0002: Fix do_erase_chip() to get chip as erasing mode
        mtd: sm_ftl: Fix memory leak in sm_init_zone() error path
        mtd: parsers: Move CMDLINE parser
        mtd: parsers: Move OF parser
        mtd: parsers: Move BCM63xx parser
        mtd: parsers: Move BCM47xx parser
        mtd: parsers: Move TI AR7 parser
        mtd: pismo: Simplify getting the adapter of a client
        mtd: phram: Module parameters add writable permissions
        mtd: pxa2xx: Use ioremap_cache insted of ioremap_cached
        mtd: spi-nor: Rename "n25q512a" to "mt25qu512a (n25q512a)"
        mtd: spi-nor: Add support for mt35xu02g
        mtd: rawnand: omap2: Fix number of bitflips reporting with ELM
        mtd: rawnand: brcmnand: Fix ecc chunk calculation for erased page bitfips
        mtd: spi-nor: remove superfluous pass of nor->info->sector_size
        mtd: spi-nor: enable the debugfs for the partname and partid
        mtd: mtdcore: add debugfs nodes for querying the flash name and id
        mtd: spi-nor: hisi-sfc: Add of_node_put() before break
        mtd: spi-nor: aspeed-smc: Add of_node_put()
        ...
      4553d469
    • L
      Merge tag 'libnvdimm-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 6cb2e9ee
      Linus Torvalds 提交于
      Pull libnvdimm updates from Dan Williams:
       "Some reworks to better support nvdimms on powerpc and an nvdimm
        security interface update:
      
         - Rework the nvdimm core to accommodate architectures with different
           page sizes and ones that can change supported huge page sizes at
           boot time rather than a compile time constant.
      
         - Introduce a distinct 'frozen' attribute for the nvdimm security
           state since it is independent of the locked state.
      
         - Miscellaneous fixups"
      
      * tag 'libnvdimm-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        libnvdimm: Use PAGE_SIZE instead of SZ_4K for align check
        libnvdimm/label: Remove the dpa align check
        libnvdimm/pfn_dev: Add page size and struct page size to pfn superblock
        libnvdimm/pfn_dev: Add a build check to make sure we notice when struct page size change
        libnvdimm/pmem: Advance namespace seed for specific probe errors
        libnvdimm/region: Rewrite _probe_success() to _advance_seeds()
        libnvdimm/security: Consolidate 'security' operations
        libnvdimm/security: Tighten scope of nvdimm->busy vs security operations
        libnvdimm/security: Introduce a 'frozen' attribute
        libnvdimm, region: Use struct_size() in kzalloc()
        tools/testing/nvdimm: Fix fallthrough warning
        libnvdimm/of_pmem: Provide a unique name for bus provider
      6cb2e9ee
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 10fd7178
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly update of the usual drivers: qla2xxx, ufs, smartpqi,
        lpfc, hisi_sas, qedf, mpt3sas; plus a whole load of minor updates. The
        only core change this time around is the addition of request batching
        for virtio. Since batching requires an additional flag to use, it
        should be invisible to the rest of the drivers"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (264 commits)
        scsi: hisi_sas: Fix the conflict between device gone and host reset
        scsi: hisi_sas: Add BIST support for phy loopback
        scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation
        scsi: hisi_sas: Remove some unused function arguments
        scsi: hisi_sas: Remove redundant work declaration
        scsi: hisi_sas: Remove hisi_sas_hw.slot_complete
        scsi: hisi_sas: Assign NCQ tag for all NCQ commands
        scsi: hisi_sas: Update all the registers after suspend and resume
        scsi: hisi_sas: Retry 3 times TMF IO for SAS disks when init device
        scsi: hisi_sas: Remove sleep after issue phy reset if sas_smp_phy_control() fails
        scsi: hisi_sas: Directly return when running I_T_nexus reset if phy disabled
        scsi: hisi_sas: Use true/false as input parameter of sas_phy_reset()
        scsi: hisi_sas: add debugfs auto-trigger for internal abort time out
        scsi: virtio_scsi: unplug LUNs when events missed
        scsi: scsi_dh_rdac: zero cdb in send_mode_select()
        scsi: fcoe: fix null-ptr-deref Read in fc_release_transport
        scsi: ufs-hisi: use devm_platform_ioremap_resource() to simplify code
        scsi: ufshcd: use devm_platform_ioremap_resource() to simplify code
        scsi: hisi_sas: use devm_platform_ioremap_resource() to simplify code
        scsi: ufs: Use kmemdup in ufshcd_read_string_desc()
        ...
      10fd7178
    • L
      Merge tag 'for-5.4/dm-changes' of... · 3e414b5b
      Linus Torvalds 提交于
      Merge tag 'for-5.4/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
      
      Pull device mapper updates from Mike Snitzer:
      
       - crypto and DM crypt advances that allow the crypto API to reclaim
         implementation details that do not belong in DM crypt. The wrapper
         template for ESSIV generation that was factored out will also be used
         by fscrypt in the future.
      
       - Add root hash pkcs#7 signature verification to the DM verity target.
      
       - Add a new "clone" DM target that allows for efficient remote
         replication of a device.
      
       - Enhance DM bufio's cache to be tailored to each client based on use.
         Clients that make heavy use of the cache get more of it, and those
         that use less have reduced cache usage.
      
       - Add a new DM_GET_TARGET_VERSION ioctl to allow userspace to query the
         version number of a DM target (even if the associated module isn't
         yet loaded).
      
       - Fix invalid memory access in DM zoned target.
      
       - Fix the max_discard_sectors limit advertised by the DM raid target;
         it was mistakenly storing the limit in bytes rather than sectors.
      
       - Small optimizations and cleanups in DM writecache target.
      
       - Various fixes and cleanups in DM core, DM raid1 and space map portion
         of DM persistent data library.
      
      * tag 'for-5.4/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (22 commits)
        dm: introduce DM_GET_TARGET_VERSION
        dm bufio: introduce a global cache replacement
        dm bufio: remove old-style buffer cleanup
        dm bufio: introduce a global queue
        dm bufio: refactor adjust_total_allocated
        dm bufio: call adjust_total_allocated from __link_buffer and __unlink_buffer
        dm: add clone target
        dm raid: fix updating of max_discard_sectors limit
        dm writecache: skip writecache_wait for pmem mode
        dm stats: use struct_size() helper
        dm crypt: omit parsing of the encapsulated cipher
        dm crypt: switch to ESSIV crypto API template
        crypto: essiv - create wrapper template for ESSIV generation
        dm space map common: remove check for impossible sm_find_free() return value
        dm raid1: use struct_size() with kzalloc()
        dm writecache: optimize performance by sorting the blocks for writeback_all
        dm writecache: add unlikely for getting two block with same LBA
        dm writecache: remove unused member pointer in writeback_struct
        dm zoned: fix invalid memory access
        dm verity: add root hash pkcs#7 signature verification
        ...
      3e414b5b
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · 018c6837
      Linus Torvalds 提交于
      Pull RDMA subsystem updates from Jason Gunthorpe:
       "This cycle mainly saw lots of bug fixes and clean up code across the
        core code and several drivers, few new functional changes were made.
      
         - Many cleanup and bug fixes for hns
      
         - Various small bug fixes and cleanups in hfi1, mlx5, usnic, qed,
           bnxt_re, efa
      
         - Share the query_port code between all the iWarp drivers
      
         - General rework and cleanup of the ODP MR umem code to fit better
           with the mmu notifier get/put scheme
      
         - Support rdma netlink in non init_net name spaces
      
         - mlx5 support for XRC devx and DC ODP"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (99 commits)
        RDMA: Fix double-free in srq creation error flow
        RDMA/efa: Fix incorrect error print
        IB/mlx5: Free mpi in mp_slave mode
        IB/mlx5: Use the original address for the page during free_pages
        RDMA/bnxt_re: Fix spelling mistake "missin_resp" -> "missing_resp"
        RDMA/hns: Package operations of rq inline buffer into separate functions
        RDMA/hns: Optimize cmd init and mode selection for hip08
        IB/hfi1: Define variables as unsigned long to fix KASAN warning
        IB/{rdmavt, hfi1, qib}: Add a counter for credit waits
        IB/hfi1: Add traces for TID RDMA READ
        RDMA/siw: Relax from kmap_atomic() use in TX path
        IB/iser: Support up to 16MB data transfer in a single command
        RDMA/siw: Fix page address mapping in TX path
        RDMA: Fix goto target to release the allocated memory
        RDMA/usnic: Avoid overly large buffers on stack
        RDMA/odp: Add missing cast for 32 bit
        RDMA/hns: Use devm_platform_ioremap_resource() to simplify code
        Documentation/infiniband: update name of some functions
        RDMA/cma: Fix false error message
        RDMA/hns: Fix wrong assignment of qp_access_flags
        ...
      018c6837
    • L
      Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · 84da111d
      Linus Torvalds 提交于
      Pull hmm updates from Jason Gunthorpe:
       "This is more cleanup and consolidation of the hmm APIs and the very
        strongly related mmu_notifier interfaces. Many places across the tree
        using these interfaces are touched in the process. Beyond that a
        cleanup to the page walker API and a few memremap related changes
        round out the series:
      
         - General improvement of hmm_range_fault() and related APIs, more
           documentation, bug fixes from testing, API simplification &
           consolidation, and unused API removal
      
         - Simplify the hmm related kconfigs to HMM_MIRROR and DEVICE_PRIVATE,
           and make them internal kconfig selects
      
         - Hoist a lot of code related to mmu notifier attachment out of
           drivers by using a refcount get/put attachment idiom and remove the
           convoluted mmu_notifier_unregister_no_release() and related APIs.
      
         - General API improvement for the migrate_vma API and revision of its
           only user in nouveau
      
         - Annotate mmu_notifiers with lockdep and sleeping region debugging
      
        Two series unrelated to HMM or mmu_notifiers came along due to
        dependencies:
      
         - Allow pagemap's memremap_pages family of APIs to work without
           providing a struct device
      
         - Make walk_page_range() and related use a constant structure for
           function pointers"
      
      * tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (75 commits)
        libnvdimm: Enable unit test infrastructure compile checks
        mm, notifier: Catch sleeping/blocking for !blockable
        kernel.h: Add non_block_start/end()
        drm/radeon: guard against calling an unpaired radeon_mn_unregister()
        csky: add missing brackets in a macro for tlb.h
        pagewalk: use lockdep_assert_held for locking validation
        pagewalk: separate function pointers from iterator data
        mm: split out a new pagewalk.h header from mm.h
        mm/mmu_notifiers: annotate with might_sleep()
        mm/mmu_notifiers: prime lockdep
        mm/mmu_notifiers: add a lockdep map for invalidate_range_start/end
        mm/mmu_notifiers: remove the __mmu_notifier_invalidate_range_start/end exports
        mm/hmm: hmm_range_fault() infinite loop
        mm/hmm: hmm_range_fault() NULL pointer bug
        mm/hmm: fix hmm_range_fault()'s handling of swapped out pages
        mm/mmu_notifiers: remove unregister_no_release
        RDMA/odp: remove ib_ucontext from ib_umem
        RDMA/odp: use mmu_notifier_get/put for 'struct ib_ucontext_per_mm'
        RDMA/mlx5: Use odp instead of mr->umem in pagefault_mr
        RDMA/mlx5: Use ib_umem_start instead of umem.address
        ...
      84da111d
    • L
      Merge tag 'compiler-attributes-for-linus-v5.4' of git://github.com/ojeda/linux · 227c3e9e
      Linus Torvalds 提交于
      Pull asm inline support from Miguel Ojeda:
       "Make use of gcc 9's "asm inline()" (Rasmus Villemoes):
      
        gcc 9+ (and gcc 8.3, 7.5) provides a way to override the otherwise
        crude heuristic that gcc uses to estimate the size of the code
        represented by an asm() statement. From the gcc docs
      
            If you use 'asm inline' instead of just 'asm', then for inlining
            purposes the size of the asm is taken as the minimum size, ignoring
            how many instructions GCC thinks it is.
      
        For compatibility with older compilers, we obviously want a
      
            #if [understands asm inline]
            #define asm_inline asm inline
            #else
            #define asm_inline asm
            #endif
      
        But since we #define the identifier inline to attach some attributes,
        we have to use an alternate spelling of that keyword. gcc provides
        both __inline__ and __inline, and we currently #define both to inline,
        so they all have the same semantics.
      
        We have to free up one of __inline__ and __inline, and the latter is
        by far the easiest.
      
        The two x86 changes cause smaller code gen differences than I'd
        expect, but I think we do want the asm_inline thing available sooner
        or later, so this is just to get the ball rolling"
      
      * tag 'compiler-attributes-for-linus-v5.4' of git://github.com/ojeda/linux:
        x86: bug.h: use asm_inline in _BUG_FLAGS definitions
        x86: alternative.h: use asm_inline for all alternative variants
        compiler-types.h: add asm_inline definition
        compiler_types.h: don't #define __inline
        lib/zstd/mem.h: replace __inline by inline
        staging: rtl8723bs: replace __inline by inline
      227c3e9e
    • L
      Merge tag 'gcc-plugins-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 56c631f5
      Linus Torvalds 提交于
      Pull gcc-plugins fix from Kees Cook:
       "Fix a potential problem in randomize_layout structure auto-selection
        (that was not triggered by any existing kernel structures)"
      
      * tag 'gcc-plugins-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        randstruct: Check member structs in is_pure_ops_struct()
      56c631f5
    • L
      Merge tag 'printk-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · 56c1e834
      Linus Torvalds 提交于
      Pull printk updates from Petr Mladek:
      
       - Fix off-by-one error when calculating messages that might fit into
         kmsg buffer. It causes occasional omitting of the last message.
      
       - Add missing pointer check in %pD format modifier handling.
      
       - Some clean up
      
      * tag 'printk-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
        ABI: Update dev-kmsg documentation to match current kernel behaviour
        printk: Replace strncmp() with str_has_prefix()
        lib/test_printf: Remove obvious comments from %pd and %pD tests
        lib/test_printf: Add test of null/invalid pointer dereference for dentry
        vsprintf: Prevent crash when dereferencing invalid pointers for %pD
        printk: Do not lose last line in kmsg buffer dump
      56c1e834
  3. 21 9月, 2019 11 次提交
    • L
      Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · f97c81dc
      Linus Torvalds 提交于
      Pull ARM SoC late updates from Arnd Bergmann:
       "This is some material that we picked up into our tree late or that had
        complex inter-depondencies. The fact that there are these
        interdependencies tends to meant that these are often actually the
        most interesting new additions:
      
         - The new Aspeed AST2600 baseboard management controller is added,
           this is a Cortex-A7 based follow-up to the ARM11 based AST2500 and
           had some dependencies on other device drivers.
      
         - After many years, support for the MMP2 based OLPC XO-1.75 finally
           makes it into the kernel.
      
         - The Armada 3720 based Turris Mox open source router platform is a
           late addition and it follows some preparatory work across multiple
           branches.
      
         - The OMAP2+ platform had some large-scale cleanup involving driver
           changes and DT changes, here we finish it off, dropping a lot of
           the now-unused platform data.
      
         - The TI K3 platform that got added for 5.3 gains a lot more support
           for individual bits on the SoC, this part just came late for the
           merge window"
      
      [ This pull request itself wasn't actually sent late at all by Arnd, but
        I waited on the branches that it used to be pulled first, so it ends
        up being merged much later than the other ARM SoC pull requests this
        merge window     - Linus ]
      
      * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (57 commits)
        ARM: dts: dir685: Drop spi-cpol from the display
        ARM: dts: aspeed: Add AST2600 pinmux nodes
        ARM: dts: aspeed: Add AST2600 and EVB
        ARM: exynos: Enable support for ARM architected timers
        ARM: samsung: Fix system restart on S3C6410
        ARM: dts: mmp2: add OLPC XO 1.75 machine
        ARM: dts: mmp2: rename the USB PHY node
        ARM: dts: mmp2: specify reg-shift for the UARTs
        ARM: dts: mmp2: add camera interfaces
        ARM: dts: mmp2: fix the SPI nodes
        ARM: dts: mmp2: trivial whitespace fix
        arm64: dts: marvell: add DTS for Turris Mox
        dt-bindings: marvell: document Turris Mox compatible
        arm64: dts: marvell: armada-37xx: add SPI CS1 pinctrl
        arm64: dts: ti: k3-j721e-main: Fix gic-its node unit-address
        arm64: dts: ti: k3-am65-main: Fix gic-its node unit-address
        arm64: dts: ti: k3-j721e-main: Add hwspinlock node
        arm64: dts: ti: k3-am65-main: Add hwspinlock node
        arm64: dts: k3-j721e: Add gpio-keys on common processor board
        dt-bindings: pinctrl: k3: Introduce pinmux definitions for J721E
        ...
      f97c81dc
    • L
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · a703d279
      Linus Torvalds 提交于
      Pull clk updates from Stephen Boyd:
       "We have a small collection of core framework updates this time, mostly
        around clk registration by clk providers and debugfs "nice to haves"
        for rate constraints. I'll highlight that we're now setting the
        clk_init_data pointer inside struct clk_hw to NULL during
        clk_register(), which may break some drivers that thought they could
        use that pointer during normal operations. That change has been
        sitting in next for a while now but maybe something is still broken.
        We'l see. Other than that the core framework changes aren't invasive
        and they're fixing bugs, simplifying, and making things better.
      
        On the clk driver side we got the usual addition of new SoC support,
        new features for existing drivers, and bug fixes scattered throughout.
        The biggest diffstat is the Amlogic driver that gained CPU clk support
        in addition to migrating to the new way of specifying clk parents.
        After that the Qualcomm, i.MX, Mediatek, and Rockchip clk drivers got
        support for various new SoCs and clock controllers from those vendors.
      
        Core:
         - Drop NULL checks in clk debugfs
         - Add min/max rates to clk debugfs
         - Set clk_init_data pointer inside clk_hw to NULL after registration
         - Make clk_bulk_get_all() return an 'id' corresponding to clock-names
         - Evict parents from parent cache when they're unregistered
      
        New Drivers:
         - Add clock driver for i.MX8MN SoCs
         - Support aspeed AST2600 SoCs
         - Support for Mediatek MT6779 SoCs
         - Support qcom SM8150 GCC and RPMh clks
         - Support qcom QCS404 WCSS clks
         - Add CPU clock support for Armada 7K/8K (specifically AP806 and AP807)
         - Addition of clock driver for Rockchip rk3308 SoCs
      
        Updates:
         - Add regulator support to the cdce925 clk driver
         - Add support for Raspberry Pi 4 bcm2711 SoCs
         - Add SDIO gate support to aspeed driver
         - Add missing of_node_put() calls in various clk drivers
         - Migrate Amlogic driver to new clock parent description method
         - Add DVFS support to Amlogic Meson g12
         - Add Amlogic Meson g12a reset support to the axg audio clock controller
         - Add sm1 support to the Amlogic Meson g12a clock controller
         - Switch i.MX8MM clock driver to platform driver
         - Add Hifi4 DSP related clocks for i.MX8QXP SoC
         - Fix Audio PLL setting and parent clock for USB
         - Misc i.MX8 clock driver improvements and corrections
         - Set floor ops for Qualcomm SD clks so that rounding works
         - Fix "always-on" Clock Domains on Renesas R-Car M1A, RZ/A1, RZ/A2, and RZ/N1
         - Enable the Allwinner V3 SoC and fix the i2s clock for H6"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (137 commits)
        clk: Drop !clk checks in debugfs dumping
        clk: imx: imx8mn: fix pll mux bit
        clk: imx: imx8mm: fix pll mux bit
        clk: imx: clk-pll14xx: unbypass PLL by default
        clk: imx: pll14xx: avoid glitch when set rate
        clk: mvebu: ap80x: add AP807 clock support
        clk: mvebu: ap806: Prepare the introduction of AP807 clock support
        clk: mvebu: ap806: add AP-DCLK (hclk) to system controller driver
        clk: mvebu: ap806: be more explicit on what SaR is
        clk: mvebu: ap80x-cpu: add AP807 CPU clock support
        clk: mvebu: ap806-cpu: prepare mapping of AP807 CPU clock
        dt-bindings: ap806: Document AP807 clock compatible
        dt-bindings: ap80x: Document AP807 CPU clock compatible
        clk: sprd: add missing kfree
        clk: at91: allow 24 Mhz clock as input for PLL
        clk: Make clk_bulk_get_all() return a valid "id"
        clk: actions: Fix factor clk struct member access
        clk: qcom: rcg: Return failure for RCG update
        clk: remove extra ---help--- tags in Kconfig
        clk: add include guard to clk-conf.h
        ...
      a703d279
    • L
      Merge tag 'vfio-v5.4-rc1' of git://github.com/awilliam/linux-vfio · 1ddd0027
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - Fix spapr iommu error case case (Alexey Kardashevskiy)
      
       - Consolidate region type definitions (Cornelia Huck)
      
       - Restore saved original PCI state on release (hexin)
      
       - Simplify mtty sample driver interrupt path (Parav Pandit)
      
       - Support for reporting valid IOVA regions to user (Shameer Kolothum)
      
      * tag 'vfio-v5.4-rc1' of git://github.com/awilliam/linux-vfio:
        vfio_pci: Restore original state on release
        vfio/type1: remove duplicate retrieval of reserved regions
        vfio/type1: Add IOVA range capability support
        vfio/type1: check dma map request is within a valid iova range
        vfio/spapr_tce: Fix incorrect tce_iommu_group memory free
        vfio-mdev/mtty: Simplify interrupt generation
        vfio: re-arrange vfio region definitions
        vfio/type1: Update iova list on detach
        vfio/type1: Check reserved region conflict and update iova list
        vfio/type1: Introduce iova list and add iommu aperture validity check
      1ddd0027
    • P
      MIPS: Detect bad _PFN_SHIFT values · 05d013a0
      Paul Burton 提交于
      2 recent commits have fixed issues where _PFN_SHIFT grew too large due
      to the introduction of too many pgprot bits in our PTEs for some MIPS32
      kernel configurations. Tracking down such issues can be tricky, so add a
      BUILD_BUG_ON() to help.
      Signed-off-by: NPaul Burton <paul.burton@mips.com>
      Cc: linux-mips@vger.kernel.org
      05d013a0
    • P
      MIPS: Disable pte_special() for MIPS32 with RiXi · d1af2ab3
      Paul Burton 提交于
      Commit 61cbfff4 ("MIPS: pte_special()/pte_mkspecial() support")
      added a _PAGE_SPECIAL bit to the pgprot bits of our PTEs. Unfortunately
      for MIPS32 configurations with RiXi support this pushed the number of
      pgprot bits to 13. Since the PFN field in EntryLo begins at bit 12 this
      results in us shifting the most significant bit of the physical address
      beyond the end of the PTE, leading any mapped access to a physical
      address above 2GB to incorrectly access an address 2GB lower than
      intended.
      
      For now, disable the pte_special() support for MIPS32 configurations
      that support RiXi.
      
      Fixes: 61cbfff4 ("MIPS: pte_special()/pte_mkspecial() support")
      Signed-off-by: NPaul Burton <paul.burton@mips.com>
      Cc: Dmitry Korotin <dkorotin@wavecomp.com>
      Cc: linux-mips@vger.kernel.org
      d1af2ab3
    • L
      Merge tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 45824fc0
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
       "This is a bit late, partly due to me travelling, and partly due to a
        power outage knocking out some of my test systems *while* I was
        travelling.
      
         - Initial support for running on a system with an Ultravisor, which
           is software that runs below the hypervisor and protects guests
           against some attacks by the hypervisor.
      
         - Support for building the kernel to run as a "Secure Virtual
           Machine", ie. as a guest capable of running on a system with an
           Ultravisor.
      
         - Some changes to our DMA code on bare metal, to allow devices with
           medium sized DMA masks (> 32 && < 59 bits) to use more than 2GB of
           DMA space.
      
         - Support for firmware assisted crash dumps on bare metal (powernv).
      
         - Two series fixing bugs in and refactoring our PCI EEH code.
      
         - A large series refactoring our exception entry code to use gas
           macros, both to make it more readable and also enable some future
           optimisations.
      
        As well as many cleanups and other minor features & fixups.
      
        Thanks to: Adam Zerella, Alexey Kardashevskiy, Alistair Popple, Andrew
        Donnellan, Aneesh Kumar K.V, Anju T Sudhakar, Anshuman Khandual,
        Balbir Singh, Benjamin Herrenschmidt, Cédric Le Goater, Christophe
        JAILLET, Christophe Leroy, Christopher M. Riedl, Christoph Hellwig,
        Claudio Carvalho, Daniel Axtens, David Gibson, David Hildenbrand,
        Desnes A. Nunes do Rosario, Ganesh Goudar, Gautham R. Shenoy, Greg
        Kurz, Guerney Hunt, Gustavo Romero, Halil Pasic, Hari Bathini, Joakim
        Tjernlund, Jonathan Neuschafer, Jordan Niethe, Leonardo Bras, Lianbo
        Jiang, Madhavan Srinivasan, Mahesh Salgaonkar, Mahesh Salgaonkar,
        Masahiro Yamada, Maxiwell S. Garcia, Michael Anderson, Nathan
        Chancellor, Nathan Lynch, Naveen N. Rao, Nicholas Piggin, Oliver
        O'Halloran, Qian Cai, Ram Pai, Ravi Bangoria, Reza Arbab, Ryan Grimm,
        Sam Bobroff, Santosh Sivaraj, Segher Boessenkool, Sukadev Bhattiprolu,
        Thiago Bauermann, Thiago Jung Bauermann, Thomas Gleixner, Tom
        Lendacky, Vasant Hegde"
      
      * tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (264 commits)
        powerpc/mm/mce: Keep irqs disabled during lockless page table walk
        powerpc: Use ftrace_graph_ret_addr() when unwinding
        powerpc/ftrace: Enable HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
        ftrace: Look up the address of return_to_handler() using helpers
        powerpc: dump kernel log before carrying out fadump or kdump
        docs: powerpc: Add missing documentation reference
        powerpc/xmon: Fix output of XIVE IPI
        powerpc/xmon: Improve output of XIVE interrupts
        powerpc/mm/radix: remove useless kernel messages
        powerpc/fadump: support holes in kernel boot memory area
        powerpc/fadump: remove RMA_START and RMA_END macros
        powerpc/fadump: update documentation about option to release opalcore
        powerpc/fadump: consider f/w load area
        powerpc/opalcore: provide an option to invalidate /sys/firmware/opal/core file
        powerpc/opalcore: export /sys/firmware/opal/core for analysing opal crashes
        powerpc/fadump: update documentation about CONFIG_PRESERVE_FA_DUMP
        powerpc/fadump: add support to preserve crash data on FADUMP disabled kernel
        powerpc/fadump: improve how crashed kernel's memory is reserved
        powerpc/fadump: consider reserved ranges while releasing memory
        powerpc/fadump: make crash memory ranges array allocation generic
        ...
      45824fc0
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8c2b418c
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
       "We've had a few arm64 fixes trickle in this week. Nothing catastophic,
        but all things that should be addressed:
      
         - Fix clang build breakage with CONFIG_OPTIMIZE_INLINING=y
      
         - Fix compilation of pointer tagging selftest
      
         - Fix COND_SYSCALL definitions to work with CFI checks
      
         - Fix stale documentation reference in our Kconfig"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI
        arm64: fix function types in COND_SYSCALL
        selftests, arm64: add kernel headers path for tags_test
        arm64: fix unreachable code issue with cmpxchg
      8c2b418c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · bb736a5c
      Linus Torvalds 提交于
      Pull Hexagon maintainership update from Richard Kuo:
       "I am leaving QuIC, and Brian Cain will be taking over maintainership
        of the Hexagon port"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        Hexagon: change maintainer to Brian Cain
      bb736a5c
    • L
      Merge tag 'trace-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 45979a95
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
      
       - Addition of multiprobes to kprobe and uprobe events (allows for more
         than one probe attached to the same location)
      
       - Addition of adding immediates to probe parameters
      
       - Clean up of the recordmcount.c code. This brings us closer to merging
         recordmcount into objtool, and reuse code.
      
       - Other small clean ups
      
      * tag 'trace-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)
        selftests/ftrace: Update kprobe event error testcase
        tracing/probe: Reject exactly same probe event
        tracing/probe: Fix to allow user to enable events on unloaded modules
        selftests/ftrace: Select an existing function in kprobe_eventname test
        tracing/kprobe: Fix NULL pointer access in trace_porbe_unlink()
        tracing: Make sure variable reference alias has correct var_ref_idx
        tracing: Be more clever when dumping hex in __print_hex()
        ftrace: Simplify ftrace hash lookup code in clear_func_from_hash()
        tracing: Add "gfp_t" support in synthetic_events
        tracing: Rename tracing_reset() to tracing_reset_cpu()
        tracing: Document the stack trace algorithm in the comments
        tracing/arm64: Have max stack tracer handle the case of return address after data
        recordmcount: Clarify what cleanup() does
        recordmcount: Remove redundant cleanup() calls
        recordmcount: Kernel style formatting
        recordmcount: Kernel style function signature formatting
        recordmcount: Rewrite error/success handling
        selftests/ftrace: Add syntax error test for multiprobe
        selftests/ftrace: Add syntax error test for immediates
        selftests/ftrace: Add a testcase for kprobe multiprobe event
        ...
      45979a95
    • L
      Merge tag 'kgdb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux · 3207598a
      Linus Torvalds 提交于
      Pull kgdb updates from Daniel Thompson:
       "It has been a quiet dev cycle for kgdb. There has been some good stuff
        for kdb on the mailing list but unfortunately the patches caused a
        couple of problems with the kdb pager so I had to drop those and they
        will have to wait for next time!
      
        That just leaves us with just a couple of very tiny clean ups for now:
      
         - Fix a broken comment
      
         - Use str_has_prefix() for the grep "pipe" in kdb"
      
      * tag 'kgdb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
        kgdb: fix comment regarding static function
        kdb: Replace strncmp with str_has_prefix
      3207598a
    • L
      lz4: do not export static symbol · b08918fb
      Linus Torvalds 提交于
      Kbuild now complains (rightly) about it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b08918fb
  4. 20 9月, 2019 10 次提交
    • L
      Merge tag 'kbuild-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · d7b0827f
      Linus Torvalds 提交于
      Pull Kbuild updates from Masahiro Yamada:
      
       - add modpost warn exported symbols marked as 'static' because 'static'
         and EXPORT_SYMBOL is an odd combination
      
       - break the build early if gold linker is used
      
       - optimize the Bison rule to produce .c and .h files by a single
         pattern rule
      
       - handle PREEMPT_RT in the module vermagic and UTS_VERSION
      
       - warn CONFIG options leaked to the user-space except existing ones
      
       - make single targets work properly
      
       - rebuild modules when module linker scripts are updated
      
       - split the module final link stage into scripts/Makefile.modfinal
      
       - fix the missed error code in merge_config.sh
      
       - improve the error message displayed on the attempt of the O= build in
         unclean source tree
      
       - remove 'clean-dirs' syntax
      
       - disable -Wimplicit-fallthrough warning for Clang
      
       - add CONFIG_CC_OPTIMIZE_FOR_SIZE_O3 for ARC
      
       - remove ARCH_{CPP,A,C}FLAGS variables
      
       - add $(BASH) to run bash scripts
      
       - change *CFLAGS_<basetarget>.o to take the relative path to $(obj)
         instead of the basename
      
       - stop suppressing Clang's -Wunused-function warnings when W=1
      
       - fix linux/export.h to avoid genksyms calculating CRC of trimmed
         exported symbols
      
       - misc cleanups
      
      * tag 'kbuild-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (63 commits)
        genksyms: convert to SPDX License Identifier for lex.l and parse.y
        modpost: use __section in the output to *.mod.c
        modpost: use MODULE_INFO() for __module_depends
        export.h, genksyms: do not make genksyms calculate CRC of trimmed symbols
        export.h: remove defined(__KERNEL__), which is no longer needed
        kbuild: allow Clang to find unused static inline functions for W=1 build
        kbuild: rename KBUILD_ENABLE_EXTRA_GCC_CHECKS to KBUILD_EXTRA_WARN
        kbuild: refactor scripts/Makefile.extrawarn
        merge_config.sh: ignore unwanted grep errors
        kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
        modpost: add NOFAIL to strndup
        modpost: add guid_t type definition
        kbuild: add $(BASH) to run scripts with bash-extension
        kbuild: remove ARCH_{CPP,A,C}FLAGS
        kbuild,arc: add CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 for ARC
        kbuild: Do not enable -Wimplicit-fallthrough for clang for now
        kbuild: clean up subdir-ymn calculation in Makefile.clean
        kbuild: remove unneeded '+' marker from cmd_clean
        kbuild: remove clean-dirs syntax
        kbuild: check clean srctree even earlier
        ...
      d7b0827f
    • L
      Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm · 574cc453
      Linus Torvalds 提交于
      Pull drm updates from Dave Airlie:
       "This is the main pull request for 5.4-rc1 merge window. I don't think
        there is anything outstanding so next week should just be fixes, but
        we'll see if I missed anything. I landed some fixes earlier in the
        week but got delayed writing summary and sending it out, due to a mix
        of sick kid and jetlag!
      
        There are some fixes pending, but I'd rather get the main merge out of
        the way instead of delaying it longer.
      
        It's also pretty large in commit count and new amd header file size.
        The largest thing is four new amdgpu products (navi12/14, arcturus and
        renoir APU support).
      
        Otherwise it's pretty much lots of work across the board, i915 has
        started landing tigerlake support, lots of icelake fixes and lots of
        locking reworking for future gpu support, lots of header file rework
        (drmP.h is nearly gone), some old legacy hacks (DRM_WAIT_ON) have been
        put into the places they are needed.
      
        uapi:
         - content protection type property for HDCP
      
        core:
         - rework include dependencies
         - lots of drmP.h removals
         - link rate calculation robustness fix
         - make fb helper map only when required
         - add connector->DDC adapter link
         - DRM_WAIT_ON removed
         - drop DRM_AUTH usage from drivers
      
        dma-buf:
         - reservation object fence helper
      
        dma-fence:
         - shrink dma_fence struct
         - merge signal functions
         - store timestamps in dma_fence
         - selftests
      
        ttm:
         - embed drm_get_object struct into ttm_buffer_object
         - release_notify callback
      
        bridges:
         - sii902x - audio graph card support
         - tc358767 - aux data handling rework
         - ti-snd64dsi86 - debugfs support, DSI mode flags support
      
        panels:
         - Support for GiantPlus GPM940B0, Sharp LQ070Y3DG3B, Ortustech
           COM37H3M, Novatek NT39016, Sharp LS020B1DD01D, Raydium RM67191, Boe
           Himax8279d, Sharp LD-D5116Z01B
         - TI nspire, NEC NL8048HL11, LG Philips LB035Q02, Sharp LS037V7DW01,
           Sony ACX565AKM, Toppoly TD028TTEC1 Toppoly TD043MTEA1
      
        i915:
         - Initial tigerlake platform support
         - Locking simplification work, general all over refactoring.
         - Selftests
         - HDCP debug info improvements
         - DSI properties
         - Icelake display PLL fixes, colorspace fixes, bandwidth fixes, DSI
           suspend/resume
         - GuC fixes
         - Perf fixes
         - ElkhartLake enablement
         - DP MST fixes
         - GVT - command parser enhancements
      
        amdgpu:
         - add wipe memory on release flag for buffer creation
         - Navi12/14 support (may be marked experimental)
         - Arcturus support
         - Renoir APU support
         - mclk DPM for Navi
         - DC display fixes
         - Raven scatter/gather support
         - RAS support for GFX
         - Navi12 + Arcturus power features
         - GPU reset for Picasso
         - smu11 i2c controller support
      
        amdkfd:
         - navi12/14 support
         - Arcturus support
      
        radeon:
         - kexec fix
      
        nouveau:
         - improved display color management
         - detect lack of GPU power cables
      
        vmwgfx:
         - evicition priority support
         - remove unused security feature
      
        msm:
         - msm8998 display support
         - better async commit support for cursor updates
      
        etnaviv:
         - per-process address space support
         - performance counter fixes
         - softpin support
      
        mcde:
         - DCS transfers fix
      
        exynos:
         - drmP.h cleanup
      
        lima:
         - reduce logging
      
        kirin:
         - misc clenaups
      
        komeda:
         - dual-link support
         - DT memory regions
      
        hisilicon:
         - misc fixes
      
        imx:
         - IPUv3 image converter fixes
         - 32-bit RGB V4L2 pixel format support
      
        ingenic:
         - more support for panel related cases
      
        mgag200:
         - cursor support fix
      
        panfrost:
         - export GPU features register to userspace
         - gpu heap allocations
         - per-fd address space support
      
        pl111:
         - CLD pads wiring support removed from DT
      
        rockchip:
         - rework to use DRM PSR helpers
         - fix bug in VOP_WIN_GET macro
         - DSI DT binding rework
      
        sun4i:
         - improve support for color encoding and range
         - DDC enabled GPIO
      
        tinydrm:
         - rework SPI support
         - improve MIPI-DBI support
         - moved to drm/tiny
      
        vkms:
         - rework CRC tracking
      
        dw-hdmi:
         - get_eld and i2s improvements
      
        gm12u320:
         - misc fixes
      
        meson:
         - global code cleanup
         - vpu feature detect
      
        omap:
         - alpha/pixel blend mode properties
      
        rcar-du:
         - misc fixes"
      
      * tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm: (2112 commits)
        drm/nouveau/bar/gm20b: Avoid BAR1 teardown during init
        drm/nouveau: Fix ordering between TTM and GEM release
        drm/nouveau/prime: Extend DMA reservation object lock
        drm/nouveau: Fix fallout from reservation object rework
        drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors
        drm/i915: Use NOEVICT for first pass on attemping to pin a GGTT mmap
        drm/i915: to make vgpu ppgtt notificaiton as atomic operation
        drm/i915: Flush the existing fence before GGTT read/write
        drm/i915: Hold irq-off for the entire fake lock period
        drm/i915/gvt: update RING_START reg of vGPU when the context is submitted to i915
        drm/i915/gvt: update vgpu workload head pointer correctly
        drm/mcde: Fix DSI transfers
        drm/msm: Use the correct dma_sync calls harder
        drm/msm: remove unlikely() from WARN_ON() conditions
        drm/msm/dsi: Fix return value check for clk_get_parent
        drm/msm: add atomic traces
        drm/msm/dpu: async commit support
        drm/msm: async commit support
        drm/msm: split power control from prepare/complete_commit
        drm/msm: add kms->flush_commit()
        ...
      574cc453
    • S
      Merge branches 'clk-bulk-fix', 'clk-at91' and 'clk-sprd' into clk-next · ebd47c84
      Stephen Boyd 提交于
       - Make clk_bulk_get_all() return an 'id' corresponding to clock-names
      
      * clk-bulk-fix:
        clk: Make clk_bulk_get_all() return a valid "id"
      
      * clk-at91:
        clk: at91: allow 24 Mhz clock as input for PLL
        clk: at91: select parent if main oscillator or bypass is enabled
        clk: at91: fix update bit maps on CFG_MOR write
      
      * clk-sprd:
        clk: sprd: add missing kfree
      ebd47c84
    • S
      Merge branches 'clk-cdce-regulator', 'clk-bcm', 'clk-evict-parent-cache' and... · b6c444de
      Stephen Boyd 提交于
      Merge branches 'clk-cdce-regulator', 'clk-bcm', 'clk-evict-parent-cache' and 'clk-actions' into clk-next
      
       - Add regulator support to the cdce925 clk driver
       - Add support for Raspberry Pi 4 bcm2711 SoCs
       - Evict parents from parent cache when they're unregistered
      
      * clk-cdce-regulator:
        clk: clk-cdce925: Add regulator support
        dt-bindings: clock: cdce925: Add regulator documentation
      
      * clk-bcm:
        clk: bcm2835: Mark PLLD_PER as CRITICAL
        clk: bcm2835: Add BCM2711_CLOCK_EMMC2 support
        clk: bcm2835: Introduce SoC specific clock registration
        dt-bindings: bcm2835-cprman: Add bcm2711 support
      
      * clk-evict-parent-cache:
        clk: Evict unregistered clks from parent caches
      
      * clk-actions:
        clk: actions: Fix factor clk struct member access
      b6c444de
    • S
      Merge branches 'clk-renesas', 'clk-rockchip', 'clk-const' and 'clk-simplify' into clk-next · 91bcbc11
      Stephen Boyd 提交于
      * clk-renesas:
        clk: renesas: cpg-mssr: Set GENPD_FLAG_ALWAYS_ON for clock domain
        clk: renesas: r9a06g032: Set GENPD_FLAG_ALWAYS_ON for clock domain
        clk: renesas: mstp: Set GENPD_FLAG_ALWAYS_ON for clock domain
        dt-bindings: clk: emev2: Rename bindings documentation file
        clk: renesas: rcar-usb2-clock-sel: Use devm_platform_ioremap_resource() helper
      
      * clk-rockchip:
        clk: rockchip: Add clock controller for the rk3308
        clk: rockchip: Add dt-binding header for rk3308
        dt-bindings: Add bindings for rk3308 clock controller
        clk: rockchip: Fix -Wunused-const-variable in rv1108 clk driver
      
      * clk-const:
        clk: spear: Make structure i2s_sclk_masks constant
      
      * clk-simplify:
        clk/ti: Use kmemdup rather than duplicating its implementation
        clk: fix devm_platform_ioremap_resource.cocci warnings
      91bcbc11
    • S
      Merge branches 'clk-init-destroy', 'clk-doc', 'clk-imx' and 'clk-allwinner' into clk-next · a1ff1ce3
      Stephen Boyd 提交于
       - Set clk_init_data pointer inside clk_hw to NULL after registration
      
      * clk-init-destroy:
        clk: Overwrite clk_hw::init with NULL during clk_register()
        clk: sunxi: Don't call clk_hw_get_name() on a hw that isn't registered
        clk: ti: Don't reference clk_init_data after registration
        clk: qcom: Remove error prints from DFS registration
        rtc: sun6i: Don't reference clk_init_data after registration
        clk: zx296718: Don't reference clk_init_data after registration
        clk: milbeaut: Don't reference clk_init_data after registration
        clk: socfpga: deindent code to proper indentation
        phy: ti: am654-serdes: Don't reference clk_init_data after registration
        clk: sprd: Don't reference clk_init_data after registration
        clk: socfpga: Don't reference clk_init_data after registration
        clk: sirf: Don't reference clk_init_data after registration
        clk: qcom: Don't reference clk_init_data after registration
        clk: meson: axg-audio: Don't reference clk_init_data after registration
        clk: lochnagar: Don't reference clk_init_data after registration
        clk: actions: Don't reference clk_init_data after registration
      
      * clk-doc:
        clk: remove extra ---help--- tags in Kconfig
        clk: add include guard to clk-conf.h
        clk: Document of_parse_clkspec() some more
        clk: Remove extraneous 'for' word in comments
      
      * clk-imx: (32 commits)
        clk: imx: imx8mn: fix pll mux bit
        clk: imx: imx8mm: fix pll mux bit
        clk: imx: clk-pll14xx: unbypass PLL by default
        clk: imx: pll14xx: avoid glitch when set rate
        clk: imx: imx8mn: fix audio pll setting
        clk: imx8mn: Add necessary frequency support for ARM PLL table
        clk: imx8mn: Add missing rate_count assignment for each PLL structure
        clk: imx8mn: fix int pll clk gate
        clk: imx8mn: Add GIC clock
        clk: imx8mn: Fix incorrect parents
        clk: imx8mm: Fix incorrect parents
        clk: imx8mq: Fix sys3 pll references
        clk: imx8mq: Unregister clks when of_clk_add_provider failed
        clk: imx8mm: Unregister clks when of_clk_add_provider failed
        clk: imx8mq: Mark AHB clock as critical
        clk: imx8mn: Keep uart clocks on for early console
        clk: imx: Remove unused function statement
        clk: imx7ulp: Make sure earlycon's clock is enabled
        clk: imx8mm: Switch to platform driver
        clk: imx: imx8mm: fix audio pll setting
        ...
      
      * clk-allwinner:
        clk: sunxi-ng: h6: Allow I2S to change parent rate
        clk: sunxi-ng: v3s: add Allwinner V3 support
        clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks
        dt-bindings: clk: sunxi-ccu: add compatible string for V3 CCU
        clk: sunxi-ng: v3s: add the missing PLL_DDR1
      a1ff1ce3
    • S
      Merge branches 'clk-qcom', 'clk-mtk', 'clk-armada', 'clk-ingenic' and 'clk-meson' into clk-next · f5c7305d
      Stephen Boyd 提交于
       - Support qcom SM8150 RPMh clks
       - Set floor ops for qcom sd clks
       - Support qcom QCS404 WCSS clks
       - Support for Mediatek MT6779 SoCs
       - Add CPU clock support for Armada 7K/8K (specifically AP806 and AP807)
      
      * clk-qcom:
        clk: qcom: rcg: Return failure for RCG update
        clk: qcom: fix QCS404 TuringCC regmap
        clk: qcom: clk-rpmh: Add support for SM8150
        dt-bindings: clock: Document SM8150 rpmh-clock compatible
        clk: qcom: clk-rpmh: Convert to parent data scheme
        dt-bindings: clock: Document the parent clocks
        clk: qcom: gcc: Use floor ops for SDCC clocks
        clk: qcom: gcc-qcs404: Use floor ops for sdcc clks
        clk: qcom: gcc-sdm845: Use floor ops for sdcc clks
        clk: qcom: define probe by index API as common API
        clk: qcom: Add WCSS gcc clock control for QCS404
        clk: qcom: msm8916: Don't build by default
        clk: qcom: gcc: Add global clock controller driver for SM8150
        dt-bindings: clock: Document gcc bindings for SM8150
        clk: qcom: clk-alpha-pll: Add support for Trion PLLs
        clk: qcom: clk-alpha-pll: Remove post_div_table checks
        clk: qcom: clk-alpha-pll: Remove unnecessary cast
      
      * clk-mtk:
        clk: mediatek: Runtime PM support for MT8183 mcucfg clock provider
        clk: mediatek: Register clock gate with device
        clk: mediatek: add pericfg clocks for MT8183
        dt-bindings: clock: mediatek: add pericfg for MT8183
        clk: mediatek: Add MT6779 clock support
        clk: mediatek: Add dt-bindings for MT6779 clocks
        dt-bindings: mediatek: bindings for MT6779 clk
        clk: reset: Modify reset-controller driver
      
      * clk-armada:
        clk: mvebu: ap80x: add AP807 clock support
        clk: mvebu: ap806: Prepare the introduction of AP807 clock support
        clk: mvebu: ap806: add AP-DCLK (hclk) to system controller driver
        clk: mvebu: ap806: be more explicit on what SaR is
        clk: mvebu: ap80x-cpu: add AP807 CPU clock support
        clk: mvebu: ap806-cpu: prepare mapping of AP807 CPU clock
        dt-bindings: ap806: Document AP807 clock compatible
        dt-bindings: ap80x: Document AP807 CPU clock compatible
        clk: mvebu: ap806: Fix clock name for the cluster
        clk: mvebu: add CPU clock driver for Armada 7K/8K
        clk: mvebu: add helper file for Armada AP and CP clocks
        dt-bindings: ap806: add the cluster clock node in the syscon file
      
      * clk-ingenic:
        clk: ingenic: Use CLK_OF_DECLARE_DRIVER macro
        clk: ingenic/jz4740: Fix "pll half" divider not read/written properly
      
      * clk-meson: (23 commits)
        clk: meson: g12a: add support for SM1 CPU 1, 2 & 3 clocks
        clk: meson: g12a: add support for SM1 DynamIQ Shared Unit clock
        clk: meson: g12a: add support for SM1 GP1 PLL
        dt-bindings: clk: meson: add sm1 periph clock controller bindings
        clk: meson: axg-audio: add g12a reset support
        dt-bindings: clock: meson: add resets to the audio clock controller
        clk: meson: g12a: expose CPUB clock ID for G12B
        clk: meson: g12a: add notifiers to handle cpu clock change
        clk: meson: add g12a cpu dynamic divider driver
        clk: core: introduce clk_hw_set_parent()
        clk: meson: remove clk input helper
        clk: meson: remove ee input bypass clocks
        clk: meson: clk-regmap: migrate to new parent description method
        clk: meson: meson8b: migrate to the new parent description method
        clk: meson: axg: migrate to the new parent description method
        clk: meson: gxbb: migrate to the new parent description method
        clk: meson: g12a: migrate to the new parent description method
        clk: meson: remove ao input bypass clocks
        clk: meson: axg-aoclk: migrate to the new parent description method
        clk: meson: gxbb-aoclk: migrate to the new parent description method
        ...
      f5c7305d
    • S
      Merge branches 'clk-aspeed', 'clk-unused', 'clk-of-node-put',... · cee99529
      Stephen Boyd 提交于
      Merge branches 'clk-aspeed', 'clk-unused', 'clk-of-node-put', 'clk-const-bulk-data' and 'clk-debugfs' into clk-next
      
       - Add SDIO gate to aspeed driver
       - Support aspeed AST2600 SoC
       - Add missing of_node_put() calls in various clk drivers
       - Drop NULL checks in clk debugfs
       - Add min/max rates to clk debugfs
      
      * clk-aspeed:
        clk: Add support for AST2600 SoC
        clk: aspeed: Move structures to header
        clk: aspeed: Add SDIO gate
      
      * clk-unused:
        clk: st: clkgen-pll: remove unused variable 'st_pll3200c32_407_a0'
        clk: st: clkgen-fsyn: remove unused variable 'st_quadfs_fs660c32_ops'
        clk: composite: Drop unused clk.h include
        clk: Si5341/Si5340: remove redundant assignment to n_den
        clk: qoriq: Fix -Wunused-const-variable
      
      * clk-of-node-put:
        clk: ti: dm814x: Add of_node_put() to prevent memory leak
        clk: st: clk-flexgen: Add of_node_put() in st_of_flexgen_setup()
        clk: davinci: pll: Add of_node_put() in of_davinci_pll_init()
        clk: versatile: Add of_node_put() in cm_osc_setup()
      
      * clk-const-bulk-data:
        clk: Constify struct clk_bulk_data * where possible
      
      * clk-debugfs:
        clk: Drop !clk checks in debugfs dumping
        clk: Use seq_puts() in possible_parent_show()
        clk: Assert prepare_lock in clk_core_get_boundaries
        clk: Add clk_min/max_rate entries in debugfs
      cee99529
    • S
      clk: Drop !clk checks in debugfs dumping · 7f480466
      Stephen Boyd 提交于
      These recursive functions have checks for !clk being passed in, but the
      callers are always looping through lists and therefore the pointers
      can't be NULL. Drop the checks to simplify the code.
      Signed-off-by: NStephen Boyd <sboyd@kernel.org>
      Link: https://lkml.kernel.org/r/20190826234729.145593-1-sboyd@kernel.org
      7f480466
    • L
      Merge tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 3c2edc36
      Linus Torvalds 提交于
      Pull pin control updates from Linus Walleij:
       "This is the bulk of pin control changes for the v5.4 kernel cycle:
      
        Core changes:
      
         - Fix errors in example code in the documentation.
      
        New drivers:
      
         - Add support for JZ4760, JZ4760B, X1000, X1000E and X1500 to the
           Ingenic driver.
      
         - Support Cirrus Logic Madera CS47L92 and CS47L15.
      
         - Support Allwinner Sunxi V3S.
      
         - Support Aspeed 2600 BMC.
      
         - Support Qualcomm SC7180.
      
         - Support Marvell MVEBU CS115.
      
        Driver improvements:
      
         - Clean up a few drivers to use the devm_platform_ioremap_resource()
           helper.
      
         - Pass the irqchip when registering the gpio_chip in some pin
           controllers that are also GPIO controllers.
      
         - Support suspend/resume in the Tegra driver.
      
         - Support pull-up on the Broadcom BCM2711.
      
         - The Intel driver can now request locked pads.
      
         - Fix the UFS reset pin in the Qualcomm SDM845 driver"
      
      * tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (112 commits)
        pinctrl: meson-gxbb: Fix wrong pinning definition for uart_c
        pinctrl: sh-pfc: Unlock on error in sh_pfc_func_set_mux()
        pinctrl: bcm: remove redundant assignment to pointer log
        pinctrl: iproc: Add 'get_direction' support
        pinctrl: iproc-gpio: Handle interrupts for multiple instances
        pinctrl: iproc-gpio: Fix incorrect pinconf configurations
        pinctrl: intel: mark intel_pin_to_gpio __maybe_unused
        pinctrl: qcom: sdm845: Fix UFS_RESET pin
        pinctrl: mvebu: add additional variant for standalone CP115
        pinctrl: mvebu: Add CP110 missing pin functionality
        dt-bindings: cp110: document the new CP115 pinctrl compatible
        pinctrl: bcm2835: Pass irqchip when adding gpiochip
        pinctrl: meson: meson: Add of_node_put() before return
        pinctrl/gpio: Take MUX usage into account
        dt-bindings: pinctrl: qcom-pmic-gpio: Add pm8150l support
        dt-bindings: pinctrl: qcom-pmic-gpio: Add pm8150b support
        dt-bindings: pinctrl: qcom-pmic-gpio: Add pm8150 support
        pinctrl: amd: disable spurious-firing GPIO IRQs
        pinctrl: rza2: Include the appropriate headers
        pinctrl: rza2: Drop driver use of consumer flags
        ...
      3c2edc36