1. 02 Apr, 2020 9 commits
  2. 01 Apr, 2020 3 commits
    • Linus Torvalds's avatar
      x86: get rid of 'errret' argument to __get_user_xyz() macross · 1a323ea5
      Linus Torvalds authored
      Every remaining user just has the error case returning -EFAULT.
      
      In fact, the exception was __get_user_asm_nozero(), which was removed in
      commit 4b842e4e ("x86: get rid of small constant size cases in
      raw_copy_{to,from}_user()"), and the other __get_user_xyz() macros just
      followed suit for consistency.
      
      Fix up some macro whitespace while at it.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1a323ea5
    • Linus Torvalds's avatar
      x86: remove __put_user_asm() infrastructure · ab33eb49
      Linus Torvalds authored
      The last user was removed by commit 4b842e4e ("x86: get rid of small
      constant size cases in raw_copy_{to,from}_user()").  Get rid of the
      left-overs before somebody tries to use it again.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ab33eb49
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next · 29d9f30d
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Fix the iwlwifi regression, from Johannes Berg.
      
         2) Support BSS coloring and 802.11 encapsulation offloading in
            hardware, from John Crispin.
      
         3) Fix some potential Spectre issues in qtnfmac, from Sergey
            Matyukevich.
      
         4) Add TTL decrement action to openvswitch, from Matteo Croce.
      
         5) Allow paralleization through flow_action setup by not taking the
            RTNL mutex, from Vlad Buslov.
      
         6) A lot of zero-length array to flexible-array conversions, from
            Gustavo A. R. Silva.
      
         7) Align XDP statistics names across several drivers for consistency,
            from Lorenzo Bianconi.
      
         8) Add various pieces of infrastructure for offloading conntrack, and
            make use of it in mlx5 driver, from Paul Blakey.
      
         9) Allow using listening sockets in BPF sockmap, from Jakub Sitnicki.
      
        10) Lots of parallelization improvements during configuration changes
            in mlxsw driver, from Ido Schimmel.
      
        11) Add support to devlink for generic packet traps, which report
            packets dropped during ACL processing. And use them in mlxsw
            driver. From Jiri Pirko.
      
        12) Support bcmgenet on ACPI, from Jeremy Linton.
      
        13) Make BPF compatible with RT, from Thomas Gleixnet, Alexei
            Starovoitov, and your's truly.
      
        14) Support XDP meta-data in virtio_net, from Yuya Kusakabe.
      
        15) Fix sysfs permissions when network devices change namespaces, from
            Christian Brauner.
      
        16) Add a flags element to ethtool_ops so that drivers can more simply
            indicate which coalescing parameters they actually support, and
            therefore the generic layer can validate the user's ethtool
            request. Use this in all drivers, from Jakub Kicinski.
      
        17) Offload FIFO qdisc in mlxsw, from Petr Machata.
      
        18) Support UDP sockets in sockmap, from Lorenz Bauer.
      
        19) Fix stretch ACK bugs in several TCP congestion control modules,
            from Pengcheng Yang.
      
        20) Support virtual functiosn in octeontx2 driver, from Tomasz
            Duszynski.
      
        21) Add region operations for devlink and use it in ice driver to dump
            NVM contents, from Jacob Keller.
      
        22) Add support for hw offload of MACSEC, from Antoine Tenart.
      
        23) Add support for BPF programs that can be attached to LSM hooks,
            from KP Singh.
      
        24) Support for multiple paths, path managers, and counters in MPTCP.
            From Peter Krystad, Paolo Abeni, Florian Westphal, Davide Caratti,
            and others.
      
        25) More progress on adding the netlink interface to ethtool, from
            Michal Kubecek"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2121 commits)
        net: ipv6: rpl_iptunnel: Fix potential memory leak in rpl_do_srh_inline
        cxgb4/chcr: nic-tls stats in ethtool
        net: dsa: fix oops while probing Marvell DSA switches
        net/bpfilter: remove superfluous testing message
        net: macb: Fix handling of fixed-link node
        net: dsa: ksz: Select KSZ protocol tag
        netdevsim: dev: Fix memory leak in nsim_dev_take_snapshot_write
        net: stmmac: add EHL 2.5Gbps PCI info and PCI ID
        net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID
        net: stmmac: create dwmac-intel.c to contain all Intel platform
        net: dsa: bcm_sf2: Support specifying VLAN tag egress rule
        net: dsa: bcm_sf2: Add support for matching VLAN TCI
        net: dsa: bcm_sf2: Move writing of CFP_DATA(5) into slicing functions
        net: dsa: bcm_sf2: Check earlier for FLOW_EXT and FLOW_MAC_EXT
        net: dsa: bcm_sf2: Disable learning for ASP port
        net: dsa: b53: Deny enslaving port 7 for 7278 into a bridge
        net: dsa: b53: Prevent tagged VLAN on port 7 for 7278
        net: dsa: b53: Restore VLAN entries upon (re)configuration
        net: dsa: bcm_sf2: Fix overflow checks
        hv_netvsc: Remove unnecessary round_up for recv_completion_cnt
        ...
      29d9f30d
  3. 31 Mar, 2020 28 commits
    • Linus Torvalds's avatar
      Merge tag 'ntb-5.7' of git://github.com/jonmason/ntb · 56a451b7
      Linus Torvalds authored
      Pull NTB updates from Jon Mason:
       "Bug fixes for a few printing issues, link status detection bug on AMD
        hardware, and a DMA address issue with ntb_perf.
      
        Also, large series of AMD NTB patches"
      
      * tag 'ntb-5.7' of git://github.com/jonmason/ntb: (21 commits)
        NTB: add pci shutdown handler for AMD NTB
        NTB: send DB event when driver is loaded or un-loaded
        NTB: remove redundant setting of DB valid mask
        NTB: return link up status correctly for PRI and SEC
        NTB: add helper functions to set and clear sideinfo
        NTB: move ntb_ctrl handling to init and deinit
        NTB: handle link up, D0 and D3 events correctly
        NTB: handle link down event correctly
        NTB: remove handling of peer_sta from amd_link_is_up
        NTB: set peer_sta within event handler itself
        NTB: return the side info status from amd_poll_link
        NTB: define a new function to get link status
        NTB: Enable link up and down event notification
        NTB: clear interrupt status register
        NTB: Fix access to link status and control register
        MAINTAINERS: update maintainer list for AMD NTB driver
        NTB: ntb_transport: Use scnprintf() for avoiding potential buffer overflow
        ntb_hw_switchtec: Fix ntb_mw_clear_trans error if size == 0
        ntb_tool: Fix printk format
        NTB: ntb_perf: Fix address err in perf_copy_chunk
        ...
      56a451b7
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v5.7-1' of git://git.infradead.org/linux-platform-drivers-x86 · dba43fc4
      Linus Torvalds authored
      Pull x86 platform driver updates from Andy Shevchenko:
      
       - Fix for improper handling of fan_boost_mode in sysfs for ASUS
         laptops.
      
       - On newer ASUS laptops the 1st battery is named differently, here is a
         fix.
      
       - Fix Lex 2I385SW to allow both network cards to be used.
      
       - The power integrated circuit driver for Surface 3 has been added.
      
       - Refactor and clean up of Intel PMC driver and enable it on Intel
         Jasper Lake.
      
       - Clean up of Dell RBU driver.
      
       - Big update for Intel Speed Select technology support tool and driver.
      
      * tag 'platform-drivers-x86-v5.7-1' of git://git.infradead.org/linux-platform-drivers-x86: (75 commits)
        platform/x86: surface3_power: Fix always true condition in mshw0011_space_handler()
        platform/x86: surface3_power: Fix Kconfig section ordering
        platform/x86: surface3_power: Add missed headers
        platform/x86: surface3_power: Reformat GUID assignment
        platform/x86: surface3_power: Drop useless macro ACPI_PTR()
        platform/x86: surface3_power: Prefix POLL_INTERVAL with SURFACE_3
        platform/x86: surface3_power: Simplify mshw0011_adp_psr() to one liner
        platform/x86: surface3_power: Use dev_err() instead of pr_err()
        platform/x86: surface3_power: Drop unused structure definition
        platform/x86: surface3_power: MSHW0011 rev-eng implementation
        platform/x86: intel_pmc_core: Make pmc_core_substate_res_show() generic
        platform/x86: intel_pmc_core: Make pmc_core_lpm_display() generic for platforms that support sub-states
        tools/power/x86/intel-speed-select: Fix a typo in error message
        tools/power/x86/intel-speed-select: Update version
        tools/power/x86/intel-speed-select: Avoid duplicate Package strings for json
        tools/power/x86/intel-speed-select: Add display for enabled cpus count
        tools/power/x86/intel-speed-select: Print friendly warning for bad command line
        tools/power/x86/intel-speed-select: Fix avx options for turbo-freq feature
        tools/power/x86/intel-speed-select: Improve CLX commands
        tools/power/x86/intel-speed-select: Show error for invalid CPUs in the options
        ...
      dba43fc4
    • Linus Torvalds's avatar
      Merge tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 1f944f97
      Linus Torvalds authored
      Pull tty/serial updates from Greg KH:
       "Here is the big set of TTY / Serial patches for 5.7-rc1
      
        Lots of console fixups and reworking in here, serial core tweaks
        (doesn't that ever get old, why are we still creating new serial
        devices?), serial driver updates, line-protocol driver updates, and
        some vt cleanups and fixes included in here as well.
      
        All have been in linux-next with no reported issues"
      
      * tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (161 commits)
        serial: 8250: Optimize irq enable after console write
        serial: 8250: Fix rs485 delay after console write
        vt: vt_ioctl: fix use-after-free in vt_in_use()
        vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
        tty: serial: make SERIAL_SPRD depend on COMMON_CLK
        tty: serial: fsl_lpuart: fix return value checking
        tty: serial: fsl_lpuart: move dma_request_chan()
        ARM: dts: tango4: Make /serial compatible with ns16550a
        ARM: dts: mmp*: Make the serial ports compatible with xscale-uart
        ARM: dts: mmp*: Fix serial port names
        ARM: dts: mmp2-brownstone: Don't redeclare phandle references
        ARM: dts: pxa*: Make the serial ports compatible with xscale-uart
        ARM: dts: pxa*: Fix serial port names
        ARM: dts: pxa*: Don't redeclare phandle references
        serial: omap: drop unused dt-bindings header
        serial: 8250: 8250_omap: Add DMA support for UARTs on K3 SoCs
        serial: 8250: 8250_omap: Work around errata causing spurious IRQs with DMA
        serial: 8250: 8250_omap: Extend driver data to pass FIFO trigger info
        serial: 8250: 8250_omap: Move locking out from __dma_rx_do_complete()
        serial: 8250: 8250_omap: Account for data in flight during DMA teardown
        ...
      1f944f97
    • Linus Torvalds's avatar
      Merge tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · dfabb077
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add support for host software queue for (e)MMC/SD
         - Throttle polling rate for CMD6
         - Update CMD13 busy condition check for CMD6 commands
         - Improve busy detect polling for erase/trim/discard/HPI
         - Fixup support for HW busy detection for HPI commands
         - Re-work and improve support for eMMC sanitize commands
      
        MMC host:
         - mmci:
             * Add support for sdmmc variant revision 2.0
         - mmci_sdmmc:
             * Improve support for busyend detection
             * Fixup support for signal voltage switch
             * Add support for tuning with delay block
         - mtk-sd:
             * Fix another SDIO irq issue
         - sdhci:
             * Disable native card detect when GPIO based type exist
         - sdhci:
             * Add option to defer request completion
         - sdhci_am654:
             * Add support to set a tap value per speed mode
         - sdhci-esdhc-imx:
             * Add support for i.MX8MM based variant
             * Fixup support for standard tuning on i.MX8 usdhc
             * Optimize for strobe/clock dll settings
             * Fixup support for system and runtime suspend/resume
         - sdhci-iproc:
             * Update regulator/bus-voltage management for bcm2711
         - sdhci-msm:
             * Prevent clock gating with PWRSAVE_DLL on broken variants
             * Fix management of CQE during SDHCI reset
         - sdhci-of-arasan:
             * Add support for auto tuning on ZynqMP based platforms
         - sdhci-omap:
             * Add support for system suspend/resume
         - sdhci-sprd:
             * Add support for HW busy detection
             * Enable support host software queue
         - sdhci-tegra:
             * Add support for HW busy detection
         - tmio/renesas_sdhi:
             * Enforce retune after runtime suspend
         - renesas_sdhi:
             * Use manual tap correction for HS400 on some variants
             * Add support for manual correction of tap values for tunings"
      
      * tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (86 commits)
        mmc: cavium-octeon: remove nonsense variable coercion
        mmc: mediatek: fix SDIO irq issue
        mmc: mmci_sdmmc: Fix clear busyd0end irq flag
        dt-bindings: mmc: Fix node name in an example
        mmc: core: Re-work the code for eMMC sanitize
        mmc: sdhci: use FIELD_GET for preset value bit masks
        mmc: sdhci-of-at91: Display clock changes for debug purpose only
        mmc: sdhci: iproc: Add custom set_power() callback for bcm2711
        mmc: sdhci: am654: Use sdhci_set_power_and_voltage()
        mmc: sdhci: at91: Use sdhci_set_power_and_voltage()
        mmc: sdhci: milbeaut: Use sdhci_set_power_and_voltage()
        mmc: sdhci: arasan: Use sdhci_set_power_and_voltage()
        mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage()
        mmc: vub300: Use scnprintf() for avoiding potential buffer overflow
        dt-bindings: mmc: synopsys-dw-mshc: fix clock-freq-min-max in example
        sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
        sdhci: tegra: Implement Tegra specific set_timeout callback
        mmc: sdhci-omap: Add Support for Suspend/Resume
        mmc: renesas_sdhi: simplify execute_tuning
        mmc: renesas_sdhi: Use BITS_PER_LONG helper
        ...
      dfabb077
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 5b67fbfc
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
       "Build system:
      
         - add CONFIG_UNUSED_KSYMS_WHITELIST, which will be useful to define a
           fixed set of export symbols for Generic Kernel Image (GKI)
      
         - allow to run 'make dt_binding_check' without .config
      
         - use full schema for checking DT examples in *.yaml files
      
         - make modpost fail for missing MODULE_IMPORT_NS(), which makes more
           sense because we know the produced modules are never loadable
      
         - Remove unused 'AS' variable
      
        Kconfig:
      
         - sanitize DEFCONFIG_LIST, and remove ARCH_DEFCONFIG from Kconfig
           files
      
         - relax the 'imply' behavior so that symbols implied by 'y' can
           become 'm'
      
         - make 'imply' obey 'depends on' in order to make 'imply' really weak
      
        Misc:
      
         - add documentation on building the kernel with Clang/LLVM
      
         - revive __HAVE_ARCH_STRLEN for 32bit sparc to use optimized strlen()
      
         - fix warning from deb-pkg builds when CONFIG_DEBUG_INFO=n
      
         - various script and Makefile cleanups"
      
      * tag 'kbuild-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
        Makefile: Update kselftest help information
        kbuild: deb-pkg: fix warning when CONFIG_DEBUG_INFO is unset
        kbuild: add outputmakefile to no-dot-config-targets
        kbuild: remove AS variable
        net: wan: wanxl: refactor the firmware rebuild rule
        net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware
        net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware
        kbuild: add comment about grouped target
        kbuild: add -Wall to KBUILD_HOSTCXXFLAGS
        kconfig: remove unused variable in qconf.cc
        sparc: revive __HAVE_ARCH_STRLEN for 32bit sparc
        kbuild: refactor Makefile.dtbinst more
        kbuild: compute the dtbs_install destination more simply
        Makefile: disallow data races on gcc-10 as well
        kconfig: make 'imply' obey the direct dependency
        kconfig: allow symbols implied by y to become m
        net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()
        modpost: return error if module is missing ns imports and MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n
        modpost: rework and consolidate logging interface
        kbuild: allow to run dt_binding_check without kernel configuration
        ...
      5b67fbfc
    • Linus Torvalds's avatar
      Merge branch 'next-general' of... · a1629843
      Linus Torvalds authored
      Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull security subsystem updates from James Morris:
       "Two minor updates for the core security subsystem:
      
         - kernel-doc warning fixes from Randy Dunlap
      
         - header cleanup from YueHaibing"
      
      * 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security:
        security: remove duplicated include from security.h
        security: <linux/lsm_hooks.h>: fix all kernel-doc warnings
      a1629843
    • Linus Torvalds's avatar
      Merge tag 'selinux-pr-20200330' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux · b3aa112d
      Linus Torvalds authored
      Pull SELinux updates from Paul Moore:
       "We've got twenty SELinux patches for the v5.7 merge window, the
        highlights are below:
      
         - Deprecate setting /sys/fs/selinux/checkreqprot to 1.
      
           This flag was originally created to deal with legacy userspace and
           the READ_IMPLIES_EXEC personality flag. We changed the default from
           1 to 0 back in Linux v4.4 and now we are taking the next step of
           deprecating it, at some point in the future we will take the final
           step of rejecting 1.
      
         - Allow kernfs symlinks to inherit the SELinux label of the parent
           directory. In order to preserve backwards compatibility this is
           protected by the genfs_seclabel_symlinks SELinux policy capability.
      
         - Optimize how we store filename transitions in the kernel, resulting
           in some significant improvements to policy load times.
      
         - Do a better job calculating our internal hash table sizes which
           resulted in additional policy load improvements and likely general
           SELinux performance improvements as well.
      
         - Remove the unused initial SIDs (labels) and improve how we handle
           initial SIDs.
      
         - Enable per-file labeling for the bpf filesystem.
      
         - Ensure that we properly label NFS v4.2 filesystems to avoid a
           temporary unlabeled condition.
      
         - Add some missing XFS quota command types to the SELinux quota
           access controls.
      
         - Fix a problem where we were not updating the seq_file position
           index correctly in selinuxfs.
      
         - We consolidate some duplicated code into helper functions.
      
         - A number of list to array conversions.
      
         - Update Stephen Smalley's email address in MAINTAINERS"
      
      * tag 'selinux-pr-20200330' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
        selinux: clean up indentation issue with assignment statement
        NFS: Ensure security label is set for root inode
        MAINTAINERS: Update my email address
        selinux: avtab_init() and cond_policydb_init() return void
        selinux: clean up error path in policydb_init()
        selinux: remove unused initial SIDs and improve handling
        selinux: reduce the use of hard-coded hash sizes
        selinux: Add xfs quota command types
        selinux: optimize storage of filename transitions
        selinux: factor out loop body from filename_trans_read()
        security: selinux: allow per-file labeling for bpffs
        selinux: generalize evaluate_cond_node()
        selinux: convert cond_expr to array
        selinux: convert cond_av_list to array
        selinux: convert cond_list to array
        selinux: sel_avc_get_stat_idx should increase position index
        selinux: allow kernfs symlinks to inherit parent directory context
        selinux: simplify evaluate_cond_node()
        Documentation,selinux: deprecate setting checkreqprot to 1
        selinux: move status variables out of selinux_ss
      b3aa112d
    • Linus Torvalds's avatar
      Merge tag 'audit-pr-20200330' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · 674d85eb
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "We've got two audit patches for the v5.7 merge window with a stellar
        14 lines changed between the two patches. The patch descriptions are
        far more lengthy than the patches themselves, which is a very good
        thing for patches this size IMHO. The patches pass our test suites and
        a quick summary is below:
      
         - Stop logging inode information when updating an audit file watch.
      
           Since we are not changing the inode, or the fact that we are
           watching the associated file, the inode information is just noise
           that we can do without.
      
         - Fix a problem where mandatory audit records were missing their
           accompanying audit records (e.g. SYSCALL records were missing).
      
           The missing records often meant that we didn't have the necessary
           context to understand what was going on when the event occurred"
      
      * tag 'audit-pr-20200330' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: trigger accompanying records when no rules present
        audit: CONFIG_CHANGE don't log internal bookkeeping as an event
      674d85eb
    • Linus Torvalds's avatar
      Merge tag '5.7-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 · 645c248d
      Linus Torvalds authored
      Pull cifs updates from Steve French:
       "First part of cifs/smb3 changes for merge window (others are still
        being tested). Various RDMA (smbdirect) fixes, addition of SMB3.1.1
        POSIX support in readdir, 3 fixes for stable, and a fix for flock.
      
        Summary:
      
        New feature:
         - SMB3.1.1 POSIX support in readdir
      
        Fixes:
         - various RDMA (smbdirect) fixes
         - fix for flock
         - fallocate fix
         - some improved mount warnings
         - two timestamp related fixes
         - reconnect fix
         - three fixes for stable"
      
      * tag '5.7-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6: (28 commits)
        cifs: update internal module version number
        cifs: Allocate encryption header through kmalloc
        cifs: smbd: Check and extend sender credits in interrupt context
        cifs: smbd: Calculate the correct maximum packet size for segmented SMBDirect send/receive
        smb3: use SMB2_SIGNATURE_SIZE define
        CIFS: Fix bug which the return value by asynchronous read is error
        CIFS: check new file size when extending file by fallocate
        SMB3: Minor cleanup of protocol definitions
        SMB3: Additional compression structures
        SMB3: Add new compression flags
        cifs: smb2pdu.h: Replace zero-length array with flexible-array member
        cifs: clear PF_MEMALLOC before exiting demultiplex thread
        cifs: cifspdu.h: Replace zero-length array with flexible-array member
        CIFS: Warn less noisily on default mount
        fs/cifs: fix gcc warning in sid_to_id
        cifs: allow unlock flock and OFD lock across fork
        cifs: do d_move in rename
        cifs: add SMB2_open() arg to return POSIX data
        cifs: plumb smb2 POSIX dir enumeration
        cifs: add smb2 POSIX info level
        ...
      645c248d
    • Linus Torvalds's avatar
      Merge tag 'gfs2-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 018d21f5
      Linus Torvalds authored
      Pull gfs2 updates from Bob Peterson:
       "We've got a lot of patches (39) for this merge window. Most of these
        patches are related to corruption that occurs when journals are
        replayed. For example:
      
         1. A node fails while writing to the file system.
         2. Other nodes use the metadata that was once used by the failed
            node.
         3. When the node returns to the cluster, its journal is replayed, but
            the older metadata blocks overwrite the changes from step 2.
      
        Summary:
      
         - Fixed the recovery sequence to prevent corruption during journal
           replay.
      
         - Many bug fixes found during recovery testing.
      
         - New improved file system withdraw sequence.
      
         - Fixed how resource group buffers are managed.
      
         - Fixed how metadata revokes are tracked and written.
      
         - Improve processing of IO errors hit by daemons like logd and
           quotad.
      
         - Improved error checking in metadata writes.
      
         - Fixed how qadata quota data structures are managed"
      
      * tag 'gfs2-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (39 commits)
        gfs2: Fix oversight in gfs2_ail1_flush
        gfs2: change from write to read lock for sd_log_flush_lock in journal replay
        gfs2: instrumentation wrt ail1 stuck
        gfs2: don't lock sd_log_flush_lock in try_rgrp_unlink
        gfs2: Remove unnecessary gfs2_qa_{get,put} pairs
        gfs2: Split gfs2_rsqa_delete into gfs2_rs_delete and gfs2_qa_put
        gfs2: Change inode qa_data to allow multiple users
        gfs2: eliminate gfs2_rsqa_alloc in favor of gfs2_qa_alloc
        gfs2: Switch to list_{first,last}_entry
        gfs2: Clean up inode initialization and teardown
        gfs2: Additional information when gfs2_ail1_flush withdraws
        gfs2: leaf_dealloc needs to allocate one more revoke
        gfs2: allow journal replay to hold sd_log_flush_lock
        gfs2: don't allow releasepage to free bd still used for revokes
        gfs2: flesh out delayed withdraw for gfs2_log_flush
        gfs2: Do proper error checking for go_sync family of glops functions
        gfs2: Don't demote a glock until its revokes are written
        gfs2: drain the ail2 list after io errors
        gfs2: Withdraw in gfs2_ail1_flush if write_cache_pages fails
        gfs2: Do log_flush in gfs2_ail_empty_gl even if ail list is empty
        ...
      018d21f5
    • Linus Torvalds's avatar
      Merge tag 'for-5.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 15c981d1
      Linus Torvalds authored
      Pull btrfs updates from David Sterba:
       "A number of core changes that make things work better in general, code
        is simpler and cleaner.
      
        Core changes:
      
         - per-inode file extent tree, for in memory tracking of contiguous
           extent ranges to make sure i_size adjustments are accurate
      
         - tree root structures are protected by reference counts, replacing
           SRCU that did not cover some cases
      
         - leak detector for tree root structures
      
         - per-transaction pinned extent tracking
      
         - buffer heads are replaced by bios for super block access
      
         - speedup of extent back reference resolution, on an example test
           scenario the runtime of send went down from a hour to minutes
      
         - factor out locking scheme used for subvolume writer and NOCOW
           exclusion, abstracted as DREW lock, double reader-writer exclusion
           (allow either readers or writers)
      
         - cleanup and abstract extent allocation policies, preparation for
           zoned device support
      
         - make reflink/clone_range work on inline extents
      
         - add more cancellation point for relocation, improves long response
           from 'balance cancel'
      
         - add page migration callback for data pages
      
         - switch to guid for uuids, with additional cleanups of the interface
      
         - make ranged full fsyncs more efficient
      
         - removal of obsolete ioctl flag BTRFS_SUBVOL_CREATE_ASYNC
      
         - remove b-tree readahead from delayed refs paths, avoiding seek and
           read unnecessary blocks
      
        Features:
      
         - v2 of ioctl to delete subvolumes, allowing to delete by id and more
           future extensions
      
        Fixes:
      
         - fix qgroup rescan worker that could block umount
      
         - fix crash during unmount due to race with delayed inode workers
      
         - fix dellaloc flushing logic that could create unnecessary chunks
           under heavy load
      
         - fix missing file extent item for hole after ranged fsync
      
         - several fixes in relocation error handling
      
        Other:
      
         - more documentation of relocation, device replace, space
           reservations
      
         - many random cleanups"
      
      * tag 'for-5.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (210 commits)
        btrfs: fix missing semaphore unlock in btrfs_sync_file
        btrfs: use nofs allocations for running delayed items
        btrfs: sysfs: Use scnprintf() instead of snprintf()
        btrfs: do not resolve backrefs for roots that are being deleted
        btrfs: track reloc roots based on their commit root bytenr
        btrfs: restart relocate_tree_blocks properly
        btrfs: reloc: reorder reservation before root selection
        btrfs: do not readahead in build_backref_tree
        btrfs: do not use readahead for running delayed refs
        btrfs: Remove async_transid from btrfs_mksubvol/create_subvol/create_snapshot
        btrfs: Remove transid argument from btrfs_ioctl_snap_create_transid
        btrfs: Remove BTRFS_SUBVOL_CREATE_ASYNC support
        btrfs: kill the subvol_srcu
        btrfs: make btrfs_cleanup_fs_roots use the radix tree lock
        btrfs: don't take an extra root ref at allocation time
        btrfs: hold a ref on the root on the dead roots list
        btrfs: make inodes hold a ref on their roots
        btrfs: move the root freeing stuff into btrfs_put_root
        btrfs: move ino_cache_inode dropping out of btrfs_free_fs_root
        btrfs: make the extent buffer leak check per fs info
        ...
      15c981d1
    • Linus Torvalds's avatar
      Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt · 1455c699
      Linus Torvalds authored
      Pull fscrypt updates from Eric Biggers:
       "Add an ioctl FS_IOC_GET_ENCRYPTION_NONCE which retrieves a file's
        encryption nonce.
      
        This makes it easier to write automated tests which verify that
        fscrypt is doing the encryption correctly"
      
      * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
        ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
        f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
        ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
        fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
      1455c699
    • Linus Torvalds's avatar
      Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 42595ce9
      Linus Torvalds authored
      Pull x86 vmware updates from Ingo Molnar:
       "The main change in this tree is the addition of 'steal time clock
        support' for VMware guests"
      
      * 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vmware: Use bool type for vmw_sched_clock
        x86/vmware: Enable steal time accounting
        x86/vmware: Add steal time clock support for VMware guests
        x86/vmware: Remove vmware_sched_clock_setup()
        x86/vmware: Make vmware_select_hypercall() __init
      42595ce9
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d9d76778
      Linus Torvalds authored
      Pull x86 mm updates from Ingo Molnar:
       "A handful of changes:
      
         - two memory encryption related fixes
      
         - don't display the kernel's virtual memory layout plaintext on
           32-bit kernels either
      
         - two simplifications"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Remove the now redundant N_MEMORY check
        dma-mapping: Fix dma_pgprot() for unencrypted coherent pages
        x86: Don't let pgprot_modify() change the page encryption bit
        x86/mm/kmmio: Use this_cpu_ptr() instead get_cpu_var() for kmmio_ctx
        x86/mm/init/32: Stop printing the virtual memory layout
      d9d76778
    • Linus Torvalds's avatar
      Merge branch 'x86-misc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7cc7e935
      Linus Torvalds authored
      Pull misc x86 updates from Ingo Molnar:
      
       - extend the decoder maps with CET instructions
      
       - fix !vDSO corner cases
      
      * 'x86-misc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/tests: Add CET instructions to the new instructions test
        x86/insn: Add Control-flow Enforcement (CET) instructions to the opcode map
        selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault
        selftests/x86/vdso: Fix no-vDSO segfaults
      7cc7e935
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d0be2d53
      Linus Torvalds authored
      Pull x86 fpu updates from Ingo Molnar:
       "Misc changes:
      
         - add a pkey sanity check
      
         - three commits to improve and future-proof xstate/xfeature handling
           some more"
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pkeys: Add check for pkey "overflow"
        x86/fpu/xstate: Warn when checking alignment of disabled xfeatures
        x86/fpu/xstate: Fix XSAVES offsets in setup_xstate_comp()
        x86/fpu/xstate: Fix last_good_offset in setup_xstate_features()
      d0be2d53
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fdf5563a
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "This topic tree contains more commits than usual:
      
         - most of it are uaccess cleanups/reorganization by Al
      
         - there's a bunch of prototype declaration (--Wmissing-prototypes)
           cleanups
      
         - misc other cleanups all around the map"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
        x86/mm/set_memory: Fix -Wmissing-prototypes warnings
        x86/efi: Add a prototype for efi_arch_mem_reserve()
        x86/mm: Mark setup_emu2phys_nid() static
        x86/jump_label: Move 'inline' keyword placement
        x86/platform/uv: Add a missing prototype for uv_bau_message_interrupt()
        kill uaccess_try()
        x86: unsafe_put-style macro for sigmask
        x86: x32_setup_rt_frame(): consolidate uaccess areas
        x86: __setup_rt_frame(): consolidate uaccess areas
        x86: __setup_frame(): consolidate uaccess areas
        x86: setup_sigcontext(): list user_access_{begin,end}() into callers
        x86: get rid of put_user_try in __setup_rt_frame() (both 32bit and 64bit)
        x86: ia32_setup_rt_frame(): consolidate uaccess areas
        x86: ia32_setup_frame(): consolidate uaccess areas
        x86: ia32_setup_sigcontext(): lift user_access_{begin,end}() into the callers
        x86/alternatives: Mark text_poke_loc_init() static
        x86/cpu: Fix a -Wmissing-prototypes warning for init_ia32_feat_ctl()
        x86/mm: Drop pud_mknotpresent()
        x86: Replace setup_irq() by request_irq()
        x86/configs: Slightly reduce defconfigs
        ...
      fdf5563a
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 97cddfc3
      Linus Torvalds authored
      Pull x86 build updates from Ingo Molnar:
       "A handful of updates: two linker script cleanups and a stock
        defconfig+allmodconfig bootability fix"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vdso: Discard .note.gnu.property sections in vDSO
        x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
        x86/Kconfig: Make CMDLINE_OVERRIDE depend on non-empty CMDLINE
      97cddfc3
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9589351c
      Linus Torvalds authored
      Pull x86 boot updates from Ingo Molnar:
       "Misc cleanups and small enhancements all around the map"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot/compressed: Fix debug_puthex() parameter type
        x86/setup: Fix static memory detection
        x86/vmlinux: Drop unneeded linker script discard of .eh_frame
        x86/*/Makefile: Use -fno-asynchronous-unwind-tables to suppress .eh_frame sections
        x86/boot/compressed: Remove .eh_frame section from bzImage
        x86/boot/compressed/64: Remove .bss/.pgtable from bzImage
        x86/boot/compressed/64: Use 32-bit (zero-extended) MOV for z_output_len
        x86/boot/compressed/64: Use LEA to initialize boot stack pointer
      9589351c
    • Gustavo A. R. Silva's avatar
      net: ipv6: rpl_iptunnel: Fix potential memory leak in rpl_do_srh_inline · 7f80ccfe
      Gustavo A. R. Silva authored
      In case memory resources for buf were allocated, release them before
      return.
      
      Addresses-Coverity-ID: 1492011 ("Resource leak")
      Fixes: a7a29f9c ("net: ipv6: add rpl sr tunnel")
      Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f80ccfe
    • Rohit Maheshwari's avatar
      cxgb4/chcr: nic-tls stats in ethtool · a0190431
      Rohit Maheshwari authored
      Included nic tls statistics in ethtool stats.
      Signed-off-by: default avatarRohit Maheshwari <rohitm@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a0190431
    • Russell King's avatar
      net: dsa: fix oops while probing Marvell DSA switches · 765bda93
      Russell King authored
      Fix an oops in dsa_port_phylink_mac_change() caused by a combination
      of a20f9970 ("net: dsa: Don't instantiate phylink for CPU/DSA
      ports unless needed") and the net-dsa-improve-serdes-integration
      series of patches 65b7a2c8 ("Merge branch
      'net-dsa-improve-serdes-integration'").
      
      Unable to handle kernel NULL pointer dereference at virtual address 00000124
      pgd = c0004000
      [00000124] *pgd=00000000
      Internal error: Oops: 805 [#1] SMP ARM
      Modules linked in: tag_edsa spi_nor mtd xhci_plat_hcd mv88e6xxx(+) xhci_hcd armada_thermal marvell_cesa dsa_core ehci_orion libdes phy_armada38x_comphy at24 mcp3021 sfp evbug spi_orion sff mdio_i2c
      CPU: 1 PID: 214 Comm: irq/55-mv88e6xx Not tainted 5.6.0+ #470
      Hardware name: Marvell Armada 380/385 (Device Tree)
      PC is at phylink_mac_change+0x10/0x88
      LR is at mv88e6352_serdes_irq_status+0x74/0x94 [mv88e6xxx]
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      765bda93
    • Bruno Meneguele's avatar
      net/bpfilter: remove superfluous testing message · 41c55ea6
      Bruno Meneguele authored
      A testing message was brought by 13d0f7b8 ("net/bpfilter: fix dprintf
      usage for /dev/kmsg") but should've been deleted before patch submission.
      Although it doesn't cause any harm to the code or functionality itself, it's
      totally unpleasant to have it displayed on every loop iteration with no real
      use case. Thus remove it unconditionally.
      
      Fixes: 13d0f7b8 ("net/bpfilter: fix dprintf usage for /dev/kmsg")
      Signed-off-by: default avatarBruno Meneguele <bmeneg@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      41c55ea6
    • Codrin Ciubotariu's avatar
      net: macb: Fix handling of fixed-link node · 79540d13
      Codrin Ciubotariu authored
      fixed-link nodes are treated as PHY nodes by of_mdiobus_child_is_phy().
      We must check if the interface is a fixed-link before looking up for PHY
      nodes.
      
      Fixes: 7897b071 ("net: macb: convert to phylink")
      Tested-by: default avatarCristian Birsan <cristian.birsan@microchip.com>
      Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      79540d13
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 3cd86a58
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
       "The bulk is in-kernel pointer authentication, activity monitors and
        lots of asm symbol annotations. I also queued the sys_mremap() patch
        commenting the asymmetry in the address untagging.
      
        Summary:
      
         - In-kernel Pointer Authentication support (previously only offered
           to user space).
      
         - ARM Activity Monitors (AMU) extension support allowing better CPU
           utilisation numbers for the scheduler (frequency invariance).
      
         - Memory hot-remove support for arm64.
      
         - Lots of asm annotations (SYM_*) in preparation for the in-kernel
           Branch Target Identification (BTI) support.
      
         - arm64 perf updates: ARMv8.5-PMU 64-bit counters, refactoring the
           PMU init callbacks, support for new DT compatibles.
      
         - IPv6 header checksum optimisation.
      
         - Fixes: SDEI (software delegated exception interface) double-lock on
           hibernate with shared events.
      
         - Minor clean-ups and refactoring: cpu_ops accessor,
           cpu_do_switch_mm() converted to C, cpufeature finalisation helper.
      
         - sys_mremap() comment explaining the asymmetric address untagging
           behaviour"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (81 commits)
        mm/mremap: Add comment explaining the untagging behaviour of mremap()
        arm64: head: Convert install_el2_stub to SYM_INNER_LABEL
        arm64: Introduce get_cpu_ops() helper function
        arm64: Rename cpu_read_ops() to init_cpu_ops()
        arm64: Declare ACPI parking protocol CPU operation if needed
        arm64: move kimage_vaddr to .rodata
        arm64: use mov_q instead of literal ldr
        arm64: Kconfig: verify binutils support for ARM64_PTR_AUTH
        lkdtm: arm64: test kernel pointer authentication
        arm64: compile the kernel with ptrauth return address signing
        kconfig: Add support for 'as-option'
        arm64: suspend: restore the kernel ptrauth keys
        arm64: __show_regs: strip PAC from lr in printk
        arm64: unwind: strip PAC from kernel addresses
        arm64: mask PAC bits of __builtin_return_address
        arm64: initialize ptrauth keys for kernel booting task
        arm64: initialize and switch ptrauth kernel keys
        arm64: enable ptrauth earlier
        arm64: cpufeature: handle conflicts based on capability
        arm64: cpufeature: Move cpu capability helpers inside C file
        ...
      3cd86a58
    • Codrin Ciubotariu's avatar
      net: dsa: ksz: Select KSZ protocol tag · f772148e
      Codrin Ciubotariu authored
      KSZ protocol tag is needed by the KSZ DSA drivers.
      
      Fixes: 0b9f9dfb ("dsa: Allow tag drivers to be built as modules")
      Tested-by: default avatarCristian Birsan <cristian.birsan@microchip.com>
      Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f772148e
    • Linus Torvalds's avatar
      Merge tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze · a8222fd5
      Linus Torvalds authored
      Pull microblaze updates from Michal Simek:
      
       - convert license headers to SPDX
      
       - cleanup header handling and use asm-generic one
      
       - get rid of earlyprintk residues
      
       - define barriers and use it in the code
      
       - get rid of setup_irq() for timer
      
       - various small addons and fixes
      
      * tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Replace setup_irq() by request_irq()
        microblaze: Stop printing the virtual memory layout
        microblaze: Use asm generic cmpxchg.h for !SMP case
        microblaze: Define percpu sestion in linker file
        microblaze: Remove unused boot_cpuid variable
        microblaze: Add missing irqflags.h header
        microblaze: Add sync to tlb operations
        microblaze: Define microblaze barrier
        microblaze: Remove empty headers
        microblaze: Remove early printk setup
        microblaze: Remove architecture tlb.h and use generic one
        microblaze: Convert headers to SPDX license
        microblaze: Fix _reset() function
        microblaze: Kernel parameters should be parsed earlier
      a8222fd5
    • Linus Torvalds's avatar
      Merge tag 'please-pull-ia64_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · cad18da0
      Linus Torvalds authored
      Pull ia64 updates from Tony Luck:
       "Couple of cleanup patches"
      
      * tag 'please-pull-ia64_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        tty/serial: cleanup after ioc*_serial driver removal
        ia64: replace setup_irq() by request_irq()
      cad18da0