1. 03 Dec, 2019 6 commits
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 76bb8b05
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - remove unneeded asm headers from hexagon, ia64
      
       - add 'dir-pkg' target, which works like 'tar-pkg' but skips archiving
      
       - add 'helpnewconfig' target, which shows help for new CONFIG options
      
       - support 'make nsdeps' for external modules
      
       - make rebuilds faster by deleting $(wildcard $^) checks
      
       - remove compile tests for kernel-space headers
      
       - refactor modpost to simplify modversion handling
      
       - make single target builds faster
      
       - optimize and clean up scripts/kallsyms.c
      
       - refactor various Makefiles and scripts
      
      * tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (59 commits)
        MAINTAINERS: update Kbuild/Kconfig maintainer's email address
        scripts/kallsyms: remove redundant initializers
        scripts/kallsyms: put check_symbol_range() calls close together
        scripts/kallsyms: make check_symbol_range() void function
        scripts/kallsyms: move ignored symbol types to is_ignored_symbol()
        scripts/kallsyms: move more patterns to the ignored_prefixes array
        scripts/kallsyms: skip ignored symbols very early
        scripts/kallsyms: add const qualifiers where possible
        scripts/kallsyms: make find_token() return (unsigned char *)
        scripts/kallsyms: replace prefix_underscores_count() with strspn()
        scripts/kallsyms: add sym_name() to mitigate cast ugliness
        scripts/kallsyms: remove unneeded length check for prefix matching
        scripts/kallsyms: remove redundant is_arm_mapping_symbol()
        scripts/kallsyms: set relative_base more effectively
        scripts/kallsyms: shrink table before sorting it
        scripts/kallsyms: fix definitely-lost memory leak
        scripts/kallsyms: remove unneeded #ifndef ARRAY_SIZE
        kbuild: make single target builds even faster
        modpost: respect the previous export when 'exported twice' is warned
        modpost: do not set ->preloaded for symbols from Module.symvers
        ...
      76bb8b05
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-5.5-rc1-fixes2' of... · e30dbe50
      Linus Torvalds authored
      Merge tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull more kselftest fixes from Shuah Khan:
       "This second Kselftest fixes update for Linux 5.5-rc1 consists of an
        urgent revert to fix regression in CI coverage"
      
      * tag 'linux-kselftest-5.5-rc1-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"
      e30dbe50
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 483847a7
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
      
       - Fix build error in crypto lib code when crypto API is off
      
       - Fix NULL/error check in hisilicon
      
       - Fix Kconfig-related build error in talitos
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()
        crypto: talitos - Fix build error by selecting LIB_DES
        crypto: arch - conditionalize crypto api in arch glue for lib code
      483847a7
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/openrisc/linux · 120e4768
      Linus Torvalds authored
      Pull OpenRISC update from Stafford Horne:
       "White space fixups in Kconfig files from Krzysztof Kozlowski"
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc: Fix Kconfig indentation
      120e4768
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · fcaa0ad7
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
      
       - Fixes for our new virtio code
      
       - Fix for the irqflags tracer
      
       - Kconfig coding style fixes
      
       - Allow BPF firmware loading in our vector driver
      
      * tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Loadable BPF "Firmware" for vector drivers
        um: Fix Kconfig indentation
        um: virtio_uml: Disallow modular build
        um: virtio: Keep reading on -EAGAIN
        um: virtio: Remove device on disconnect
        um: Don't trace irqflags during shutdown
      fcaa0ad7
    • Linus Torvalds's avatar
      Merge tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · e3a251e3
      Linus Torvalds authored
      Pull UBI/UBIFS/JFFS2 updates from Richard Weinberger:
       "This pull request contains mostly fixes for UBI, UBIFS and JFFS2:
      
        UBI:
      
         - Fix a regression around producing a anchor PEB for fastmap.
      
           Due to a change in our locking fastmap was unable to produce fresh
           anchors an re-used the existing one a way to often.
      
        UBIFS:
      
         - Fixes for endianness. A few places blindly assumed little endian.
      
         - Fix for a memory leak in the orphan code.
      
         - Fix for a possible crash during a commit.
      
         - Revert a wrong bugfix.
      
        JFFS2:
      
         - Revert a bad bugfix (false positive from a code checking tool)"
      
      * tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
        ubi: Fix producing anchor PEBs
        ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps
        ubifs: do_kill_orphans: Fix a memory leak bug
        Revert "ubifs: Fix memory leak bug in alloc_ubifs_info() error path"
        ubifs: Fix type of sup->hash_algo
        ubifs: Fixed missed le64_to_cpu() in journal
        ubifs: Force prandom result to __le32
        ubifs: Remove obsolete TODO from dfs_file_write()
        ubi: Fix warning static is not at beginning of declaration
        ubi: Print skip_check in ubi_dump_vol_info()
      e3a251e3
  2. 02 Dec, 2019 29 commits
    • Linus Torvalds's avatar
      Merge tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 97eeb4d9
      Linus Torvalds authored
      Pull XFS updates from Darrick Wong:
       "For this release, we changed quite a few things.
      
        Highlights:
      
         - Fixed some long tail latency problems in the block allocator
      
         - Removed some long deprecated (and for the past several years no-op)
           mount options and ioctls
      
         - Strengthened the extended attribute and directory verifiers
      
         - Audited and fixed all the places where we could return EFSCORRUPTED
           without logging anything
      
         - Refactored the old SGI space allocation ioctls to make the
           equivalent fallocate calls
      
         - Fixed a race between fallocate and directio
      
         - Fixed an integer overflow when files have more than a few
           billion(!) extents
      
         - Fixed a longstanding bug where quota accounting could be incorrect
           when performing unwritten extent conversion on a freshly mounted fs
      
         - Fixed various complaints in scrub about soft lockups and
           unresponsiveness to signals
      
         - De-vtable'd the directory handling code, which should make it
           faster
      
         - Converted to the new mount api, for better or for worse
      
         - Cleaned up some memory leaks
      
        and quite a lot of other smaller fixes and cleanups.
      
        A more detailed summary:
      
         - Fill out the build string
      
         - Prevent inode fork extent count overflows
      
         - Refactor the allocator to reduce long tail latency
      
         - Rework incore log locking a little to reduce spinning
      
         - Break up the xfs_iomap_begin functions into smaller more cohesive
           parts
      
         - Fix allocation alignment being dropped too early when the
           allocation request is for more blocks than an AG is large
      
         - Other small cleanups
      
         - Clean up file buftarg retrieval helpers
      
         - Hoist the resvsp and unresvsp ioctls to the vfs
      
         - Remove the undocumented biosize mount option, since it has never
           been mentioned as existing or supported on linux
      
         - Clean up some of the mount option printing and parsing
      
         - Enhance attr leaf verifier to check block structure
      
         - Check dirent and attr names for invalid characters before passing
           them to the vfs
      
         - Refactor open-coded bmbt walking
      
         - Fix a few places where we return EIO instead of EFSCORRUPTED after
           failing metadata sanity checks
      
         - Fix a synchronization problem between fallocate and aio dio
           corrupting the file length
      
         - Clean up various loose ends in the iomap and bmap code
      
         - Convert to the new mount api
      
         - Make sure we always log something when returning EFSCORRUPTED
      
         - Fix some problems where long running scrub loops could trigger soft
           lockup warnings and/or fail to exit due to fatal signals pending
      
         - Fix various Coverity complaints
      
         - Remove most of the function pointers from the directory code to
           reduce indirection penalties
      
         - Ensure that dquots are attached to the inode when performing
           unwritten extent conversion after io
      
         - Deuglify incore projid and crtime types
      
         - Fix another AGI/AGF locking order deadlock when renaming
      
         - Clean up some quota typedefs
      
         - Remove the FSSETDM ioctls which haven't done anything in 20 years
      
         - Fix some memory leaks when mounting the log fails
      
         - Fix an underflow when updating an xattr leaf freemap
      
         - Remove some trivial wrappers
      
         - Report metadata corruption as an error, not a (potentially) fatal
           assertion
      
         - Clean up the dir/attr buffer mapping code
      
         - Allow fatal signals to kill scrub during parent pointer checks"
      
      * tag 'xfs-5.5-merge-16' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (198 commits)
        xfs: allow parent directory scans to be interrupted with fatal signals
        xfs: remove the mappedbno argument to xfs_da_get_buf
        xfs: remove the mappedbno argument to xfs_da_read_buf
        xfs: split xfs_da3_node_read
        xfs: remove the mappedbno argument to xfs_dir3_leafn_read
        xfs: remove the mappedbno argument to xfs_dir3_leaf_read
        xfs: remove the mappedbno argument to xfs_attr3_leaf_read
        xfs: remove the mappedbno argument to xfs_da_reada_buf
        xfs: improve the xfs_dabuf_map calling conventions
        xfs: refactor xfs_dabuf_map
        xfs: simplify mappedbno handling in xfs_da_{get,read}_buf
        xfs: report corruption only as a regular error
        xfs: Remove kmem_zone_free() wrapper
        xfs: Remove kmem_zone_destroy() wrapper
        xfs: Remove slab init wrappers
        xfs: fix attr leaf header freemap.size underflow
        xfs: fix some memory leaks in log recovery
        xfs: fix another missing include
        xfs: remove XFS_IOC_FSSETDM and XFS_IOC_FSSETDM_BY_HANDLE
        xfs: remove duplicated include from xfs_dir2_data.c
        ...
      97eeb4d9
    • Linus Torvalds's avatar
      Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 9b326948
      Linus Torvalds authored
      Pull FireWire updates from Stefan Richter:
      
       - another y2038 fix
      
       - janitorial code movement
      
      * tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: core: code cleanup after vm_map_pages_zero introduction
        firewire: ohci: stop using get_seconds() for BUS_TIME
      9b326948
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · ef2cc88e
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This is mostly update of the usual drivers: aacraid, ufs, zfcp,
        NCR5380, lpfc, qla2xxx, smartpqi, hisi_sas, target, mpt3sas, pm80xx
        plus a whole load of minor updates and fixes.
      
        The major core changes are Al Viro's reworking of sg's handling of
        copy to/from user, Ming Lei's removal of the host busy counter to
        avoid contention in the multiqueue case and Damien Le Moal's fixing of
        residual tracking across error handling"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (251 commits)
        scsi: bnx2fc: timeout calculation invalid for bnx2fc_eh_abort()
        scsi: target: core: Fix a pr_debug() argument
        scsi: iscsi: Don't send data to unbound connection
        scsi: target: iscsi: Wait for all commands to finish before freeing a session
        scsi: target: core: Release SPC-2 reservations when closing a session
        scsi: target: core: Document target_cmd_size_check()
        scsi: bnx2i: fix potential use after free
        Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
        scsi: NCR5380: Add disconnect_mask module parameter
        scsi: NCR5380: Unconditionally clear ICR after do_abort()
        scsi: NCR5380: Call scsi_set_resid() on command completion
        scsi: scsi_debug: num_tgts must be >= 0
        scsi: lpfc: use hdwq assigned cpu for allocation
        scsi: arcmsr: fix indentation issues
        scsi: qla4xxx: fix double free bug
        scsi: pm80xx: Modified the logic to collect fatal dump
        scsi: pm80xx: Tie the interrupt name to the module instance
        scsi: pm80xx: Controller fatal error through sysfs
        scsi: pm80xx: Do not request 12G sas speeds
        scsi: pm80xx: Cleanup command when a reset times out
        ...
      ef2cc88e
    • Linus Torvalds's avatar
      Merge tag 'docs-5.5a' of git://git.lwn.net/linux · 937d6eef
      Linus Torvalds authored
      Pull Documentation updates from Jonathan Corbet:
       "Here are the main documentation changes for 5.5:
      
         - Various kerneldoc script enhancements.
      
         - More RST conversions; those are slowing down as we run out of
           things to convert, but we're a ways from done still.
      
         - Dan's "maintainer profile entry" work landed at last. Now we just
           need to get maintainers to fill in the profiles...
      
         - A reworking of the parallel build setup to work better with a
           variety of systems (and to not take over huge systems entirely in
           particular).
      
         - The MAINTAINERS file is now converted to RST during the build.
           Hopefully nobody ever tries to print this thing, or they will need
           to load a lot of paper.
      
         - A script and documentation making it easy for maintainers to add
           Link: tags at commit time.
      
        Also included is the removal of a bunch of spurious CR characters"
      
      * tag 'docs-5.5a' of git://git.lwn.net/linux: (91 commits)
        docs: remove a bunch of stray CRs
        docs: fix up the maintainer profile document
        libnvdimm, MAINTAINERS: Maintainer Entry Profile
        Maintainer Handbook: Maintainer Entry Profile
        MAINTAINERS: Reclaim the P: tag for Maintainer Entry Profile
        docs, parallelism: Rearrange how jobserver reservations are made
        docs, parallelism: Do not leak blocking mode to other readers
        docs, parallelism: Fix failure path and add comment
        Documentation: Remove bootmem_debug from kernel-parameters.txt
        Documentation: security: core.rst: fix warnings
        Documentation/process/howto/kokr: Update for 4.x -> 5.x versioning
        Documentation/translation: Use Korean for Korean translation title
        docs/memory-barriers.txt: Remove remaining references to mmiowb()
        docs/memory-barriers.txt/kokr: Update I/O section to be clearer about CPU vs thread
        docs/memory-barriers.txt/kokr: Fix style, spacing and grammar in I/O section
        Documentation/kokr: Kill all references to mmiowb()
        docs/memory-barriers.txt/kokr: Rewrite "KERNEL I/O BARRIER EFFECTS" section
        docs: Add initial documentation for devfreq
        Documentation: Document how to get links with git am
        docs: Add request_irq() documentation
        ...
      937d6eef
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 2c97b5ae
      Linus Torvalds authored
      Pull Devicetree updates from Rob Herring:
      
       - DT schemas for PWM, syscon, power domains, SRAM, syscon-reboot,
         syscon-poweroff, renesas-irqc, simple-pm-bus, renesas-bsc, pwm-rcar,
         Renesas tpu, at24 eeprom, rtc-sh, Allwinner PS/2, sharp,ld-d5116z01b
         panel, Arm SMMU, max77650, Meson CEC, Amlogic canvas and DWC3 glue,
         Allwinner A10 mUSB and CAN, TI Davinci MDIO, QCom QCS404
         interconnect, Unisoc/Spreadtrum SoCs and UART
      
       - Convert a bunch of Samsung bindings to DT schema
      
       - Convert a bunch of ST stm32 bindings to DT schema
      
       - Realtek and Exynos additions to Arm Mali bindings
      
       - Fix schema errors in RiscV CPU schema
      
       - Various schema fixes from improved meta-schema checks
      
       - Improve the handling of 'dma-ranges' and in particular fix DMA mask
         setup on PCI bridges
      
       - Fix a memory leak in add_changeset_property() and DT unit tests.
      
       - Several documentation improvements for schema validation
      
       - Rework build rules to improve schema validation errors
      
       - Color output for dtx_diff
      
      * tag 'devicetree-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (138 commits)
        libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h
        dt-bindings: arm: Remove leftover axentia.txt
        of: unittest: fix memory leak in attach_node_and_children
        of: overlay: add_changeset_property() memory leak
        dt-bindings: interrupt-controller: arm,gic-v3: Add missing type to interrupt-partition-* nodes
        dt-bindings: firmware: ixp4xx: Drop redundant minItems/maxItems
        dt-bindings: power: Rename back power_domain.txt bindings to fix references
        dt-bindings: i2c: stm32: Migrate i2c-stm32 documentation to yaml
        dt-bindings: mtd: Convert stm32 fmc2-nand bindings to json-schema
        dt-bindings: remoteproc: convert stm32-rproc to json-schema
        dt-bindings: mailbox: convert stm32-ipcc to json-schema
        dt-bindings: mfd: Convert stm32 low power timers bindings to json-schema
        dt-bindings: interrupt-controller: Convert stm32-exti to json-schema
        dt-bindings: crypto: Convert stm32 HASH bindings to json-schema
        dt-bindings: rng: Convert stm32 RNG bindings to json-schema
        dt-bindings: pwm: Convert Samsung PWM bindings to json-schema
        dt-bindings: pwm: Convert PWM bindings to json-schema
        dt-bindings: serial: Add a new compatible string for SC9863A
        dt-bindings: serial: Convert sprd-uart to json-schema
        dt-bindings: arm: Add bindings for Unisoc SC9863A
        ...
      2c97b5ae
    • Linus Torvalds's avatar
      Merge tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 8328dd2f
      Linus Torvalds authored
      Pull pstore bug fix from Kees Cook:
      
       - add missing "static" (Ben Dooks)
      
      * tag 'pstore-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        pstore: Make pstore_choose_compression() static
      8328dd2f
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 1daa56bc
      Linus Torvalds authored
      Pull iommu updates from Joerg Roedel:
      
       - Conversion of the AMD IOMMU driver to use the dma-iommu code for
         imlementing the DMA-API. This gets rid of quite some code in the
         driver itself, but also has some potential for regressions (non are
         known at the moment).
      
       - Support for the Qualcomm SMMUv2 implementation in the SDM845 SoC.
         This also includes some firmware interface changes, but those are
         acked by the respective maintainers.
      
       - Preparatory work to support two distinct page-tables per domain in
         the ARM-SMMU driver
      
       - Power management improvements for the ARM SMMUv2
      
       - Custom PASID allocator support
      
       - Multiple PCI DMA alias support for the AMD IOMMU driver
      
       - Adaption of the Mediatek driver to the changed IO/TLB flush interface
         of the IOMMU core code.
      
       - Preparatory patches for the Renesas IOMMU driver to support future
         hardware.
      
      * tag 'iommu-updates-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (62 commits)
        iommu/rockchip: Don't provoke WARN for harmless IRQs
        iommu/vt-d: Turn off translations at shutdown
        iommu/vt-d: Check VT-d RMRR region in BIOS is reported as reserved
        iommu/arm-smmu: Remove duplicate error message
        iommu/arm-smmu-v3: Don't display an error when IRQ lines are missing
        iommu/ipmmu-vmsa: Add utlb_offset_base
        iommu/ipmmu-vmsa: Add helper functions for "uTLB" registers
        iommu/ipmmu-vmsa: Calculate context registers' offset instead of a macro
        iommu/ipmmu-vmsa: Add helper functions for MMU "context" registers
        iommu/ipmmu-vmsa: tidyup register definitions
        iommu/ipmmu-vmsa: Remove all unused register definitions
        iommu/mediatek: Reduce the tlb flush timeout value
        iommu/mediatek: Get rid of the pgtlock
        iommu/mediatek: Move the tlb_sync into tlb_flush
        iommu/mediatek: Delete the leaf in the tlb_flush
        iommu/mediatek: Use gather to achieve the tlb range flush
        iommu/mediatek: Add a new tlb_lock for tlb_flush
        iommu/mediatek: Correct the flush_iotlb_all callback
        iommu/io-pgtable-arm: Rename IOMMU_QCOM_SYS_CACHE and improve doc
        iommu/io-pgtable-arm: Rationalise MAIR handling
        ...
      1daa56bc
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-5.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma · a5255bc3
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "Here are the changes this time around, couple of new drivers and
        updates to few more:
      
         - New drivers for SiFive PDMA, Socionext Milbeaut HDMAC and XDMAC,
           Freescale dpaa2 qDMA
      
         - Support for X1000 in JZ4780
      
         - Xilinx dma updates and support for Xilinx AXI MCDM controller
      
         - New bindings for rcar R8A774B1
      
         - Minor updates to dw, dma-jz4780, ti-edma, sprd drivers"
      
      * tag 'dmaengine-5.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (61 commits)
        dmaengine: Fix Kconfig indentation
        dmaengine: sf-pdma: move macro to header file
        dmaengine: sf-pdma: replace /** with /* for non-function comment
        dmaengine: ti: edma: fix missed failure handling
        dmaengine: mmp_pdma: add missed of_dma_controller_free
        dmaengine: mmp_tdma: add missed of_dma_controller_free
        dmaengine: sprd: Add wrap address support for link-list mode
        MAINTAINERS: Add Green as SiFive PDMA driver maintainer
        dmaengine: sf-pdma: add platform DMA support for HiFive Unleashed A00
        dt-bindings: dmaengine: sf-pdma: add bindins for SiFive PDMA
        dmaengine: zx: remove: removed dmam_pool_destroy
        dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails
        dmaengine: iop-adma: clean up an indentation issue
        dmaengine: milbeaut-xdmac: remove redundant error log
        dmaengine: milbeaut-hdmac: remove redundant error log
        dmaengine: dma-jz4780: add missed clk_disable_unprepare in remove
        dmaengine: JZ4780: Add support for the X1000.
        dt-bindings: dmaengine: Add X1000 bindings.
        dmaengine: xilinx_dma: Add Xilinx AXI MCDMA Engine driver support
        dmaengine: xilinx_dma: Extend dma_config struct to store irq routine handle
        ...
      a5255bc3
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 596cf45c
      Linus Torvalds authored
      Merge updates from Andrew Morton:
       "Incoming:
      
         - a small number of updates to scripts/, ocfs2 and fs/buffer.c
      
         - most of MM
      
        I still have quite a lot of material (mostly not MM) staged after
        linux-next due to -next dependencies. I'll send those across next week
        as the preprequisites get merged up"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits)
        mm/page_io.c: annotate refault stalls from swap_readpage
        mm/Kconfig: fix trivial help text punctuation
        mm/Kconfig: fix indentation
        mm/memory_hotplug.c: remove __online_page_set_limits()
        mm: fix typos in comments when calling __SetPageUptodate()
        mm: fix struct member name in function comments
        mm/shmem.c: cast the type of unmap_start to u64
        mm: shmem: use proper gfp flags for shmem_writepage()
        mm/shmem.c: make array 'values' static const, makes object smaller
        userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK
        fs/userfaultfd.c: wp: clear VM_UFFD_MISSING or VM_UFFD_WP during userfaultfd_register()
        userfaultfd: wrap the common dst_vma check into an inlined function
        userfaultfd: remove unnecessary WARN_ON() in __mcopy_atomic_hugetlb()
        userfaultfd: use vma_pagesize for all huge page size calculation
        mm/madvise.c: use PAGE_ALIGN[ED] for range checking
        mm/madvise.c: replace with page_size() in madvise_inject_error()
        mm/mmap.c: make vma_merge() comment more easy to understand
        mm/hwpoison-inject: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops
        autonuma: reduce cache footprint when scanning page tables
        autonuma: fix watermark checking in migrate_balanced_pgdat()
        ...
      596cf45c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · c3bfc5dd
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix several scatter gather list issues in kTLS code, from Jakub
          Kicinski.
      
       2) macb driver device remove has to kill the hresp_err_tasklet. From
          Chuhong Yuan.
      
       3) Several memory leak and reference count bug fixes in tipc, from Tung
          Nguyen.
      
       4) Fix mlx5 build error w/o ipv6, from Yue Haibing.
      
       5) Fix jumbo frame and other regressions in r8169, from Heiner
          Kallweit.
      
       6) Undo some BUG_ON()'s and replace them with WARN_ON_ONCE and proper
          error propagation/handling. From Paolo Abeni.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (24 commits)
        openvswitch: remove another BUG_ON()
        openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
        net: phy: realtek: fix using paged operations with RTL8105e / RTL8208
        r8169: fix resume on cable plug-in
        r8169: fix jumbo configuration for RTL8168evl
        net: emulex: benet: indent a Kconfig depends continuation line
        selftests: forwarding: fix race between packet receive and tc check
        net: sched: fix `tc -s class show` no bstats on class with nolock subqueues
        net: ethernet: ti: ale: ensure vlan/mdb deleted when no members
        net/mlx5e: Fix build error without IPV6
        selftests: pmtu: use -oneline for ip route list cache
        tipc: fix duplicate SYN messages under link congestion
        tipc: fix wrong timeout input for tipc_wait_for_cond()
        tipc: fix wrong socket reference counter after tipc_sk_timeout() returns
        tipc: fix potential memory leak in __tipc_sendmsg()
        net: macb: add missed tasklet_kill
        selftests: bpf: correct perror strings
        selftests: bpf: test_sockmap: handle file creation failures gracefully
        net/tls: use sg_next() to walk sg entries
        net/tls: remove the dead inplace_crypto code
        ...
      c3bfc5dd
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e5b3fc12
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Various fixes:
      
         - Fix the PAT performance regression that downgraded write-combining
           device memory regions to uncached.
      
         - There's been a number of bugs in 32-bit double fault handling -
           hopefully all fixed now.
      
         - Fix an LDT crash
      
         - Fix an FPU over-optimization that broke with GCC9 code
           optimizations.
      
         - Misc cleanups"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/pat: Fix off-by-one bugs in interval tree search
        x86/ioperm: Save an indentation level in tss_update_io_bitmap()
        x86/fpu: Don't cache access to fpu_fpregs_owner_ctx
        x86/entry/32: Remove unused 'restore_all_notrace' local label
        x86/ptrace: Document FSBASE and GSBASE ABI oddities
        x86/ptrace: Remove set_segment_reg() implementations for current
        x86/traps: die() instead of panicking on a double fault
        x86/doublefault/32: Rewrite the x86_32 #DF handler and unify with 64-bit
        x86/doublefault/32: Move #DF stack and TSS to cpu_entry_area
        x86/doublefault/32: Rename doublefault.c to doublefault_32.c
        x86/traps: Disentangle the 32-bit and 64-bit doublefault code
        lkdtm: Add a DOUBLE_FAULT crash type on x86
        selftests/x86/single_step_syscall: Check SYSENTER directly
        x86/mm/32: Sync only to VMALLOC_END in vmalloc_sync_all()
      e5b3fc12
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b7fcf31f
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
      
       - Make /sys/devices/cpu/rdpmc based RDPMC enforcement more
         instantaneous
      
       - decoder: Update the Intel opcode map
      
       - Various tooling fixes, including a few late optimizations and
         cleanups.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        perf script: Fix invalid LBR/binary mismatch error
        perf script: Fix brstackinsn for AUXTRACE
        perf affinity: Add infrastructure to save/restore affinity
        perf pmu: Use file system cache to optimize sysfs access
        perf regs: Make perf_reg_name() return "unknown" instead of NULL
        perf diff: Use llabs() with 64-bit values
        perf diff: Use llabs() with 64-bit values
        perf/x86: Implement immediate enforcement of /sys/devices/cpu/rdpmc value of 0
        perf tools: Allow to link with libbpf dynamicaly
        perf tests: Rename tests/map_groups.c to tests/maps.c
        perf tests: Rename thread-mg-share to thread-maps-share
        perf maps: Rename map_groups.h to maps.h
        perf maps: Rename 'mg' variables to 'maps'
        perf map_symbol: Rename ms->mg to ms->maps
        perf addr_location: Rename al->mg to al->maps
        perf thread: Rename thread->mg to thread->maps
        perf maps: Merge 'struct maps' with 'struct map_groups'
        x86/insn: perf tools: Add some more instructions to the new instructions test
        x86/insn: Add some more Intel instructions to the opcode map
        perf map: Remove unused functions
        ...
      b7fcf31f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 72c0870e
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
      
       - updates to Ilitech driver to support ILI2117
      
       - face lift of st1232 driver to support MT-B protocol
      
       - a new driver for i.MX system controller keys
      
       - mpr121 driver now supports polling mode
      
       - various input drivers have been switched away from input_polled_dev
         to use polled mode of regular input devices
      
       - other assorted cleanups and fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (70 commits)
        Input: synaptics-rmi4 - fix various V4L2 compliance problems in F54
        Input: synaptics - switch another X1 Carbon 6 to RMI/SMbus
        Input: fix Kconfig indentation
        Input: imx_sc_key - correct SCU message structure to avoid stack corruption
        Input: ili210x - optionally show calibrate sysfs attribute
        Input: ili210x - add resolution to chip operations structure
        Input: ili210x - do not retrieve/print chip firmware version
        Input: mms114 - use device_get_match_data
        Input: ili210x - remove unneeded suspend and resume handlers
        Input: ili210x - do not unconditionally mark touchscreen as wakeup source
        Input: ili210x - define and use chip operations structure
        Input: ili210x - do not set parent device explicitly
        Input: ili210x - handle errors from input_mt_init_slots()
        Input: ili210x - switch to using threaded IRQ
        Input: ili210x - add ILI2117 support
        dt-bindings: input: touchscreen: ad7879: generic node names in example
        Input: ar1021 - fix typo in preprocessor macro name
        Input: synaptics-rmi4 - simplify data read in rmi_f54_work
        Input: kxtj9 - switch to using polled mode of input devices
        Input: kxtj9 - switch to using managed resources
        ...
      72c0870e
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · d10032dd
      Linus Torvalds authored
      Pull libnvdimm updates from Dan Williams:
       "The highlight this cycle is continuing integration fixes for PowerPC
        and some resulting optimizations.
      
        Summary:
      
         - Updates to better support vmalloc space restrictions on PowerPC
           platforms.
      
         - Cleanups to move common sysfs attributes to core 'struct
           device_type' objects.
      
         - Export the 'target_node' attribute (the effective numa node if pmem
           is marked online) for regions and namespaces.
      
         - Miscellaneous fixups and optimizations"
      
      * tag 'libnvdimm-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (21 commits)
        MAINTAINERS: Remove Keith from NVDIMM maintainers
        libnvdimm: Export the target_node attribute for regions and namespaces
        dax: Add numa_node to the default device-dax attributes
        libnvdimm: Simplify root read-only definition for the 'resource' attribute
        dax: Simplify root read-only definition for the 'resource' attribute
        dax: Create a dax device_type
        libnvdimm: Move nvdimm_bus_attribute_group to device_type
        libnvdimm: Move nvdimm_attribute_group to device_type
        libnvdimm: Move nd_mapping_attribute_group to device_type
        libnvdimm: Move nd_region_attribute_group to device_type
        libnvdimm: Move nd_numa_attribute_group to device_type
        libnvdimm: Move nd_device_attribute_group to device_type
        libnvdimm: Move region attribute group definition
        libnvdimm: Move attribute groups to device type
        libnvdimm: Remove prototypes for nonexistent functions
        libnvdimm/btt: fix variable 'rc' set but not used
        libnvdimm/pmem: Delete include of nd-core.h
        libnvdimm/namespace: Differentiate between probe mapping and runtime mapping
        libnvdimm/pfn_dev: Don't clear device memmap area during generic namespace probe
        libnvdimm: Trivial comment fix
        ...
      d10032dd
    • Linus Torvalds's avatar
      Merge tag 'mailbox-v5.5' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 43fd4bd7
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
      
       - omap : misc - catch error returned from pm_runtime_put_sync
      
       - hisi : misc - drop .owner from platform_driver
      
       - stm : change how wakeup is handled
      
       - imx : fix - bailout on error and nuke correct irq
      
       - imx : add support for imx7ulp platform
      
      * tag 'mailbox-v5.5' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: imx: add support for imx v1 mu
        dt-bindings: mailbox: imx-mu: add imx7ulp MU support
        mailbox: imx: Clear the right interrupts at shutdown
        mailbox: imx: Fix Tx doorbell shutdown path
        mailbox: stm32-ipcc: Update wakeup management
        mailbox: no need to set .owner platform_driver_register
        mailbox/omap: Handle if CONFIG_PM is disabled
      43fd4bd7
    • Linus Torvalds's avatar
      Merge tag 'hwlock-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc · 454d9c4a
      Linus Torvalds authored
      Pull hwspinlock updates from Bjorn Andersson:
       "This contains a number of cleanups to the core and several drivers, in
        particular removing the requirement for drivers to implement
        pm_runtime.
      
        It also udpates the location of the git tree in MAINTAINERS"
      
      * tag 'hwlock-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
        hwspinlock: u8500_hsem: Remove redundant PM runtime implementation
        hwspinlock: sprd: Remove redundant PM runtime implementation
        hwspinlock: Let the PM runtime can be optional
        hwspinlock: Remove BUG_ON() from the hwspinlock core
        hwspinlock: sprd: Use devm_hwspin_lock_register() to register hwlock controller
        hwspinlock: sprd: Use devm_add_action_or_reset() for calls to clk_disable_unprepare()
        hwspinlock: sprd: Check the return value of clk_prepare_enable()
        hwspinlock: sprd: Change to use devm_platform_ioremap_resource()
        hwspinlock: u8500_hsem: Use devm_hwspin_lock_register() to register hwlock controller
        hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
        hwspinlock: u8500_hsem: Change to use devm_platform_ioremap_resource()
        MAINTAINERS: hwspinlock: update git tree location
      454d9c4a
    • Linus Torvalds's avatar
      Merge tag 'rpmsg-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc · 687fcad8
      Linus Torvalds authored
      Pull rpmsg updates from Bjorn Andersson:
       "This contains a number of bug fixes to the GLINK transport driver, an
        off-by-one in the GLINK smem driver and a memory leak fix in the rpmsg
        char driver"
      
      * tag 'rpmsg-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
        rpmsg: Fix Kconfig indentation
        rpmsg: char: Simplify 'rpmsg_eptdev_release()'
        rpmsg: glink: Free pending deferred work on remove
        rpmsg: glink: Don't send pending rx_done during remove
        rpmsg: glink: Fix rpmsg_register_device err handling
        rpmsg: glink: Put an extra reference during cleanup
        rpmsg: glink: Fix use after free in open_ack TIMEOUT case
        rpmsg: glink: Fix reuse intents memory leak issue
        rpmsg: glink: Set tail pointer to 0 at end of FIFO
        rpmsg: char: release allocated memory
      687fcad8
    • Linus Torvalds's avatar
      Merge tag 'rproc-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc · 5e3b06d3
      Linus Torvalds authored
      Pull remoteproc updates from Bjorn Andersson:
       "This adds support for booting the modem processor on Qualcomm MSM8998
        and carries some cleanup up and bug fixes to the framework and the
        stm32 driver"
      
      * tag 'rproc-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
        Revert "dt-bindings: remoteproc: stm32: add wakeup-source"
        remoteproc: stm32: fix probe error case
        remoteproc: stm32: wakeup the system by wdg irq
        dt-bindings: remoteproc: stm32: add wakeup-source
        remoteproc: Fix wrong rvring index computation
        remoteproc: stm32: use workqueue to treat mailbox callback
        remoteproc: fix argument 2 of rproc_mem_entry_init
        remoteproc: qcom_q6v5_mss: Add support for MSM8998
        dt-bindings: remoteproc: qcom: Add Q6v5 Modem PIL binding for MSM8998
        remoteproc: debug: Remove unneeded NULL check
        remoteproc: remove useless typedef
      5e3b06d3
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 3265568d
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
       "I2C has mostly driver updates this time.
      
        The few noteworthy changes are: the core has now support for analog
        and digital filters with at91 being the first user, a core addition to
        replace the NULL returning i2c_new_probed_device() with an ERR_PTR
        variant, and the pxa driver has finally being moved to use the generic
        I2C slave interface. We have quite a significant number of reviews per
        patch this time, so thank you to all involved!"
      
      * 'i2c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (37 commits)
        video: fbdev: matrox: convert to i2c_new_scanned_device
        i2c: icy: convert to i2c_new_scanned_device
        i2c: replace i2c_new_probed_device with an ERR_PTR variant
        i2c: Fix Kconfig indentation
        i2c: smbus: Don't filter out duplicate alerts
        i2c: i801: Correct Intel Jasper Lake SOC naming
        i2c: i2c-stm32f7: fix 10-bits check in slave free id search loop
        i2c: iproc: Add i2c repeated start capability
        i2c: remove helpers for ref-counting clients
        i2c: tegra: Use dma_request_chan() directly for channel request
        i2c: sh_mobile: Use dma_request_chan() directly for channel request
        i2c: qup: Use dma_request_chan() directly for channel request
        i2c: at91: Use dma_request_chan() directly for channel request
        i2c: rcar: Remove superfluous call to clk_get_rate()
        i2c: pxa: remove unused i2c-slave APIs
        i2c: pxa: migrate to new i2c_slave APIs
        i2c: cros-ec-tunnel: Make the device acpi compatible
        i2c: stm32f7: report dma error during probe
        i2c: icy: no need to populate address for scanned device
        i2c: xiic: Fix kerneldoc warnings
        ...
      3265568d
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block · 31764f1b
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "I wasn't going to send this one off so soon, but unfortunately one of
        the fixes from the previous pull broke the build on some archs. So I'm
        sending this sooner rather than later. This contains:
      
         - Add highmem.h include for io_uring, because of the kmap() additions
           from last round. For some reason the build bot didn't spot this
           even though it sat for days.
      
         - Three minor ';' removals
      
         - Add support for the Beurer CD-on-a-chip device
      
         - Make io_uring work on MMU-less archs"
      
      * tag 'for-linus-20191129' of git://git.kernel.dk/linux-block:
        io_uring: fix missing kmap() declaration on powerpc
        ataflop: Remove unneeded semicolon
        block: sunvdc: Remove unneeded semicolon
        drbd: Remove unneeded semicolon
        io_uring: add mapping support for NOMMU archs
        sr_vendor: support Beurer GL50 evo CD-on-a-chip devices.
        cdrom: respect device capabilities during opening action
      31764f1b
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v5.5-1' of git://git.infradead.org/linux-platform-drivers-x86 · 67b8ed29
      Linus Torvalds authored
      Pull x86 platform driver updates from Andy Shevchenko:
      
       - New bootctl driver for Mellanox BlueField SoC.
      
       - New driver to support System76 laptops.
      
       - Temperature monitoring and fan control on Acer Aspire 7551 is now
         supported.
      
       - Previously the Huawei driver handled only hotkeys. After the
         conversion to WMI it has been expanded to support newer laptop
         models.
      
       - Big refactoring of intel-speed-select tools allows to use it on Intel
         CascadeLake-N systems.
      
       - Touchscreen support for ezpad 6 m4 and Schneider SCT101CTM tablets
      
       - Miscellaneous clean ups and fixes here and there.
      
      * tag 'platform-drivers-x86-v5.5-1' of git://git.infradead.org/linux-platform-drivers-x86: (59 commits)
        platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size
        platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer
        platform/x86: intel_pmc_core: Add Comet Lake (CML) platform support to intel_pmc_core driver
        platform/x86: intel_pmc_core: Fix the SoC naming inconsistency
        platform/mellanox: Fix Kconfig indentation
        tools/power/x86/intel-speed-select: Display TRL buckets for just base config level
        tools/power/x86/intel-speed-select: Ignore missing config level
        platform/x86: touchscreen_dmi: Add info for the ezpad 6 m4 tablet
        tools/power/x86/intel-speed-select: Increment version
        tools/power/x86/intel-speed-select: Use core count for base-freq mask
        tools/power/x86/intel-speed-select: Support platform with limited Intel(R) Speed Select
        tools/power/x86/intel-speed-select: Use Frequency weight for CLOS
        tools/power/x86/intel-speed-select: Make CLOS frequency in MHz
        tools/power/x86/intel-speed-select: Use mailbox for CLOS_PM_QOS_CONFIG
        tools/power/x86/intel-speed-select: Auto mode for CLX
        tools/power/x86/intel-speed-select: Correct CLX-N frequency units
        tools/power/x86/intel-speed-select: Change display of "avx" to "avx2"
        tools/power/x86/intel-speed-select: Extend command set for perf-profile
        Add touchscreen platform data for the Schneider SCT101CTM tablet
        platform/x86: intel_int0002_vgpio: Pass irqchip when adding gpiochip
        ...
      67b8ed29
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid · d004701d
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - Support for Logitech G15 (Hans de Goede)
      
       - HID parser improvements, improving support for some devices; e.g.
         Windows Precision Touchpad, products from Primax, etc. (Blaž
         Hrastnik, Candle Sun)
      
       - robustification of tablet mode support in google-whiskers driver
         (Dmitry Torokhov)
      
       - assorted small fixes, device-specific quirks and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (23 commits)
        HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device
        HID: quirks: remove hid-led devices from hid_have_special_driver
        HID: Improve Windows Precision Touchpad detection.
        HID: i2c-hid: Reset ALPS touchpads on resume
        HID: i2c-hid: fix no irq after reset on raydium 3118
        HID: logitech-hidpp: Silence intermittent get_battery_capacity errors
        HID: i2c-hid: remove orphaned member sleep_delay
        HID: quirks: Add quirk for HP MSU1465 PIXART OEM mouse
        HID: core: check whether Usage Page item is after Usage ID items
        HID: intel-ish-hid: Spelling s/diconnect/disconnect/
        HID: google: Detect base folded usage instead of hard-coding whiskers
        HID: logitech: Add depends on LEDS_CLASS to Logitech Kconfig entry
        HID: lg-g15: Add support for the G510's M1-M3 and MR LEDs
        HID: lg-g15: Add support for controlling the G510's RGB backlight
        HID: lg-g15: Add support for the G510 keyboards' gaming keys
        HID: lg-g15: Add support for the M1-M3 and MR LEDs
        HID: lg-g15: Add keyboard and LCD backlight control
        HID: Add driver for Logitech gaming keyboards (G15, G15 v2)
        Input: Add event-codes for macro keys found on various keyboards
        HID: hidraw: replace printk() with corresponding pr_xx() variant
        ...
      d004701d
    • Linus Torvalds's avatar
      Merge tag 'linux-watchdog-5.5-rc1' of git://www.linux-watchdog.org/linux-watchdog · 4a08fe57
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
      
       - support for NCT6116D
      
       - several small fixes and improvements
      
      * tag 'linux-watchdog-5.5-rc1' of git://www.linux-watchdog.org/linux-watchdog: (24 commits)
        watchdog: jz4740: Drop dependency on MACH_JZ47xx
        watchdog: jz4740: Use regmap provided by TCU driver
        watchdog: jz4740: Use WDT clock provided by TCU driver
        dt-bindings: watchdog: sama5d4_wdt: add microchip,sam9x60-wdt compatible
        watchdog: sama5d4_wdt: cleanup the bit definitions
        watchdog: sprd: Fix the incorrect pointer getting from driver data
        watchdog: aspeed: Fix clock behaviour for ast2600
        watchdog: imx7ulp: Fix reboot hang
        watchdog: make nowayout sysfs file writable
        watchdog: prevent deferral of watchdogd wakeup on RT
        watchdog: imx7ulp: Use definitions instead of magic values
        watchdog: imx7ulp: Remove inline annotations
        watchdog: imx7ulp: Remove unused structure member
        watchdog: imx7ulp: Pass the wdog instance inimx7ulp_wdt_enable()
        watchdog: wdat_wdt: Spelling s/configrable/configurable/
        watchdog: bd70528: Trivial function documentation fix
        watchdog: cadence: Do not show error in case of deferred probe
        watchdog: Fix the race between the release of watchdog_core_data and cdev
        watchdog: sbc7240_wdt: Fix yet another -Wimplicit-fallthrough warning
        watchdog: intel-mid_wdt: Add WATCHDOG_NOWAYOUT support
        ...
      4a08fe57
    • Linus Torvalds's avatar
      Merge tag 'gpio-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 99a0d9f5
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v5.5 kernel cycle
      
        Core changes:
      
         - Expose pull up/down flags for the GPIO character device to
           userspace.
      
           After clear input from the RaspberryPi and Beagle communities, it
           has been established that prototyping, industrial automation and
           make communities strongly need this feature, and as we want people
           to use the character device, we have implemented the simple pull
           up/down interface for GPIO lines.
      
           This means we can specify that a (chip-specific) pull up/down
           resistor can be enabled, but does not offer fine-grained control
           such as cases where the resistance of the same pull resistor can be
           controlled (yet).
      
         - Introduce devm_fwnode_gpiod_get_index() and start to phase out the
           old symbol devm_fwnode_get_index_gpiod_from_child().
      
         - A bit of documentation clean-up work.
      
         - Introduce a define for GPIO line directions and deploy it in all
           GPIO drivers in the drivers/gpio directory.
      
         - Add a special callback to populate pin ranges when cooperating with
           the pin control subsystem and registering ranges as part of adding
           a gpiolib driver and a gpio_irq_chip driver at the same time. This
           is also deployed in the Intel Merrifield driver.
      
        New drivers:
      
         - RDA Micro GPIO controller.
      
         - XGS-iproc GPIO driver.
      
        Driver improvements:
      
         - Wake event and debounce support on the Tegra 186 driver.
      
         - Finalize the Aspeed SGPIO driver.
      
         - MPC8xxx uses a normal IRQ handler rather than a chained handler"
      
      * tag 'gpio-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (64 commits)
        gpio: Add TODO item for regmap helper
        Documentation: gpio: driver.rst: Fix warnings
        gpio: of: Fix bogus reference to gpiod_get_count()
        gpiolib: Grammar s/manager/managed/
        gpio: lynxpoint: Setup correct IRQ handlers
        MAINTAINERS: Replace my email by one @kernel.org
        gpiolib: acpi: Make acpi_gpiochip_alloc_event always return AE_OK
        gpio/mpc8xxx: fix qoriq GPIO reading
        gpio: mpc8xxx: Don't overwrite default irq_set_type callback
        gpiolib: acpi: Print pin number on acpi_gpiochip_alloc_event errors
        gpiolib: fix coding style in gpiod_hog()
        drm/bridge: ti-tfp410: switch to using fwnode_gpiod_get_index()
        gpio: merrifield: Pass irqchip when adding gpiochip
        gpio: merrifield: Add GPIO <-> pin mapping ranges via callback
        gpiolib: Introduce ->add_pin_ranges() callback
        gpio: mmio: remove untrue leftover comment
        gpio: em: Use platform_get_irq() to obtain interrupts
        gpio: tegra186: Add debounce support
        gpio: tegra186: Program interrupt route mapping
        gpio: tegra186: Derive register offsets from bank/port
        ...
      99a0d9f5
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 37323918
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "Core Frameworks:
         - Add support for a "resource managed strongly uncachable ioremap"
           call
         - Provide a collection of MFD helper macros
         - Remove mfd_clone_cell() from MFD core
         - Add NULL de-reference protection in MFD core
         - Remove superfluous function fd_platform_add_cell() from MFD core
         - Honour Device Tree's request to disable a device
      
        New Drivers:
         - Add support for MediaTek MT6323 PMIC
      
        New Device Support:
         - Add support for Gemini Lake to Intel LPSS PCI
         - Add support for Cherry Trail Crystal Cover PMIC to Intel SoC PMIC
           CRC
         - Add support for PM{I}8950 to Qualcomm SPMI PMIC
         - Add support for U8420 to ST-Ericsson DB8500
         - Add support for Comet Lake PCH-H to Intel LPSS PCI
      
        New Functionality:
         - Add support for requested supply clocks; madera-core
      
        Fix-ups:
         - Lower interrupt priority; rk808
         - Use provided helpers (macros, group functions, defines); rk808,
           ipaq-micro, ab8500-core, db8500-prcmu, mt6397-core, cs5535-mfd
         - Only allocate IRQs on request; max77620
         - Use simplified API; arizona-core
         - Remove redundant and/or duplicated code; wm8998-tables, arizona,
           syscon
         - Device Tree binding fix-ups; madera, max77650, max77693
         - Remove mfd_cell->id abuse hack; cs5535-mfd
         - Remove only user of mfd_clone_cell(); cs5535-mfd
         - Make resources static; rohm-bd70528
      
        Bug Fixes:
         - Fix product ID for RK818; rk808
         - Fix Power Key; rk808
         - Fix booting on the BananaPi; mt6397-core
         - Endian fix-ups; twl.h
         - Fix static error checker warnings; ti_am335x_tscadc"
      
      * tag 'mfd-next-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (47 commits)
        Revert "mfd: syscon: Set name of regmap_config"
        mfd: ti_am335x_tscadc: Fix static checker warning
        mfd: bd70528: Staticize bit value definitions
        mfd: mfd-core: Honour Device Tree's request to disable a child-device
        dt-bindings: mfd: max77693: Fix missing curly brace
        mfd: intel-lpss: Add Intel Comet Lake PCH-H PCI IDs
        mfd: db8500-prcmu: Support U8420-sysclk firmware
        dt-bindings: mfd: max77650: Convert the binding document to yaml
        mfd: mfd-core: Move pdev->mfd_cell creation back into mfd_add_device()
        mfd: mfd-core: Remove usage counting for .{en,dis}able() call-backs
        x86: olpc-xo1-sci: Remove invocation of MFD's .enable()/.disable() call-backs
        x86: olpc-xo1-pm: Remove invocation of MFD's .enable()/.disable() call-backs
        mfd: mfd-core: Remove mfd_clone_cell()
        mfd: mfd-core: Protect against NULL call-back function pointer
        mfd: cs5535-mfd: Register clients using their own dedicated MFD cell entries
        mfd: cs5535-mfd: Request shared IO regions centrally
        mfd: cs5535-mfd: Remove mfd_cell->id hack
        mfd: cs5535-mfd: Use PLATFORM_DEVID_* defines and tidy error message
        mfd: intel_soc_pmic_crc: Add "cht_crystal_cove_pmic" cell to CHT cells
        mfd: madera: Add support for requesting the supply clocks
        ...
      37323918
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 38edc3df
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "New Functionality:
         - Add support for an enable GPIO; lm3630a_bl
         - Add support for short circuit handling; qcom-wled
         - Add support for automatic string detection; qcom-wled
      
        Fix-ups:
         - Update Device Tree bindings; lm3630a-backlight, led-backlight,
           qcom-wled
         - Constify; ipaq_micro_bl
         - Optimise for CPU cycles; pwm_bl
         - Coding style fix-ups; pwm_bl
         - Trivial fix-ups (white space, comments, renaming); pwm_bl,
           gpio_backlight, qcom-wled
         - Kconfig dependency hacking; LCD_HP700
         - Rename, refactor and add peripherals; pm8941-wled => qcom-wled
         - Make use of GPIO look-up tables; tosa_bl, tosa_lcd
         - Remove superfluous code; gpio_backlight
         - Adapt GPIO direction handling; gpio_backlight
         - Remove legacy use of platform data; gpio_backlight
      
        Bug Fixes:
         - Provide modules aliases; lm3630a_bl"
      
      * tag 'backlight-next-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: (32 commits)
        backlight: qcom-wled: Fix spelling mistake "trigged" -> "triggered"
        backlight: gpio: Pull gpio_backlight_initial_power_state() into probe
        backlight: gpio: Use a helper variable for &pdev->dev
        backlight: gpio: Remove unused fields from platform data
        sh: ecovec24: don't set unused fields in platform data
        backlight: gpio: Simplify the platform data handling
        sh: ecovec24: add additional properties to the backlight device
        backlight: gpio: Explicitly set the direction of the GPIO
        backlight: gpio: Remove stray newline
        backlight: gpio: Remove unneeded include
        video: backlight: tosa: Use GPIO lookup table
        backlight: qcom-wled: Add auto string detection logic
        backlight: qcom-wled: Add support for short circuit handling
        backlight: qcom-wled: Add support for WLED4 peripheral
        backlight: qcom-wled: Restructure the driver for WLED3
        backlight: qcom-wled: Rename PM8941* to WLED3
        backlight: qcom-wled: Add new properties for PMI8998
        backlight: qcom-wled: Restructure the qcom-wled bindings
        backlight: qcom-wled: Rename pm8941-wled.c to qcom-wled.c
        dt-bindings: backlight: lm3630a: Fix missing include
        ...
      38edc3df
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8b233da0
      Linus Torvalds authored
      Pull pinctrl fix from Linus Walleij:
       "A oneliner fix adding the license to the new Intel pin controller,
        avoiding a build-time warning"
      
      * tag 'pinctrl-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: Fix warning by adding missing MODULE_LICENSE
      8b233da0
    • Linus Torvalds's avatar
      Merge tag 'leds-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds · 304220b5
      Linus Torvalds authored
      Pull LED updates from Pavel Machek:
       "This contains usual small updates to drivers, and removal of PAGE_SIZE
        limits on /sys/class/leds/<led>/trigger.
      
        We should not be really having that many triggers; but with cpu
        activity triggers we do, and we'll eventually need to fix it, but...
        remove the limit for now"
      
      * tag 'leds-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds: (26 commits)
        leds: trigger: netdev: fix handling on interface rename
        leds: an30259a: add a check for devm_regmap_init_i2c
        leds: mlxreg: Fix possible buffer overflow
        leds: pca953x: Use of_device_get_match_data()
        leds: core: Fix leds.h structure documentation
        leds: core: Fix devm_classdev_match to reference correct structure
        leds: core: Remove extern from header
        leds: lm3601x: Convert class registration to device managed
        leds: flash: Add devm_* functions to the flash class
        leds: flash: Remove extern from the header file
        leds: flash: Convert non extended registration to inline
        leds: Kconfig: Be consistent with the usage of "LED"
        leds: remove PAGE_SIZE limit of /sys/class/leds/<led>/trigger
        leds: tlc591xx: update the maximum brightness
        leds: lm3692x: Use flags from LM3692X_BRT_CTRL
        leds: lm3692x: Use flags from LM3692X_BOOST_CTRL
        leds: lm3692x: Handle failure to probe the regulator
        leds: lm3692x: Don't overwrite return value in error path
        leds: lm3692x: Print error value on dev_err
        leds: tlc591xx: use devm_led_classdev_register_ext()
        ...
      304220b5
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · ddebe839
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "This merge window we have one small clk provider API in the core
        framework and then a bunch of driver updates and a handful of new
        drivers. In terms of diffstat the Qualcomm and Amlogic drivers are
        high up there because of all the clk data introcued by new drivers.
        The Nvidia Tegra driver had a lot of work done this cycle too to
        support suspend/resume and memory controllers. And the OMAP clk driver
        got proper clk and reset handling in place.
      
        Rounding out the patches are various updates to remove unused data,
        mark things static, correct incorrect data in drivers, etc. All the
        little things that improve drivers and maintain code health. I will
        point out that there's a patch in here for the GPIO clk driver, that
        almost nobody uses, which changes behavior and causes clk_set_rate()
        to try to change the GPIO gate clk's parent. Other than that things
        are fairly well SoC specific here.
      
        Core:
         - Add a clk provider API to get current parent index
         - Plug a memory leak in clk_unregister() path
      
        New Drivers:
         - CGU in Ingenix X1000
         - Bitmain BM1880 clks
         - Qualcomm MSM8998 GPU clk controllers
         - Qualcomm SC7180 GCC and RPMH clk controllers
         - Qualcomm QCS404 Q6SSTOP clk controllers
         - Add support for the Renesas R-Car M3-W+ (r8a77961) SoC
         - Add support for the Renesas RZ/G2N (r8a774b1) SoC
         - Add Tegra20/30 External Memory Clock (EMC) support
      
        Updates:
         - Make gpio gate clks propagate rate setting up to parent
         - Prepare Armada 3700 for suspend to RAM by moving PCIe
           suspend/resume priority
         - Drop unused variables, enums, etc. in various clk drivers
         - Convert various drivers to use devm_platform_ioremap_resource()
         - Use struct_size() some more in various clk drivers
         - Improve Rockchip px30 clk tree
         - Add suspend/resume support to Tegra210 clk driver
         - Reimplement SOR clks on earlier Tegra SoCs, helping HDMI and DP
         - Allwinner DT exports and H6 clk tree fixes
         - Proper clk and reset handling for OMAP SoCs
         - Revamped TI divider clk to clamp max divider
         - Make 1443X/1416X PLL clock structure common for reusing among i.MX8
           SoCs
         - Drop IMX7ULP_CLK_MIPI_PLL clock, it shouldn't be used
         - Add VIDEO2_PLL clock for imx8mq
         - Add missing gate clock for pll1/2 fixed dividers on i.MX8 SoCs
         - Add sm1 support in the Amlogic audio clock controller
         - Switch some clocks on R-Car Gen2/3 to .determine_rate()
         - Remove Renesas R-Car Gen2 legacy DT clock support
         - Improve arithmetic divisions on Renesas R-Car Gen2 and Gen3
         - Improve Renesas R-Car Gen3 SD clock handling
         - Add rate table for Samsung exynos542x GPU and VPLL clks
         - Fix potential CPU performance degradation after system
           suspend/resume cycle on exynos542x SoCs"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (160 commits)
        clk: aspeed: Add RMII RCLK gates for both AST2500 MACs
        MAINTAINERS: Add entry for BM1880 SoC clock driver
        clk: Add common clock driver for BM1880 SoC
        dt-bindings: clock: Add devicetree binding for BM1880 SoC
        clk: Add clk_hw_unregister_composite helper function definition
        clk: Zero init clk_init_data in helpers
        clk: ingenic: Allow drivers to be built with COMPILE_TEST
        MAINTAINERS: Update section for Ux500 clock drivers
        clk: mark clk_disable_unused() as __init
        clk: Fix memory leak in clk_unregister()
        clk: Ingenic: Add CGU driver for X1000.
        dt-bindings: clock: Add X1000 bindings.
        clk: tegra: Use match_string() helper to simplify the code
        clk: pxa: fix one of the pxa RTC clocks
        clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle()
        clk: armada-xp: remove unused code
        clk: tegra: Fix build error without CONFIG_PM_SLEEP
        clk: tegra: Add missing stubs for the case of !CONFIG_PM_SLEEP
        clk: tegra: Optimize PLLX restore on Tegra20/30
        clk: tegra: Add suspend and resume support on Tegra210
        ...
      ddebe839
  3. 01 Dec, 2019 5 commits
    • Linus Torvalds's avatar
      Merge tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground · ceb30747
      Linus Torvalds authored
      Pull y2038 cleanups from Arnd Bergmann:
       "y2038 syscall implementation cleanups
      
        This is a series of cleanups for the y2038 work, mostly intended for
        namespace cleaning: the kernel defines the traditional time_t, timeval
        and timespec types that often lead to y2038-unsafe code. Even though
        the unsafe usage is mostly gone from the kernel, having the types and
        associated functions around means that we can still grow new users,
        and that we may be missing conversions to safe types that actually
        matter.
      
        There are still a number of driver specific patches needed to get the
        last users of these types removed, those have been submitted to the
        respective maintainers"
      
      Link: https://lore.kernel.org/lkml/20191108210236.1296047-1-arnd@arndb.de/
      
      * tag 'y2038-cleanups-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground: (26 commits)
        y2038: alarm: fix half-second cut-off
        y2038: ipc: fix x32 ABI breakage
        y2038: fix typo in powerpc vdso "LOPART"
        y2038: allow disabling time32 system calls
        y2038: itimer: change implementation to timespec64
        y2038: move itimer reset into itimer.c
        y2038: use compat_{get,set}_itimer on alpha
        y2038: itimer: compat handling to itimer.c
        y2038: time: avoid timespec usage in settimeofday()
        y2038: timerfd: Use timespec64 internally
        y2038: elfcore: Use __kernel_old_timeval for process times
        y2038: make ns_to_compat_timeval use __kernel_old_timeval
        y2038: socket: use __kernel_old_timespec instead of timespec
        y2038: socket: remove timespec reference in timestamping
        y2038: syscalls: change remaining timeval to __kernel_old_timeval
        y2038: rusage: use __kernel_old_timeval
        y2038: uapi: change __kernel_time_t to __kernel_old_time_t
        y2038: stat: avoid 'time_t' in 'struct stat'
        y2038: ipc: remove __kernel_time_t reference from headers
        y2038: vdso: powerpc: avoid timespec references
        ...
      ceb30747
    • Linus Torvalds's avatar
      Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground · 0da52210
      Linus Torvalds authored
      Pull removal of most of fs/compat_ioctl.c from Arnd Bergmann:
       "As part of the cleanup of some remaining y2038 issues, I came to
        fs/compat_ioctl.c, which still has a couple of commands that need
        support for time64_t.
      
        In completely unrelated work, I spent time on cleaning up parts of
        this file in the past, moving things out into drivers instead.
      
        After Al Viro reviewed an earlier version of this series and did a lot
        more of that cleanup, I decided to try to completely eliminate the
        rest of it and move it all into drivers.
      
        This series incorporates some of Al's work and many patches of my own,
        but in the end stops short of actually removing the last part, which
        is the scsi ioctl handlers. I have patches for those as well, but they
        need more testing or possibly a rewrite"
      
      * tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground: (42 commits)
        scsi: sd: enable compat ioctls for sed-opal
        pktcdvd: add compat_ioctl handler
        compat_ioctl: move SG_GET_REQUEST_TABLE handling
        compat_ioctl: ppp: move simple commands into ppp_generic.c
        compat_ioctl: handle PPPIOCGIDLE for 64-bit time_t
        compat_ioctl: move PPPIOCSCOMPRESS to ppp_generic
        compat_ioctl: unify copy-in of ppp filters
        tty: handle compat PPP ioctls
        compat_ioctl: move SIOCOUTQ out of compat_ioctl.c
        compat_ioctl: handle SIOCOUTQNSD
        af_unix: add compat_ioctl support
        compat_ioctl: reimplement SG_IO handling
        compat_ioctl: move WDIOC handling into wdt drivers
        fs: compat_ioctl: move FITRIM emulation into file systems
        gfs2: add compat_ioctl support
        compat_ioctl: remove unused convert_in_user macro
        compat_ioctl: remove last RAID handling code
        compat_ioctl: remove /dev/raw ioctl translation
        compat_ioctl: remove PCI ioctl translation
        compat_ioctl: remove joystick ioctl translation
        ...
      0da52210
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · ad0b314e
      Linus Torvalds authored
      Pull sysctl system call removal from Eric Biederman:
       "As far as I can tell we have reached the point where no one enables
        the sysctl system call anymore. It still is enabled in a few
        defconfigs but they are mostly the rarely used one and in asking
        people about that it was more cut & paste enabled than anything else.
      
        This is single commit that just deletes code. Leaving just enough code
        so that the deprecated sysctl warning continues to be printed. If my
        analysis turns out to be wrong and someone actually cares it will be
        easy to revert this commit and have the system call again.
      
        There was one new xtensa defconfig in linux-next that enabled the
        system call this cycle and when asked about it the maintainer of the
        code replied that it was not enabled on purpose. As of today's
        linux-next tree that defconfig no longer enables the system call.
      
        What we saw in the review discussion was that if we go a step farther
        than my patch and mess with uapi headers there are pieces of code that
        won't compile, but nothing minds the system call actually disappearing
        from the kernel"
      
      Link: https://lore.kernel.org/lkml/201910011140.EA0181F13@keescook/
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        sysctl: Remove the sysctl system call
      ad0b314e
    • David S. Miller's avatar
      Merge branch 'openvswitch-remove-a-couple-of-BUG_ON' · c5d72811
      David S. Miller authored
      Paolo Abeni says:
      
      ====================
      openvswitch: remove a couple of BUG_ON()
      
      The openvswitch kernel datapath includes some BUG_ON() statements to check
      for exceptional/unexpected failures. These patches drop a couple of them,
      where we can do that without introducing other side effects.
      
      v1 -> v2:
       - avoid memory leaks on error path
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c5d72811
    • Paolo Abeni's avatar
      openvswitch: remove another BUG_ON() · 8a574f86
      Paolo Abeni authored
      If we can't build the flow del notification, we can simply delete
      the flow, no need to crash the kernel. Still keep a WARN_ON to
      preserve debuggability.
      
      Note: the BUG_ON() predates the Fixes tag, but this change
      can be applied only after the mentioned commit.
      
      v1 -> v2:
       - do not leak an skb on error
      
      Fixes: aed06778 ("openvswitch: Minimize ovs_flow_cmd_del critical section.")
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8a574f86