]> Git Repo - linux.git/commitdiff
Merge tag 'mm-nonmm-stable-2022-08-06-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Sun, 7 Aug 2022 17:03:24 +0000 (10:03 -0700)
committerLinus Torvalds <[email protected]>
Sun, 7 Aug 2022 17:03:24 +0000 (10:03 -0700)
Pull misc updates from Andrew Morton:
 "Updates to various subsystems which I help look after. lib, ocfs2,
  fatfs, autofs, squashfs, procfs, etc. A relatively small amount of
  material this time"

* tag 'mm-nonmm-stable-2022-08-06-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (72 commits)
  scripts/gdb: ensure the absolute path is generated on initial source
  MAINTAINERS: kunit: add David Gow as a maintainer of KUnit
  mailmap: add linux.dev alias for Brendan Higgins
  mailmap: update Kirill's email
  profile: setup_profiling_timer() is moslty not implemented
  ocfs2: fix a typo in a comment
  ocfs2: use the bitmap API to simplify code
  ocfs2: remove some useless functions
  lib/mpi: fix typo 'the the' in comment
  proc: add some (hopefully) insightful comments
  bdi: remove enum wb_congested_state
  kernel/hung_task: fix address space of proc_dohung_task_timeout_secs
  lib/lzo/lzo1x_compress.c: replace ternary operator with min() and min_t()
  squashfs: support reading fragments in readahead call
  squashfs: implement readahead
  squashfs: always build "file direct" version of page actor
  Revert "squashfs: provide backing_dev_info in order to disable read-ahead"
  fs/ocfs2: Fix spelling typo in comment
  ia64: old_rr4 added under CONFIG_HUGETLB_PAGE
  proc: fix test for "vsyscall=xonly" boot option
  ...

15 files changed:
1  2 
.mailmap
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/powerpc/kernel/smp.c
arch/riscv/kernel/smp.c
arch/x86/kernel/apic/apic.c
fs/squashfs/file.c
include/linux/cpumask.h
include/linux/net.h
kernel/kallsyms.c
kernel/kexec_file.c
lib/Kconfig
lib/Kconfig.debug
lib/Makefile
tools/testing/selftests/Makefile

diff --combined .mailmap
index 71577c3962521890631e1687b77197f6b7382eee,23e98625d1ce6f0bac6c694ef1b927c3b58815d2..38255d412f0b3a82f26d63b4c52f84e3c50d4cc0
+++ b/.mailmap
@@@ -60,17 -60,10 +60,17 @@@ Arnd Bergmann <[email protected]
  Atish Patra <[email protected]> <[email protected]>
  Axel Dyks <[email protected]>
  Axel Lin <[email protected]>
  Bart Van Assche <[email protected]> <[email protected]>
  Bart Van Assche <[email protected]> <[email protected]>
  Ben Gardner <[email protected]>
  Ben M Cahill <[email protected]>
 +Ben Widawsky <[email protected]> <[email protected]>
 +Ben Widawsky <[email protected]> <[email protected]>
 +Ben Widawsky <[email protected]> <[email protected]>
  Björn Steinbrink <[email protected]>
  Björn Töpel <[email protected]> <[email protected]>
  Björn Töpel <[email protected]> <[email protected]>
@@@ -78,6 -71,7 +78,7 @@@ Boris Brezillon <[email protected]
  Boris Brezillon <[email protected]> <[email protected]>
  Boris Brezillon <[email protected]> <[email protected]>
  Boris Brezillon <[email protected]> <[email protected]>
+ Brendan Higgins <[email protected]> <[email protected]>
  Brian Avery <[email protected]>
  Brian King <[email protected]>
  Brian Silverman <[email protected]> <[email protected]>
@@@ -139,8 -133,6 +140,8 @@@ Frank Rowand <[email protected]> <
  Frank Zago <[email protected]>
  Gerald Schaefer <[email protected]> <[email protected]>
  Gerald Schaefer <[email protected]> <[email protected]>
  Gerald Schaefer <[email protected]> <[email protected]>
@@@ -230,7 -222,7 +231,7 @@@ Kees Cook <[email protected]> <kees
  Keith Busch <[email protected]> <[email protected]>
  Keith Busch <[email protected]> <[email protected]>
  Kenneth W Chen <[email protected]>
- Kirill Tkhai <[email protected]> <[email protected]>
+ Kirill Tkhai <[email protected]> <[email protected]>
  Konstantin Khlebnikov <[email protected]> <[email protected]>
  Konstantin Khlebnikov <[email protected]> <[email protected]>
  Koushik <[email protected]>
@@@ -377,7 -369,6 +378,7 @@@ Sean Nyekjaer <[email protected]> <sean.n
  Sebastian Reichel <[email protected]> <[email protected]>
  Sebastian Reichel <[email protected]> <[email protected]>
  Sedat Dilek <[email protected]> <[email protected]>
 +Seth Forshee <[email protected]> <[email protected]>
  Shiraz Hashim <[email protected]> <[email protected]>
index f251f5cce63baae2a803709ca86a5906dfe10a39,2c9c0229b77071c9191a0fb8d01b9c2a2c2f89db..bab2b0bf5988dfc8dfce798f6ea3086e82eed75e
        arm64.nomte     [ARM64] Unconditionally disable Memory Tagging Extension
                        support
  
 +      arm64.nosve     [ARM64] Unconditionally disable Scalable Vector
 +                      Extension support
 +
 +      arm64.nosme     [ARM64] Unconditionally disable Scalable Matrix
 +                      Extension support
 +
        ataflop=        [HW,M68k]
  
        atarimouse=     [HW,MOUSE] Atari Mouse
                        nosocket -- Disable socket memory accounting.
                        nokmem -- Disable kernel memory accounting.
  
 -      checkreqprot    [SELINUX] Set initial checkreqprot flag value.
 +      checkreqprot=   [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
                        See security/selinux/Kconfig help text.
                        0 -- check protection applied by kernel (includes
                        (in particular on some ATI chipsets).
                        The kernel tries to set a reasonable default.
  
 -      enforcing       [SELINUX] Set initial enforcing status.
 +      enforcing=      [SELINUX] Set initial enforcing status.
                        Format: {"0" | "1"}
                        See security/selinux/Kconfig help text.
                        0 -- permissive (log only, no denials).
  
        hlt             [BUGS=ARM,SH]
  
+       hostname=       [KNL] Set the hostname (aka UTS nodename).
+                       Format: <string>
+                       This allows setting the system's hostname during early
+                       startup. This sets the name returned by gethostname.
+                       Using this parameter to set the hostname makes it
+                       possible to ensure the hostname is correctly set before
+                       any userspace processes run, avoiding the possibility
+                       that a process may call gethostname before the hostname
+                       has been explicitly set, resulting in the calling
+                       process getting an incorrect result. The string must
+                       not exceed the maximum allowed hostname length (usually
+                       64 characters) and will be truncated otherwise.
        hpet=           [X86-32,HPET] option to control HPET usage
                        Format: { enable (default) | disable | force |
                                verbose }
                        Built with CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON=y,
                        the default is on.
  
 -                      This is not compatible with memory_hotplug.memmap_on_memory.
 -                      If both parameters are enabled, hugetlb_free_vmemmap takes
 -                      precedence over memory_hotplug.memmap_on_memory.
 +                      Note that the vmemmap pages may be allocated from the added
 +                      memory block itself when memory_hotplug.memmap_on_memory is
 +                      enabled, those vmemmap pages cannot be optimized even if this
 +                      feature is enabled.  Other vmemmap pages not allocated from
 +                      the added memory block itself do not be affected.
  
        hung_task_panic=
                        [KNL] Should the hung task detector generate panics.
  
        ivrs_ioapic     [HW,X86-64]
                        Provide an override to the IOAPIC-ID<->DEVICE-ID
 -                      mapping provided in the IVRS ACPI table. For
 -                      example, to map IOAPIC-ID decimal 10 to
 -                      PCI device 00:14.0 write the parameter as:
 +                      mapping provided in the IVRS ACPI table.
 +                      By default, PCI segment is 0, and can be omitted.
 +                      For example:
 +                      * To map IOAPIC-ID decimal 10 to PCI device 00:14.0
 +                        write the parameter as:
                                ivrs_ioapic[10]=00:14.0
 +                      * To map IOAPIC-ID decimal 10 to PCI segment 0x1 and
 +                        PCI device 00:14.0 write the parameter as:
 +                              ivrs_ioapic[10]=0001:00:14.0
  
        ivrs_hpet       [HW,X86-64]
                        Provide an override to the HPET-ID<->DEVICE-ID
 -                      mapping provided in the IVRS ACPI table. For
 -                      example, to map HPET-ID decimal 0 to
 -                      PCI device 00:14.0 write the parameter as:
 +                      mapping provided in the IVRS ACPI table.
 +                      By default, PCI segment is 0, and can be omitted.
 +                      For example:
 +                      * To map HPET-ID decimal 0 to PCI device 00:14.0
 +                        write the parameter as:
                                ivrs_hpet[0]=00:14.0
 +                      * To map HPET-ID decimal 10 to PCI segment 0x1 and
 +                        PCI device 00:14.0 write the parameter as:
 +                              ivrs_ioapic[10]=0001:00:14.0
  
        ivrs_acpihid    [HW,X86-64]
                        Provide an override to the ACPI-HID:UID<->DEVICE-ID
 -                      mapping provided in the IVRS ACPI table. For
 -                      example, to map UART-HID:UID AMD0020:0 to
 -                      PCI device 00:14.5 write the parameter as:
 +                      mapping provided in the IVRS ACPI table.
 +
 +                      For example, to map UART-HID:UID AMD0020:0 to
 +                      PCI segment 0x1 and PCI device ID 00:14.5,
 +                      write the parameter as:
 +                              ivrs_acpihid[0001:00:14.5]=AMD0020:0
 +
 +                      By default, PCI segment is 0, and can be omitted.
 +                      For example, PCI device 00:14.5 write the parameter as:
                                ivrs_acpihid[00:14.5]=AMD0020:0
  
        js=             [HW,JOY] Analog joystick
                        the KVM_CLEAR_DIRTY ioctl, and only for the pages being
                        cleared.
  
 -                      Eager page splitting currently only supports splitting
 -                      huge pages mapped by the TDP MMU.
 +                      Eager page splitting is only supported when kvm.tdp_mmu=Y.
  
                        Default is Y (on).
  
                        [KNL,X86,ARM] Boolean flag to enable this feature.
                        Format: {on | off (default)}
                        When enabled, runtime hotplugged memory will
 -                      allocate its internal metadata (struct pages)
 -                      from the hotadded memory which will allow to
 -                      hotadd a lot of memory without requiring
 -                      additional memory to do so.
 +                      allocate its internal metadata (struct pages,
 +                      those vmemmap pages cannot be optimized even
 +                      if hugetlb_free_vmemmap is enabled) from the
 +                      hotadded memory which will allow to hotadd a
 +                      lot of memory without requiring additional
 +                      memory to do so.
                        This feature is disabled by default because it
                        has some implication on large (e.g. GB)
                        allocations in some configurations (e.g. small
                        Note that even when enabled, there are a few cases where
                        the feature is not effective.
  
 -                      This is not compatible with hugetlb_free_vmemmap. If
 -                      both parameters are enabled, hugetlb_free_vmemmap takes
 -                      precedence over memory_hotplug.memmap_on_memory.
 -
        memtest=        [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest
                        Format: <integer>
                        default : 0 <disable>
                        mem_encrypt=on:         Activate SME
                        mem_encrypt=off:        Do not activate SME
  
 -                      Refer to Documentation/virt/kvm/amd-memory-encryption.rst
 +                      Refer to Documentation/virt/kvm/x86/amd-memory-encryption.rst
                        for details on when memory encryption can be activated.
  
        mem_sleep_default=      [SUSPEND] Default system suspend mode:
                                improves system performance, but it may also
                                expose users to several CPU vulnerabilities.
                                Equivalent to: nopti [X86,PPC]
 -                                             kpti=0 [ARM64]
 +                                             if nokaslr then kpti=0 [ARM64]
                                               nospectre_v1 [X86,PPC]
                                               nobp=0 [S390]
                                               nospectre_v2 [X86,PPC,S390,ARM64]
                                               no_entry_flush [PPC]
                                               no_uaccess_flush [PPC]
                                               mmio_stale_data=off [X86]
 +                                             retbleed=off [X86]
  
                                Exceptions:
                                               This does not have any effect on
                                               mds=full,nosmt [X86]
                                               tsx_async_abort=full,nosmt [X86]
                                               mmio_stale_data=full,nosmt [X86]
 +                                             retbleed=auto,nosmt [X86]
  
        mminit_loglevel=
                        [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
  
        noautogroup     Disable scheduler automatic task group creation.
  
 -      nobats          [PPC] Do not use BATs for mapping kernel lowmem
 -                      on "Classic" PPC cores.
 -
        nocache         [ARM]
  
        nodsp           [SH] Disable hardware DSP at boot time.
                        just as if they had also been called out in the
                        rcu_nocbs= boot parameter.
  
 +                      Note that this argument takes precedence over
 +                      the CONFIG_RCU_NOCB_CPU_DEFAULT_ALL option.
 +
        noiotrap        [SH] Disables trapped I/O port accesses.
  
        noirqdebug      [X86-32] Disables the code which attempts to detect and
  
        nolapic_timer   [X86-32,APIC] Do not use the local APIC timer.
  
 -      noltlbs         [PPC] Do not use large page/tlb entries for kernel
 -                      lowmem mapping on PPC40x and PPC8xx
 -
        nomca           [IA-64] Disable machine check abort handling
  
        nomce           [X86-32] Disable Machine Check Exception
        noreplace-smp   [X86-32,SMP] Don't replace SMP instructions
                        with UP alternatives
  
 -      nordrand        [X86] Disable kernel use of the RDRAND and
 -                      RDSEED instructions even if they are supported
 -                      by the processor.  RDRAND and RDSEED are still
 -                      available to user space applications.
 -
        noresume        [SWSUSP] Disables resume and restores original swap
                        space.
  
                        no-callback mode from boot but the mode may be
                        toggled at runtime via cpusets.
  
 +                      Note that this argument takes precedence over
 +                      the CONFIG_RCU_NOCB_CPU_DEFAULT_ALL option.
 +
        rcu_nocb_poll   [KNL]
                        Rather than requiring that offloaded CPUs
                        (specified by rcu_nocbs= above) explicitly
                        When RCU_NOCB_CPU is set, also adjust the
                        priority of NOCB callback kthreads.
  
 +      rcutree.rcu_divisor= [KNL]
 +                      Set the shift-right count to use to compute
 +                      the callback-invocation batch limit bl from
 +                      the number of callbacks queued on this CPU.
 +                      The result will be bounded below by the value of
 +                      the rcutree.blimit kernel parameter.  Every bl
 +                      callbacks, the softirq handler will exit in
 +                      order to allow the CPU to do other work.
 +
 +                      Please note that this callback-invocation batch
 +                      limit applies only to non-offloaded callback
 +                      invocation.  Offloaded callbacks are instead
 +                      invoked in the context of an rcuoc kthread, which
 +                      scheduler will preempt as it does any other task.
 +
 +      rcutree.nocb_nobypass_lim_per_jiffy= [KNL]
 +                      On callback-offloaded (rcu_nocbs) CPUs,
 +                      RCU reduces the lock contention that would
 +                      otherwise be caused by callback floods through
 +                      use of the ->nocb_bypass list.  However, in the
 +                      common non-flooded case, RCU queues directly to
 +                      the main ->cblist in order to avoid the extra
 +                      overhead of the ->nocb_bypass list and its lock.
 +                      But if there are too many callbacks queued during
 +                      a single jiffy, RCU pre-queues the callbacks into
 +                      the ->nocb_bypass queue.  The definition of "too
 +                      many" is supplied by this kernel boot parameter.
 +
        rcutree.rcu_nocb_gp_stride= [KNL]
                        Set the number of NOCB callback kthreads in
                        each group, which defaults to the square root
  
        retain_initrd   [RAM] Keep initrd memory after extraction
  
 +      retbleed=       [X86] Control mitigation of RETBleed (Arbitrary
 +                      Speculative Code Execution with Return Instructions)
 +                      vulnerability.
 +
 +                      off          - no mitigation
 +                      auto         - automatically select a migitation
 +                      auto,nosmt   - automatically select a mitigation,
 +                                     disabling SMT if necessary for
 +                                     the full mitigation (only on Zen1
 +                                     and older without STIBP).
 +                      ibpb         - mitigate short speculation windows on
 +                                     basic block boundaries too. Safe, highest
 +                                     perf impact.
 +                      unret        - force enable untrained return thunks,
 +                                     only effective on AMD f15h-f17h
 +                                     based systems.
 +                      unret,nosmt  - like unret, will disable SMT when STIBP
 +                                     is not available.
 +
 +                      Selecting 'auto' will choose a mitigation method at run
 +                      time according to the CPU.
 +
 +                      Not specifying this option is equivalent to retbleed=auto.
 +
        rfkill.default_state=
                0       "airplane mode".  All wifi, bluetooth, wimax, gps, fm,
                        etc. communication is blocked by default.
                        cache (risks via metadata attacks are mostly
                        unchanged). Debug options disable merging on their
                        own.
 -                      For more information see Documentation/vm/slub.rst.
 +                      For more information see Documentation/mm/slub.rst.
  
        slab_max_order= [MM, SLAB]
                        Determines the maximum allowed order for slabs.
                        slub_debug can create guard zones around objects and
                        may poison objects when not in use. Also tracks the
                        last alloc / free. For more information see
 -                      Documentation/vm/slub.rst.
 +                      Documentation/mm/slub.rst.
  
        slub_max_order= [MM, SLUB]
                        Determines the maximum allowed order for slabs.
                        A high setting may cause OOMs due to memory
                        fragmentation. For more information see
 -                      Documentation/vm/slub.rst.
 +                      Documentation/mm/slub.rst.
  
        slub_min_objects=       [MM, SLUB]
                        The minimum number of objects per slab. SLUB will
                        the number of objects indicated. The higher the number
                        of objects the smaller the overhead of tracking slabs
                        and the less frequently locks need to be acquired.
 -                      For more information see Documentation/vm/slub.rst.
 +                      For more information see Documentation/mm/slub.rst.
  
        slub_min_order= [MM, SLUB]
                        Determines the minimum page order for slabs. Must be
                        lower than slub_max_order.
 -                      For more information see Documentation/vm/slub.rst.
 +                      For more information see Documentation/mm/slub.rst.
  
        slub_merge      [MM, SLUB]
                        Same with slab_merge.
                        eibrs             - enhanced IBRS
                        eibrs,retpoline   - enhanced IBRS + Retpolines
                        eibrs,lfence      - enhanced IBRS + LFENCE
 +                      ibrs              - use IBRS to protect kernel
  
                        Not specifying this option is equivalent to
                        spectre_v2=auto.
                        expediting.  Set to zero to disable automatic
                        expediting.
  
 +      srcutree.srcu_max_nodelay [KNL]
 +                      Specifies the number of no-delay instances
 +                      per jiffy for which the SRCU grace period
 +                      worker thread will be rescheduled with zero
 +                      delay. Beyond this limit, worker thread will
 +                      be rescheduled with a sleep delay of one jiffy.
 +
 +      srcutree.srcu_max_nodelay_phase [KNL]
 +                      Specifies the per-grace-period phase, number of
 +                      non-sleeping polls of readers. Beyond this limit,
 +                      grace period worker thread will be rescheduled
 +                      with a sleep delay of one jiffy, between each
 +                      rescan of the readers, for a grace period phase.
 +
 +      srcutree.srcu_retry_check_delay [KNL]
 +                      Specifies number of microseconds of non-sleeping
 +                      delay between each non-sleeping poll of readers.
 +
        srcutree.small_contention_lim [KNL]
                        Specifies the number of update-side contention
                        events per jiffy will be tolerated before
                        it if 0 is given (See Documentation/admin-guide/cgroup-v1/memory.rst)
  
        swiotlb=        [ARM,IA-64,PPC,MIPS,X86]
 -                      Format: { <int> | force | noforce }
 +                      Format: { <int> [,<int>] | force | noforce }
                        <int> -- Number of I/O TLB slabs
 +                      <int> -- Second integer after comma. Number of swiotlb
 +                               areas with their own lock. Will be rounded up
 +                               to a power of 2.
                        force -- force using of bounce buffers even if they
                                 wouldn't be automatically used by the kernel
                        noforce -- Never use bounce buffers (for debugging)
diff --combined MAINTAINERS
index 5a6e53255eaf2d169db0b31f3148921a21f13ebd,ba745a624c756d95ed299a32e2b2cea94e8959b0..b4d96ed8bcc684a1da3870a999ecb7ef9c72aa05
@@@ -171,6 -171,7 +171,6 @@@ F: drivers/scsi/53c700
  
  6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
  M:    Alexander Aring <[email protected]>
 -M:    Jukka Rissanen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -241,11 -242,6 +241,11 @@@ F:       include/trace/events/9p.
  F:    include/uapi/linux/virtio_9p.h
  F:    net/9p/
  
 +A64FX DIAG DRIVER
 +M:    Hitomi Hasegawa <[email protected]>
 +S:    Supported
 +F:    drivers/soc/fujitsu/a64fx-diag.c
 +
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -284,37 -280,38 +284,37 @@@ S:      Maintaine
  F:    drivers/hwmon/abituguru3.c
  
  ACCES 104-DIO-48E GPIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-104-dio-48e.c
  
  ACCES 104-IDI-48 GPIO DRIVER
 -M:    "William Breathitt Gray" <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-104-idi-48.c
  
  ACCES 104-IDIO-16 GPIO DRIVER
 -M:    "William Breathitt Gray" <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-104-idio-16.c
  
  ACCES 104-QUAD-8 DRIVER
 -M:    William Breathitt Gray <[email protected]>
 -M:    Syed Nayyar Waris <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-pci-idio-16.c
  
  ACCES PCIe-IDIO-24 GPIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-pcie-idio-24.c
@@@ -429,6 -426,7 +429,6 @@@ F: drivers/acpi/*thermal
  ACPI VIOT DRIVER
  M:    Jean-Philippe Brucker <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/acpi/viot.c
@@@ -736,14 -734,6 +736,14 @@@ S:       Maintaine
  F:    Documentation/i2c/busses/i2c-ali1563.rst
  F:    drivers/i2c/busses/i2c-ali1563.c
  
 +ALIBABA ELASTIC RDMA DRIVER
 +M:    Cheng Xu <[email protected]>
 +M:    Kai Shen <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/erdma
 +F:    include/uapi/rdma/erdma-abi.h
 +
  ALIENWARE WMI DRIVER
  L:    [email protected]
  S:    Maintained
@@@ -773,14 -763,6 +773,14 @@@ T:       git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
  F:    drivers/media/platform/sunxi/sun4i-csi/
  
 +ALLWINNER A31 MIPI CSI-2 BRIDGE DRIVER
 +M:    Paul Kocialkowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/allwinner,sun6i-a31-mipi-csi2.yaml
 +F:    drivers/media/platform/sunxi/sun6i-mipi-csi2/
 +
  ALLWINNER CPUFREQ DRIVER
  M:    Yangtao Li <[email protected]>
  L:    [email protected]
@@@ -816,7 -798,7 +816,7 @@@ S: Maintaine
  F:    drivers/staging/media/sunxi/cedrus/
  
  ALPHA PORT
 -M:    Richard Henderson <r[email protected]>
 +M:    Richard Henderson <r[email protected]>
  M:    Ivan Kokshaysky <[email protected]>
  M:    Matt Turner <[email protected]>
  L:    [email protected]
@@@ -978,6 -960,7 +978,6 @@@ F: drivers/video/fbdev/geode
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <[email protected]>
  R:    Suravee Suthikulpanit <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@@ -1015,7 -998,7 +1015,7 @@@ AMD PMC DRIVE
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/amd-pmc.*
 +F:    drivers/platform/x86/amd/pmc.c
  
  AMD HSMP DRIVER
  M:    Naveen Krishna Chatradhi <[email protected]>
@@@ -1025,7 -1008,7 +1025,7 @@@ S:      Maintaine
  F:    Documentation/x86/amd_hsmp.rst
  F:    arch/x86/include/asm/amd_hsmp.h
  F:    arch/x86/include/uapi/asm/amd_hsmp.h
 -F:    drivers/platform/x86/amd_hsmp.c
 +F:    drivers/platform/x86/amd/hsmp.c
  
  AMD POWERPLAY AND SWSMU
  M:    Evan Quan <[email protected]>
@@@ -1057,7 -1040,6 +1057,7 @@@ F:      arch/arm64/boot/dts/amd
  
  AMD XGBE DRIVER
  M:    Tom Lendacky <[email protected]>
 +M:    "Shyam Sundar S K" <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
@@@ -1347,7 -1329,7 +1347,7 @@@ M:      Todd Kjos <[email protected]
  M:    Martijn Coenen <[email protected]>
  M:    Joel Fernandes <[email protected]>
  M:    Christian Brauner <[email protected]>
 -M:    Hridya Valsaraju <hridya@google.com>
 +M:    Carlos Llamas <cmllamas@google.com>
  M:    Suren Baghdasaryan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1374,7 -1356,7 +1374,7 @@@ S:      Maintaine
  F:    sound/aoa/
  
  APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/adc/stx104.c
@@@ -1488,13 -1470,6 +1488,13 @@@ S:    Supporte
  W:    http://www.aquantia.com
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
 +AR0521 ON SEMICONDUCTOR CAMERA SENSOR DRIVER
 +M:    Krzysztof Hałasa <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/onnn,ar0521.yaml
 +F:    drivers/media/i2c/ar0521.c
 +
  ARASAN NAND CONTROLLER DRIVER
  M:    Miquel Raynal <[email protected]>
  M:    Naga Sureshkumar Relli <[email protected]>
@@@ -1547,7 -1522,7 +1547,7 @@@ F:      Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
  F:    Documentation/devicetree/bindings/auxdisplay/arm,versatile-lcd.yaml
  F:    Documentation/devicetree/bindings/clock/arm,syscon-icst.yaml
 -F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
 +F:    Documentation/devicetree/bindings/i2c/arm,i2c-versatile.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
  F:    Documentation/devicetree/bindings/mtd/mtd-physmap.yaml
  F:    arch/arm/boot/dts/arm-realview-*
@@@ -1850,7 -1825,6 +1850,7 @@@ ARM/APPLE MACHINE SUPPOR
  M:    Hector Martin <[email protected]>
  M:    Sven Peter <[email protected]>
  R:    Alyssa Rosenzweig <[email protected]>
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://asahilinux.org
@@@ -1860,7 -1834,6 +1860,7 @@@ T:      git https://github.com/AsahiLinux/li
  F:    Documentation/devicetree/bindings/arm/apple.yaml
  F:    Documentation/devicetree/bindings/arm/apple/*
  F:    Documentation/devicetree/bindings/clock/apple,nco.yaml
 +F:    Documentation/devicetree/bindings/dma/apple,admac.yaml
  F:    Documentation/devicetree/bindings/i2c/apple,i2c.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/apple,*
  F:    Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@@ -1874,7 -1847,6 +1874,7 @@@ F:      Documentation/devicetree/bindings/po
  F:    Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
  F:    arch/arm64/boot/dts/apple/
  F:    drivers/clk/clk-apple-nco.c
 +F:    drivers/dma/apple-admac.c
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -1923,7 -1895,6 +1923,7 @@@ L:      [email protected] (moder
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed-*
  F:    arch/arm/mach-aspeed/
  N:    aspeed
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
 -F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
 -F:    Documentation/devicetree/bindings/arm/coresight-cti.yaml
 -F:    Documentation/devicetree/bindings/arm/coresight.txt
 -F:    Documentation/devicetree/bindings/arm/ete.yaml
 -F:    Documentation/devicetree/bindings/arm/trbe.yaml
 +F:    Documentation/devicetree/bindings/arm/arm,coresight-*.yaml
 +F:    Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml
 +F:    Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml
  F:    Documentation/trace/coresight/*
  F:    drivers/hwtracing/coresight/*
  F:    include/dt-bindings/arm/coresight-cti-dt.h
@@@ -2169,13 -2142,11 +2169,13 @@@ M:   Jean-Marie Verdun <[email protected]
  M:    Nick Hawkins <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/hpe,gxp.yaml
 +F:    Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
  F:    Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
  F:    arch/arm/boot/dts/hpe-bmc*
  F:    arch/arm/boot/dts/hpe-gxp*
  F:    arch/arm/mach-hpe/
  F:    drivers/clocksource/timer-gxp.c
 +F:    drivers/spi/spi-gxp.c
  F:    drivers/watchdog/gxp-wdt.c
  
  ARM/IGEP MACHINE SUPPORT
@@@ -2447,7 -2418,7 +2447,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/arm/ste-*
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
 -F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 +F:    Documentation/devicetree/bindings/i2c/st,nomadik-i2c.yaml
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-ux500/
@@@ -2479,11 -2450,9 +2479,11 @@@ F:    Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/arm/npcm/*
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    arch/arm/mach-npcm/
 +F:    arch/arm64/boot/dts/nuvoton/
  F:    drivers/*/*npcm*
  F:    drivers/*/*/*npcm*
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
 +F:    include/dt-bindings/clock/nuvoton,npcm845-clk.h
  
  ARM/NUVOTON WPCM450 ARCHITECTURE
  M:    Jonathan Neuschäfer <[email protected]>
@@@ -2530,8 -2499,10 +2530,8 @@@ F:     drivers/power/reset/oxnas-restart.
  N:    oxnas
  
  ARM/PALM TREO SUPPORT
 -M:    Tomas Cech <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -W:    http://hackndev.com
 +S:    Orphan
  F:    arch/arm/mach-pxa/palmtreo.*
  
  ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
@@@ -2569,7 -2540,6 +2569,7 @@@ W:      http://www.armlinux.org.uk
  ARM/QUALCOMM SUPPORT
  M:    Andy Gross <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +R:    Konrad Dybcio <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
@@@ -2620,7 -2590,7 +2620,7 @@@ L:      [email protected] (mo
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/rda.yaml
  F:    Documentation/devicetree/bindings/gpio/gpio-rda.yaml
 -F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.yaml
  F:    Documentation/devicetree/bindings/serial/rda,8810pl-uart.yaml
  F:    Documentation/devicetree/bindings/timer/rda,8810pl-timer.yaml
  F:    arch/arm/boot/dts/rda8810pl-*
@@@ -2648,8 -2618,6 +2648,8 @@@ Q:      http://patchwork.kernel.org/project/
  C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
 +F:    Documentation/devicetree/bindings/hwinfo/renesas,prr.yaml
 +F:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm64/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
@@@ -2700,7 -2668,6 +2700,7 @@@ B:      mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  F:    Documentation/arm/samsung/
  F:    Documentation/devicetree/bindings/arm/samsung/
 +F:    Documentation/devicetree/bindings/hwinfo/samsung,*
  F:    Documentation/devicetree/bindings/power/pd-samsung.yaml
  F:    Documentation/devicetree/bindings/soc/samsung/
  F:    arch/arm/boot/dts/exynos*
@@@ -2750,7 -2717,6 +2750,7 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/samsung,s5pv210-jpeg.yaml
  F:    drivers/media/platform/samsung/s5p-jpeg/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
@@@ -2770,7 -2736,6 +2770,7 @@@ Q:      http://patchwork.kernel.org/project/
  C:    irc://irc.libera.chat/renesas-soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
  F:    Documentation/devicetree/bindings/arm/renesas.yaml
 +F:    Documentation/devicetree/bindings/soc/renesas/
  F:    arch/arm/boot/dts/emev2*
  F:    arch/arm/boot/dts/gr-peach*
  F:    arch/arm/boot/dts/iwg20d-q7*
@@@ -2860,23 -2825,6 +2860,23 @@@ F:    drivers/clocksource/armv7m_systick.
  N:    stm32
  N:    stm
  
 +ARM/SUNPLUS SP7021 SOC SUPPORT
 +M:    Qin Jian <[email protected]>
 +L:    [email protected] (moderated for mon-subscribers)
 +S:    Maintained
 +W:    https://sunplus-tibbo.atlassian.net/wiki/spaces/doc/overview
 +F:    Documentation/devicetree/bindings/arm/sunplus,sp7021.yaml
 +F:    Documentation/devicetree/bindings/clock/sunplus,sp7021-clkc.yaml
 +F:    Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.yaml
 +F:    Documentation/devicetree/bindings/reset/sunplus,reset.yaml
 +F:    arch/arm/boot/dts/sunplus-sp7021*.dts*
 +F:    arch/arm/configs/sp7021_*defconfig
 +F:    arch/arm/mach-sunplus/
 +F:    drivers/irqchip/irq-sp7021-intc.c
 +F:    drivers/reset/reset-sunplus.c
 +F:    include/dt-bindings/clock/sunplus,sp7021-clkc.h
 +F:    include/dt-bindings/reset/sunplus,sp7021-reset.h
 +
  ARM/Synaptics SoC support
  M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -2953,7 -2901,6 +2953,7 @@@ M:      Tero Kristo <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/arm/ti/k3.yaml
 +F:    Documentation/devicetree/bindings/hwinfo/ti,k3-socinfo.yaml
  F:    arch/arm64/boot/dts/ti/Makefile
  F:    arch/arm64/boot/dts/ti/k3-*
  F:    include/dt-bindings/pinctrl/k3.h
@@@ -3192,13 -3139,6 +3192,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/media/aspeed-video.txt
  F:    drivers/media/platform/aspeed/
  
 +ASPEED USB UDC DRIVER
 +M:    Neal Liu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
 +F:    drivers/usb/gadget/udc/aspeed_udc.c
 +
  ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
  M:    Corentin Chary <[email protected]>
  L:    [email protected]
@@@ -3501,7 -3441,7 +3501,7 @@@ W:      https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/broadcom/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
 -M:    Lee Jones <lee.jones@linaro.org>
 +M:    Lee Jones <lee@kernel.org>
  M:    Daniel Thompson <[email protected]>
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
@@@ -3677,18 -3617,16 +3677,18 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:    drivers/iio/accel/bma400*
  
 -BPF (Safe dynamic programs and tools)
 +BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  M:    Andrii Nakryiko <[email protected]>
 -R:    Martin KaFai Lau <[email protected]>
 -R:    Song Liu <song[email protected]>
 +R:    Martin KaFai Lau <[email protected]>
 +R:    Song Liu <song@kernel.org>
  R:    Yonghong Song <[email protected]>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
 -L:    [email protected]
 +R:    Stanislav Fomichev <[email protected]>
 +R:    Hao Luo <[email protected]>
 +R:    Jiri Olsa <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://bpf.io/
@@@ -3720,9 -3658,12 +3720,9 @@@ F:     scripts/pahole-version.s
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
 -N:    bpf
 -K:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/arm/net/
@@@ -3731,6 -3672,7 +3731,6 @@@ BPF JIT for ARM6
  M:    Daniel Borkmann <[email protected]>
  M:    Alexei Starovoitov <[email protected]>
  M:    Zi Shen Lim <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/arm64/net/
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Johan Almbladh <[email protected]>
  M:    Paul Burton <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  BPF JIT for POWERPC (32-BIT AND 64-BIT)
  M:    Naveen N. Rao <[email protected]>
  M:    Michael Ellerman <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/powerpc/net/
  BPF JIT for RISC-V (32-bit)
  M:    Luke Nelson <[email protected]>
  M:    Xi Wang <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3765,6 -3711,7 +3765,6 @@@ X:      arch/riscv/net/bpf_jit_comp64.
  
  BPF JIT for RISC-V (64-bit)
  M:    Björn Töpel <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/riscv/net/
@@@ -3774,6 -3721,7 +3774,6 @@@ BPF JIT for S39
  M:    Ilya Leoshkevich <[email protected]>
  M:    Heiko Carstens <[email protected]>
  M:    Vasily Gorbik <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/s390/net/
@@@ -3781,12 -3729,14 +3781,12 @@@ X:   arch/s390/net/pnet.
  
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Odd Fixes
  F:    arch/x86/net/bpf_jit_comp32.c
  BPF JIT for X86 64-BIT
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
  
 -BPF LSM (Security Audit and Enforcement using BPF)
 +BPF [CORE]
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +R:    John Fastabend <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/verifier.c
 +F:    kernel/bpf/tnum.c
 +F:    kernel/bpf/core.c
 +F:    kernel/bpf/syscall.c
 +F:    kernel/bpf/dispatcher.c
 +F:    kernel/bpf/trampoline.c
 +F:    include/linux/bpf*
 +F:    include/linux/filter.h
 +
 +BPF [BTF]
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/btf.c
 +F:    include/linux/btf*
 +
 +BPF [TRACING]
 +M:    Song Liu <[email protected]>
 +R:    Jiri Olsa <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/trace/bpf_trace.c
 +F:    kernel/bpf/stackmap.c
 +
 +BPF [NETWORKING] (tc BPF, sock_addr)
 +M:    Martin KaFai Lau <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +R:    John Fastabend <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    net/core/filter.c
 +F:    net/sched/act_bpf.c
 +F:    net/sched/cls_bpf.c
 +
 +BPF [NETWORKING] (struct_ops, reuseport)
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/bpf_struct*
 +
 +BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
  M:    KP Singh <[email protected]>
  R:    Florent Revest <[email protected]>
  R:    Brendan Jackman <[email protected]>
@@@ -3858,27 -3761,7 +3858,27 @@@ F:    include/linux/bpf_lsm.
  F:    kernel/bpf/bpf_lsm.c
  F:    security/bpf/
  
 -BPF L7 FRAMEWORK
 +BPF [STORAGE & CGROUPS]
 +M:    Martin KaFai Lau <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/cgroup.c
 +F:    kernel/bpf/*storage.c
 +F:    kernel/bpf/bpf_lru*
 +
 +BPF [RINGBUF]
 +M:    Andrii Nakryiko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/ringbuf.c
 +
 +BPF [ITERATOR]
 +M:    Yonghong Song <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    kernel/bpf/*iter.c
 +
 +BPF [L7 FRAMEWORK] (sockmap)
  M:    John Fastabend <[email protected]>
  M:    Jakub Sitnicki <[email protected]>
  L:    [email protected]
@@@ -3891,31 -3774,13 +3891,31 @@@ F:   net/ipv4/tcp_bpf.
  F:    net/ipv4/udp_bpf.c
  F:    net/unix/unix_bpf.c
  
 -BPFTOOL
 +BPF [LIBRARY] (libbpf)
 +M:    Andrii Nakryiko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/lib/bpf/
 +
 +BPF [TOOLING] (bpftool)
  M:    Quentin Monnet <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/disasm.*
  F:    tools/bpf/bpftool/
  
 +BPF [SELFTESTS] (Test Runners & Infrastructure)
 +M:    Andrii Nakryiko <[email protected]>
 +R:    Mykola Lysenko <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    tools/testing/selftests/bpf/
 +
 +BPF [MISC]
 +L:    [email protected]
 +S:    Odd Fixes
 +K:    (?:\b|_)bpf(?:\b|_)
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -3937,28 -3802,15 +3937,28 @@@ BROADCOM BCMBCA ARM ARCHITECTUR
  M:    William Zhang <[email protected]>
  M:    Anand Gore <[email protected]>
  M:    Kursad Oney <[email protected]>
 +M:    Florian Fainelli <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
  F:    Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
 -F:    arch/arm/boot/dts/bcm47622.dtsi
 -F:    arch/arm/boot/dts/bcm947622.dts
 +F:    arch/arm64/boot/dts/broadcom/bcmbca/*
  N:    bcmbca
  N:    bcm[9]?47622
 +N:    bcm[9]?4912
 +N:    bcm[9]?63138
 +N:    bcm[9]?63146
 +N:    bcm[9]?63148
 +N:    bcm[9]?63158
 +N:    bcm[9]?63178
 +N:    bcm[9]?6756
 +N:    bcm[9]?6813
 +N:    bcm[9]?6846
 +N:    bcm[9]?6855
 +N:    bcm[9]?6856
 +N:    bcm[9]?6858
 +N:    bcm[9]?6878
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
@@@ -4034,6 -3886,14 +4034,6 @@@ S:     Maintaine
  F:    arch/arm/boot/dts/bcm47189*
  F:    arch/arm/boot/dts/bcm53573*
  
 -BROADCOM BCM63XX ARM ARCHITECTURE
 -M:    Florian Fainelli <[email protected]>
 -R:    Broadcom internal kernel review list <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://github.com/broadcom/stblinux.git
 -N:    bcm63xx
 -
  BROADCOM BCM63XX/BCM33XX UDC DRIVER
  M:    Kevin Cernekee <[email protected]>
  L:    [email protected]
@@@ -4440,7 -4300,7 +4440,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
 -F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
 +F:    Documentation/devicetree/bindings/interconnect/samsung,exynos-bus.yaml
  F:    drivers/devfreq/exynos-bus.c
  
  BUSLOGIC SCSI DRIVER
@@@ -4912,7 -4772,6 +4912,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
  F:    include/dt-bindings/sound/cs*
  F:    sound/pci/hda/cs*
 +F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
  
  CIRRUS LOGIC DSP FIRMWARE DRIVER
@@@ -5031,7 -4890,7 +5031,7 @@@ R:      Nick Desaulniers <ndesaulniers@googl
  L:    [email protected]
  S:    Supported
  B:    https://github.com/ClangBuiltLinux/linux/issues
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/clang/features
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/cfi.h
  F:    kernel/cfi.c
  
@@@ -5117,7 -4976,6 +5117,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  F:    Documentation/devicetree/bindings/clock/
  F:    drivers/clk/
 +F:    include/dt-bindings/clock/
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
  F:    include/linux/of_clk.h
@@@ -5168,7 -5026,7 +5168,7 @@@ COMPUTE EXPRESS LINK (CXL
  M:    Alison Schofield <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Ira Weiny <[email protected]>
 -M:    Ben Widawsky <b[email protected]>
 +M:    Ben Widawsky <b[email protected]>
  M:    Dan Williams <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -5198,7 -5056,6 +5198,7 @@@ F:      include/linux/console
  
  CONTEXT TRACKING
  M:    Frederic Weisbecker <[email protected]>
 +M:    "Paul E. McKenney" <[email protected]>
  S:    Maintained
  F:    kernel/context_tracking.c
  F:    include/linux/context_tracking*
@@@ -5274,10 -5131,10 +5274,10 @@@ F:   Documentation/hwmon/corsair-psu.rs
  F:    drivers/hwmon/corsair-psu.c
  
  COUNTER SUBSYSTEM
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git [email protected]:vilhelmgray/counter.git
 +T:    git https://git.linaro.org/people/william.gray/counter.git
  F:    Documentation/ABI/testing/sysfs-bus-counter
  F:    Documentation/driver-api/generic-counter.rst
  F:    drivers/counter/
@@@ -5521,7 -5378,7 +5521,7 @@@ W:      http://www.chelsio.co
  F:    drivers/net/ethernet/chelsio/cxgb3/
  
  CXGB3 ISCSI DRIVER (CXGB3I)
 -M:    Karen Xie <kxie@chelsio.com>
 +M:    Varun Prakash <varun@chelsio.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5553,7 -5410,7 +5553,7 @@@ W:      http://www.chelsio.co
  F:    drivers/net/ethernet/chelsio/cxgb4/
  
  CXGB4 ISCSI DRIVER (CXGB4I)
 -M:    Karen Xie <kxie@chelsio.com>
 +M:    Varun Prakash <varun@chelsio.com>
  L:    [email protected]
  S:    Supported
  W:    http://www.chelsio.com
@@@ -5669,7 -5526,7 +5669,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-damon
  F:    Documentation/admin-guide/mm/damon/
 -F:    Documentation/vm/damon/
 +F:    Documentation/mm/damon/
  F:    include/linux/damon.h
  F:    include/trace/events/damon.h
  F:    mm/damon/
@@@ -5924,7 -5781,6 +5924,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
  F:    Documentation/devicetree/bindings/devfreq/
 +F:    Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml
  F:    drivers/devfreq/
  F:    include/linux/devfreq.h
  F:    include/trace/events/devfreq.h
@@@ -5999,7 -5855,6 +5999,7 @@@ W:      http://www.dialog-semiconductor.com/
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/input/dlg,da72??.txt
  F:    Documentation/devicetree/bindings/mfd/da90*.txt
 +F:    Documentation/devicetree/bindings/mfd/da90*.yaml
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
  F:    Documentation/devicetree/bindings/regulator/slg51000.txt
@@@ -6038,7 -5893,7 +6038,7 @@@ F:      include/sound/da[79]*.
  F:    sound/soc/codecs/da[79]*.[ch]
  
  DIAMOND SYSTEMS GPIO-MM GPIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-gpio-mm.c
@@@ -6115,7 -5970,6 +6115,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/dma/
  F:    Documentation/driver-api/dmaengine/
  F:    drivers/dma/
 +F:    include/dt-bindings/dma/
  F:    include/linux/dma/
  F:    include/linux/dmaengine.h
  F:    include/linux/of_dma.h
@@@ -6124,6 -5978,7 +6124,6 @@@ DMA MAPPING HELPER
  M:    Christoph Hellwig <[email protected]>
  M:    Marek Szyprowski <[email protected]>
  R:    Robin Murphy <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -6136,6 -5991,7 +6136,6 @@@ F:      kernel/dma
  
  DMA MAPPING BENCHMARK
  M:    Xiang Chen <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  F:    kernel/dma/map_benchmark.c
  F:    tools/testing/selftests/dma/
@@@ -6286,6 -6142,14 +6286,6 @@@ F:     Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 -DPT_I2O SCSI RAID DRIVER
 -M:    Adaptec OEM Raid Solutions <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.adaptec.com/
 -F:    drivers/scsi/dpt*
 -F:    drivers/scsi/dpt/
 -
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
@@@ -6381,13 -6245,6 +6381,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
  F:    drivers/gpu/drm/bridge/chipone-icn6211.c
  
 +DRM DRIVER FOR EBBG FT8719 PANEL
 +M:    Joel Selvaraj <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/ebbg,ft8719.yaml
 +F:    drivers/gpu/drm/panel/panel-ebbg-ft8719.c
 +
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:    Linus Walleij <[email protected]>
  S:    Maintained
@@@ -6446,12 -6303,6 +6446,12 @@@ S:    Orphan / Obsolet
  F:    drivers/gpu/drm/i810/
  F:    include/uapi/drm/i810_drm.h
  
 +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER
 +M:    Paul Kocialkowski <[email protected]>
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/logicvc/
 +
  DRM DRIVER FOR LVDS PANELS
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -6628,17 -6479,12 +6628,17 @@@ S:   Orphan / Obsolet
  F:    drivers/gpu/drm/savage/
  F:    include/uapi/drm/savage_drm.h
  
 -DRM DRIVER FOR SIMPLE FRAMEBUFFERS
 +DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
  M:    Thomas Zimmermann <[email protected]>
 +M:    Javier Martinez Canillas <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/drm_aperture.c
  F:    drivers/gpu/drm/tiny/simpledrm.c
 +F:    drivers/video/aperture.c
 +F:    include/drm/drm_aperture.h
 +F:    include/linux/aperture.h
  
  DRM DRIVER FOR SIS VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -6676,12 -6522,6 +6676,12 @@@ DRM DRIVER FOR TDFX VIDEO CARD
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/tdfx/
  
 +DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
 +M:    Jagan Teki <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
 +F:    drivers/gpu/drm/bridge/ti-dlpc3433.c
 +
  DRM DRIVER FOR TI SN65DSI86 BRIDGE CHIP
  R:    Douglas Anderson <[email protected]>
  F:    Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml
@@@ -6811,6 -6651,7 +6811,6 @@@ F:      drivers/gpu/drm/bridge
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
 -M:    Joonyoung Shim <[email protected]>
  M:    Seung-Woo Kim <[email protected]>
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -6839,16 -6680,6 +6839,16 @@@ F:    Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/imx/
  F:    drivers/gpu/ipu-v3/
  
 +DRM DRIVERS FOR FREESCALE IMX BRIDGE
 +M:    Liu Ying <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-ldb.yaml
 +F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-combiner.yaml
 +F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pixel-link.yaml
 +F:    Documentation/devicetree/bindings/display/bridge/fsl,imx8qxp-pxl2dpi.yaml
 +F:    drivers/gpu/drm/bridge/imx/
 +
  DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
  M:    Patrik Jakobsson <[email protected]>
  L:    [email protected]
@@@ -6893,7 -6724,6 +6893,7 @@@ L:      [email protected] (
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
  F:    drivers/gpu/drm/mediatek/
 +F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
  F:    drivers/phy/mediatek/phy-mtk-mipi*
  
@@@ -6903,7 -6733,7 +6903,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/tegra/linux.git
 -F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
  F:    Documentation/devicetree/bindings/gpu/host1x/
  F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
@@@ -6980,7 -6810,6 +6980,7 @@@ F:      drivers/gpu/drm/omapdrm
  
  DRM DRIVERS FOR V3D
  M:    Emma Anholt <[email protected]>
 +M:    Melissa Wen <[email protected]>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
  S:    Maintained
  F:    drivers/net/ethernet/ibm/ehea/
  
 +ELM327 CAN NETWORK DRIVER
 +M:    Max Staudt <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/can/can327.rst
 +F:    drivers/net/can/can327.c
 +
  EM28XX VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -7509,7 -7331,7 +7509,7 @@@ F:      Documentation/admin-guide/media/em28
  F:    drivers/media/usb/em28xx/
  
  EMBEDDED LINUX
 -M:    Matt Mackall <mpm@selenic.com>
 +M:    Olivia Mackall <olivia@selenic.com>
  M:    David Woodhouse <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -7591,8 -7413,6 +7591,8 @@@ F:      include/video/s1d13xxxfb.
  EROFS FILE SYSTEM
  M:    Gao Xiang <[email protected]>
  M:    Chao Yu <[email protected]>
 +R:    Yue Hu <[email protected]>
 +R:    Jeffle Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
@@@ -7606,13 -7426,6 +7606,13 @@@ S:    Maintaine
  F:    include/linux/errseq.h
  F:    lib/errseq.c
  
 +ESD CAN/USB DRIVERS
 +M:    Frank Jungclaus <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/can/usb/esd_usb.c
 +
  ET131X NETWORK DRIVER
  M:    Mark Einon <[email protected]>
  S:    Odd Fixes
@@@ -7763,6 -7576,7 +7763,6 @@@ F:      drivers/gpu/drm/exynos/exynos_dp
  
  EXYNOS SYSMMU (IOMMU) driver
  M:    Marek Szyprowski <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/iommu/exynos-iommu.c
@@@ -7888,6 -7702,9 +7888,6 @@@ F:      include/linux/fs.
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
 -X:    fs/io-wq.c
 -X:    fs/io-wq.h
 -X:    fs/io_uring.c
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <[email protected]>
@@@ -7986,7 -7803,6 +7986,7 @@@ FORTIFY_SOURC
  M:    Kees Cook <[email protected]>
  L:    [email protected]
  S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    include/linux/fortify-string.h
  F:    lib/test_fortify/*
  F:    scripts/test_fortify.sh
@@@ -8019,21 -7835,6 +8019,21 @@@ F:    Documentation/fpga
  F:    drivers/fpga/
  F:    include/linux/fpga/
  
 +INTEL MAX10 BMC SECURE UPDATES
 +M:    Russ Weight <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
 +F:    drivers/fpga/intel-m10-bmc-sec-update.c
 +
 +MICROCHIP POLARFIRE FPGA DRIVERS
 +M:    Conor Dooley <[email protected]>
 +R:    Ivan Bornyakov <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
 +F:    drivers/fpga/microchip-spi.c
 +
  FPU EMULATOR
  M:    Bill Metzenthen <[email protected]>
  S:    Maintained
@@@ -8139,6 -7940,7 +8139,6 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/video/fbdev/imxfb.c
 -F:    include/linux/platform_data/video-imxfb.h
  
  FREESCALE IMX DDR PMU DRIVER
  M:    Frank Li <[email protected]>
@@@ -8443,7 -8245,6 +8443,7 @@@ GCC PLUGIN
  M:    Kees Cook <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
@@@ -8535,7 -8336,6 +8535,7 @@@ Q:      https://patchwork.kernel.org/project
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
  F:    Documentation/devicetree/bindings/phy/
  F:    drivers/phy/
 +F:    include/dt-bindings/phy/
  F:    include/linux/phy/
  
  GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
@@@ -8889,7 -8689,6 +8889,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 +F:    Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
  F:    Documentation/devicetree/bindings/media/rockchip-vpu.yaml
  F:    drivers/staging/media/hantro/
  
@@@ -8916,7 -8715,7 +8916,7 @@@ F:      include/trace/events/hwmon*.
  K:    (devm_)?hwmon_device_(un)?register(|_with_groups|_with_info)
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
 -M:    Matt Mackall <mpm@selenic.com>
 +M:    Olivia Mackall <olivia@selenic.com>
  M:    Herbert Xu <[email protected]>
  L:    [email protected]
  S:    Odd fixes
@@@ -9166,31 -8965,16 +9166,31 @@@ F:   Documentation/admin-guide/perf/hisi-
  F:    Documentation/admin-guide/perf/hisi-pmu.rst
  F:    drivers/perf/hisilicon
  
 -HISILICON QM AND ZIP Controller DRIVER
 +HISILICON HNS3 PMU DRIVER
 +M:    Guangbin Huang <[email protected]>
 +S:    Supported
 +F:    Documentation/admin-guide/perf/hns3-pmu.rst
 +F:    drivers/perf/hisilicon/hns3_pmu.c
 +
 +HISILICON QM DRIVER
 +M:    Weili Qian <[email protected]>
  M:    Zhou Wang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/ABI/testing/debugfs-hisi-zip
 +F:    drivers/crypto/hisilicon/Kconfig
 +F:    drivers/crypto/hisilicon/Makefile
  F:    drivers/crypto/hisilicon/qm.c
  F:    drivers/crypto/hisilicon/sgl.c
 -F:    drivers/crypto/hisilicon/zip/
  F:    include/linux/hisi_acc_qm.h
  
 +HISILICON ZIP Controller DRIVER
 +M:    Yang Shen <[email protected]>
 +M:    Zhou Wang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/debugfs-hisi-zip
 +F:    drivers/crypto/hisilicon/zip/
 +
  HISILICON ROCE DRIVER
  M:    Wenpeng Liang <[email protected]>
  M:    Weihang Li <[email protected]>
@@@ -9253,7 -9037,7 +9253,7 @@@ HMM - Heterogeneous Memory Managemen
  M:    Jérôme Glisse <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/vm/hmm.rst
 +F:    Documentation/mm/hmm.rst
  F:    include/linux/hmm*
  F:    lib/test_hmm*
  F:    mm/hmm*
@@@ -9351,8 -9135,8 +9351,8 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  F:    Documentation/admin-guide/mm/hugetlbpage.rst
 -F:    Documentation/vm/hugetlbfs_reserv.rst
 -F:    Documentation/vm/vmemmap_dedup.rst
 +F:    Documentation/mm/hugetlbfs_reserv.rst
 +F:    Documentation/mm/vmemmap_dedup.rst
  F:    fs/hugetlbfs/
  F:    include/linux/hugetlb.h
  F:    mm/hugetlb.c
@@@ -9418,7 -9202,6 +9418,7 @@@ S:      Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  F:    Documentation/ABI/testing/debugfs-hyperv
 +F:    Documentation/virt/hyperv
  F:    Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
  F:    arch/arm64/hyperv
  F:    arch/arm64/include/asm/hyperv-tlfs.h
@@@ -9764,7 -9547,6 +9764,7 @@@ F:      drivers/input/misc/ideapad_slidebar.
  
  IDMAPPED MOUNTS
  M:    Christian Brauner <[email protected]>
 +M:    Seth Forshee <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
@@@ -9857,7 -9639,6 +9857,7 @@@ F:      Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/iio/
  F:    drivers/iio/
  F:    drivers/staging/iio/
 +F:    include/dt-bindings/iio/
  F:    include/linux/iio/
  F:    tools/iio/
  
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
 +INTEL 8255 GPIO DRIVER
 +M:    William Breathitt Gray <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-i8255.c
 +F:    drivers/gpio/gpio-i8255.h
 +
  INTEL ASoC DRIVERS
  M:    Cezary Rojewski <[email protected]>
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
 -M:    Jie Yang <[email protected]>
 +M:    Peter Ujfalusi <[email protected]>
 +M:    Bard Liao <[email protected]>
 +M:    Ranjani Sridharan <[email protected]>
 +M:    Kai Vehmanen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/intel/
@@@ -10193,8 -9964,7 +10193,8 @@@ S:    Supporte
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  F:    drivers/dma/ioat*
  
 -INTEL IADX DRIVER
 +INTEL IDXD DRIVER
 +M:    Fenghua Yu <[email protected]>
  M:    Dave Jiang <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -10228,10 -9998,12 +10228,10 @@@ F: drivers/hid/intel-ish-hid
  INTEL IOMMU (VT-d)
  M:    David Woodhouse <[email protected]>
  M:    Lu Baolu <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  F:    drivers/iommu/intel/
 -F:    include/linux/intel-iommu.h
  F:    include/linux/intel-svm.h
  
  INTEL IOP-ADMA DMA DRIVER
@@@ -10387,7 -10159,7 +10387,7 @@@ F:   drivers/gpio/gpio-*cove.
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <[email protected]>
 -S:    Maintained
 +S:    Supported
  F:    drivers/mfd/intel_soc_pmic*
  F:    include/linux/mfd/intel_soc_pmic*
  
@@@ -10603,20 -10375,10 +10603,20 @@@ T:        git git://git.kernel.org/pub/scm/fs/
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
 -IOMMU DRIVERS
 +IOMMU DMA-API LAYER
 +M:    Robin Murphy <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 +F:    drivers/iommu/dma-iommu.c
 +F:    drivers/iommu/iova.c
 +F:    include/linux/dma-iommu.h
 +F:    include/linux/iova.h
 +
 +IOMMU SUBSYSTEM
  M:    Joerg Roedel <[email protected]>
  M:    Will Deacon <[email protected]>
 -L:    [email protected]
 +R:    Robin Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
  T:    git git://git.kernel.dk/liburing
 -F:    fs/io-wq.c
 -F:    fs/io-wq.h
 -F:    fs/io_uring.c
 +F:    io_uring/
  F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
  F:    tools/io_uring/
@@@ -10711,7 -10475,7 +10711,7 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/irqchip/
  
  ISA
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  S:    Maintained
  F:    Documentation/driver-api/isa.rst
  F:    drivers/base/isa.c
@@@ -11002,17 -10766,6 +11002,17 @@@ F: scripts/mk
  F:    scripts/mod/
  F:    scripts/package/
  
 +KERNEL HARDENING (not covered by other areas)
 +M:    Kees Cook <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
 +F:    include/linux/overflow.h
 +F:    include/linux/randomize_kstack.h
 +F:    mm/usercopy.c
 +K:    \b(add|choose)_random_kstack_offset\b
 +K:    \b__check_(object_size|heap_object)\b
 +
  KERNEL JANITORS
  L:    [email protected]
  S:    Odd Fixes
@@@ -11065,6 -10818,7 +11065,7 @@@ F:   fs/smbfs_common
  
  KERNEL UNIT TESTING FRAMEWORK (KUnit)
  M:    Brendan Higgins <[email protected]>
+ M:    David Gow <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11627,8 -11381,8 +11628,8 @@@ F:   drivers/macintosh
  
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Michael Ellerman <[email protected]>
 -R:    Benjamin Herrenschmidt <[email protected]>
 -R:    Paul Mackerras <[email protected]>
 +R:    Nicholas Piggin <[email protected]>
 +R:    Christophe Leroy <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -11823,7 -11577,7 +11824,7 @@@ F:   drivers/media/usb/dvb-usb-v2/lmedm04
  LOADPIN SECURITY MODULE
  M:    Kees Cook <[email protected]>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/admin-guide/LSM/LoadPin.rst
  F:    security/loadpin/
  
@@@ -12411,6 -12165,7 +12412,6 @@@ F:   Documentation/devicetree/bindings/*/
  F:    Documentation/devicetree/bindings/*/maxim,max77693.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77843.yaml
  F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 -F:    Documentation/devicetree/bindings/mfd/max77693.txt
  F:    drivers/*/*max77843.c
  F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
@@@ -12486,7 -12241,7 +12487,7 @@@ F:   drivers/net/ieee802154/mcr20a.
  F:    drivers/net/ieee802154/mcr20a.h
  
  MEASUREMENT COMPUTING CIO-DAC IIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/dac/cio-dac.c
@@@ -12727,7 -12482,6 +12728,7 @@@ F:   Documentation/driver-api/media
  F:    Documentation/userspace-api/media/
  F:    drivers/media/
  F:    drivers/staging/media/
 +F:    include/dt-bindings/media/
  F:    include/linux/platform_data/media/
  F:    include/media/
  F:    include/uapi/linux/dvb/
@@@ -12785,6 -12539,7 +12786,6 @@@ F:   drivers/i2c/busses/i2c-mt65xx.
  
  MEDIATEK IOMMU DRIVER
  M:    Yong Wu <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -12810,7 -12565,6 +12811,7 @@@ F:   drivers/media/platform/mediatek/vpu
  MEDIATEK MEDIA DRIVER
  M:    Tiffany Lin <[email protected]>
  M:    Andrew-CT Chen <[email protected]>
 +M:    Yunfei Dong <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/media/mediatek,vcodec*.yaml
  F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
 +F:    Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
  F:    drivers/net/dsa/microchip/*
  F:    include/linux/platform_data/microchip-ksz.h
  F:    net/dsa/tag_ksz.c
@@@ -13405,14 -13158,6 +13406,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:    drivers/mtd/nand/raw/atmel/*
  
 +MICROCHIP OTPC DRIVER
 +M:    Claudiu Beznea <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
 +F:    drivers/nvmem/microchip-otpc.c
 +F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
 +
  MICROCHIP PWM DRIVER
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -13489,12 -13234,6 +13490,12 @@@ F: drivers/scsi/smartpqi/smartpqi*.[ch
  F:    include/linux/cciss*.h
  F:    include/uapi/linux/cciss*.h
  
 +MICROSOFT SURFACE AGGREGATOR TABLET-MODE SWITCH
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/surface/surface_aggregator_tabletsw.c
 +
  MICROSOFT SURFACE BATTERY AND AC DRIVERS
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -13566,12 -13305,6 +13567,12 @@@ F: include/linux/surface_acpi_notify.
  F:    include/linux/surface_aggregator/
  F:    include/uapi/linux/surface_aggregator/
  
 +MICROSOFT SURFACE SYSTEM AGGREGATOR HUB DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/surface/surface_aggregator_hub.c
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <[email protected]>
  S:    Maintained
@@@ -13612,7 -13345,6 +13613,7 @@@ F:   Documentation/devicetree/bindings/mi
  F:    Documentation/mips/
  F:    arch/mips/
  F:    drivers/platform/mips/
 +F:    include/dt-bindings/mips/
  
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <[email protected]>
@@@ -13882,7 -13614,7 +13883,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/mt9v111.c
  
  MULTIFUNCTION DEVICES (MFD)
 -M:    Lee Jones <lee.jones@linaro.org>
 +M:    Lee Jones <lee@kernel.org>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  F:    Documentation/devicetree/bindings/mfd/
@@@ -14030,11 -13762,12 +14031,11 @@@ L:        [email protected]
  S:    Maintained
  F:    net/sched/sch_netem.c
  
 -NETERION 10GbE DRIVERS (s2io/vxge)
 +NETERION 10GbE DRIVERS (s2io)
  M:    Jon Mason <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/neterion/s2io.rst
 -F:    Documentation/networking/device_drivers/ethernet/neterion/vxge.rst
  F:    drivers/net/ethernet/neterion/
  
  NETFILTER
@@@ -14519,8 -14252,7 +14520,8 @@@ S:   Supporte
  W:    http://git.infradead.org/nvme.git
  T:    git://git.infradead.org/nvme.git
  F:    drivers/nvme/host/
 -F:    include/linux/nvme.h
 +F:    drivers/nvme/common/
 +F:    include/linux/nvme*
  F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS FC TRANSPORT DRIVERS
@@@ -14560,8 -14292,7 +14561,8 @@@ S:   Maintaine
  F:    drivers/net/phy/nxp-c45-tja11xx.c
  
  NXP FSPI DRIVER
 -M:    Ashish Kumar <[email protected]>
 +M:    Han Xu <[email protected]>
 +M:    Haibo Chen <[email protected]>
  R:    Yogesh Gaur <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14667,8 -14398,9 +14668,8 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
 -R:    Charles Gorand <[email protected]>
  L:    [email protected] (subscribers-only)
 -S:    Supported
 +S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
  
@@@ -15036,7 -14768,6 +15037,7 @@@ M:   Daniel Scally <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5693.yaml
  F:    drivers/media/i2c/ov5693.c
  
  OMNIVISION OV5695 SENSOR DRIVER
@@@ -15111,13 -14842,6 +15112,13 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/ov9734.c
  
 +ONBOARD USB HUB DRIVER
 +M:    Matthias Kaehlcke <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub
 +F:    drivers/usb/misc/onboard_usb_hub.c
 +
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
@@@ -15204,7 -14928,7 +15205,7 @@@ M:   Peter Korsgaard <[email protected]
  M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-ocores.txt
 +F:    Documentation/devicetree/bindings/i2c/opencores,i2c-ocores.yaml
  F:    Documentation/i2c/busses/i2c-ocores.rst
  F:    drivers/i2c/busses/i2c-ocores.c
  F:    include/linux/platform_data/i2c-ocores.h
@@@ -15349,7 -15073,7 +15350,7 @@@ M:   Pasha Tatashin <pasha.tatashin@solee
  M:    Andrew Morton <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/vm/page_table_check.rst
 +F:    Documentation/mm/page_table_check.rst
  F:    include/linux/page_table_check.h
  F:    mm/page_table_check.c
  
  S:    Maintained
  F:    drivers/pci/controller/dwc/*spear*
  
 +PCI DRIVER FOR XILINX VERSAL CPM
 +M:    Bharat Kumar Gogada <[email protected]>
 +M:    Michal Simek <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
 +F:    drivers/pci/controller/pcie-xilinx-cpm.c
 +
  PCMCIA SUBSYSTEM
  M:    Dominik Brodowski <[email protected]>
  S:    Odd Fixes
@@@ -16063,7 -15779,7 +16064,7 @@@ PIN CONTROLLER - FREESCAL
  M:    Dong Aisheng <[email protected]>
  M:    Fabio Estevam <[email protected]>
  M:    Shawn Guo <[email protected]>
 -M:    Stefan Agner <[email protected]>
 +M:    Jacky Bai <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -16073,7 -15789,7 +16074,7 @@@ F:   drivers/pinctrl/freescale
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
 -S:    Maintained
 +S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  F:    drivers/pinctrl/intel/
  
@@@ -16167,6 -15883,14 +16168,6 @@@ S:  Maintaine
  F:    Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:    drivers/iio/chemical/pms7003.c
  
 -PLATFORM FEATURE INFRASTRUCTURE
 -M:    Juergen Gross <[email protected]>
 -S:    Maintained
 -F:    arch/*/include/asm/platform-feature.h
 -F:    include/asm-generic/platform-feature.h
 -F:    include/linux/platform-feature.h
 -F:    kernel/platform-feature.c
 -
  PLDMFW LIBRARY
  M:    Jacob Keller <[email protected]>
  S:    Maintained
@@@ -16531,17 -16255,17 +16532,17 @@@ F:        drivers/media/rc/pwm-ir-tx.
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
  R:    Uwe Kleine-König <[email protected]>
 -M:    Lee Jones <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.ozlabs.org/project/linux-pwm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
 -F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.txt
 +F:    Documentation/devicetree/bindings/gpio/gpio-mvebu.yaml
  F:    Documentation/devicetree/bindings/pwm/
  F:    Documentation/driver-api/pwm.rst
  F:    drivers/gpio/gpio-mvebu.c
  F:    drivers/pwm/
  F:    drivers/video/backlight/pwm_bl.c
 +F:    include/dt-bindings/pwm/
  F:    include/linux/pwm.h
  F:    include/linux/pwm_backlight.h
  K:    pwm_(config|apply_state|ops)
@@@ -16587,12 -16311,9 +16588,12 @@@ F: drivers/crypto/qat
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
 -M:    Banajit Goswami <bgoswami@codeaurora.org>
 +M:    Banajit Goswami <bgoswami@quicinc.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    include/dt-bindings/sound/qcom,wcd9335.h
 +F:    sound/soc/codecs/lpass-rx-macro.*
 +F:    sound/soc/codecs/lpass-tx-macro.*
  F:    sound/soc/codecs/lpass-va-macro.c
  F:    sound/soc/codecs/lpass-wsa-macro.*
  F:    sound/soc/codecs/msm8916-wcd-analog.c
@@@ -16600,9 -16321,7 +16601,9 @@@ F:   sound/soc/codecs/msm8916-wcd-digital
  F:    sound/soc/codecs/wcd9335.*
  F:    sound/soc/codecs/wcd934x.c
  F:    sound/soc/codecs/wcd-clsh-v2.*
 +F:    sound/soc/codecs/wcd-mbhc-v2.*
  F:    sound/soc/codecs/wsa881x.c
 +F:    sound/soc/codecs/wsa883x.c
  F:    sound/soc/qcom/
  
  QCOM EMBEDDED USB DEBUGGER (EUD)
@@@ -16871,15 -16590,9 +16872,15 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/i2c/i2c-qcom-cci.txt
  F:    drivers/i2c/busses/i2c-qcom-cci.c
  
 +QUALCOMM INTERCONNECT BWMON DRIVER
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
 +F:    drivers/soc/qcom/icc-bwmon.c
 +
  QUALCOMM IOMMU
  M:    Rob Clark <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -17393,19 -17106,6 +17394,19 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
  F:    drivers/iio/adc/rzg2l_adc.c
  
 +RENESAS RZ/N1 A5PSW SWITCH DRIVER
 +M:    Clément Léger <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
 +F:    Documentation/devicetree/bindings/net/pcs/renesas,rzn1-miic.yaml
 +F:    drivers/net/dsa/rzn1_a5psw*
 +F:    drivers/net/pcs/pcs-rzn1-miic.c
 +F:    include/dt-bindings/net/pcs-rzn1-miic.h
 +F:    include/linux/pcs-rzn1-miic.h
 +F:    net/dsa/tag_rzn1_a5psw.c
 +
  RENESAS RZ/N1 RTC CONTROLLER DRIVER
  M:    Miquel Raynal <[email protected]>
  L:    [email protected]
@@@ -17504,18 -17204,13 +17505,18 @@@ N:        risc
  K:    riscv
  
  RISC-V/MICROCHIP POLARFIRE SOC SUPPORT
 -M:    Lewis Hanly <[email protected]>
  M:    Conor Dooley <[email protected]>
 +M:    Daire McNamara <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    arch/riscv/boot/dts/microchip/
 +F:    drivers/char/hw_random/mpfs-rng.c
 +F:    drivers/clk/microchip/clk-mpfs.c
  F:    drivers/mailbox/mailbox-mpfs.c
 +F:    drivers/pci/controller/pcie-microchip-host.c
  F:    drivers/soc/microchip/
 +F:    drivers/spi/spi-microchip-core.c
 +F:    drivers/usb/musb/mpfs.c
  F:    include/soc/microchip/mpfs.h
  
  RNBD BLOCK DRIVERS
@@@ -17807,7 -17502,7 +17808,7 @@@ M:   Jason Herne <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
 -F:    Documentation/s390/vfio-ap.rst
 +F:    Documentation/s390/vfio-ap*
  F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
@@@ -17827,7 -17522,6 +17828,7 @@@ M:   Eric Farman <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    arch/s390/kvm/pci*
  F:    drivers/vfio/pci/vfio_pci_zdev.c
  F:    include/uapi/linux/vfio_zdev.h
  
@@@ -18212,7 -17906,7 +18213,7 @@@ M:   Kees Cook <[email protected]
  R:    Andy Lutomirski <[email protected]>
  R:    Will Drewry <[email protected]>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/seccomp
  F:    Documentation/userspace-api/seccomp_filter.rst
  F:    include/linux/seccomp.h
  F:    include/uapi/linux/seccomp.h
@@@ -18283,13 -17977,12 +18284,13 @@@ S:        Supporte
  F:    Documentation/admin-guide/security-bugs.rst
  
  SECURITY SUBSYSTEM
 +M:    Paul Moore <[email protected]>
  M:    James Morris <[email protected]>
  M:    "Serge E. Hallyn" <[email protected]>
  L:    [email protected] (suggested Cc:)
  S:    Supported
  W:    http://kernsec.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
  F:    security/
  X:    security/selinux/
  
@@@ -18392,7 -18085,6 +18393,7 @@@ SFF/SFP/SFP+ MODULE SUPPOR
  M:    Russell King <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/sff,sfp.yaml
  F:    drivers/net/phy/phylink.c
  F:    drivers/net/phy/sfp*
  F:    include/linux/mdio/mdio-i2c.h
@@@ -18414,7 -18106,6 +18415,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Karsten Graul <[email protected]>
 +M:    Wenjia Zhang <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -18679,12 -18370,6 +18680,12 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    include/linux/sl?b*.h
  F:    mm/sl?b*
  
 +SLCAN CAN NETWORK DRIVER
 +M:    Dario Binacchi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/can/slcan/
 +
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
@@@ -18856,7 -18541,6 +18857,7 @@@ SOFTWARE RAID (Multiple Disks) SUPPOR
  M:    Song Liu <[email protected]>
  L:    [email protected]
  S:    Supported
 +Q:    https://patchwork.kernel.org/project/linux-raid/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
  F:    drivers/md/Kconfig
  F:    drivers/md/Makefile
@@@ -19054,10 -18738,8 +19055,10 @@@ F: sound/soc
  SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
  M:    Pierre-Louis Bossart <[email protected]>
  M:    Liam Girdwood <[email protected]>
 +M:    Peter Ujfalusi <[email protected]>
 +M:    Bard Liao <[email protected]>
  M:    Ranjani Sridharan <[email protected]>
 -M:    Kai Vehmanen <[email protected]>
 +R:    Kai Vehmanen <[email protected]>
  M:    Daniel Baluta <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -19146,7 -18828,7 +19147,7 @@@ F:   drivers/pinctrl/spear
  
  SPI NOR SUBSYSTEM
  M:    Tudor Ambarus <[email protected]>
 -M:    Pratyush Yadav <p[email protected]>
 +M:    Pratyush Yadav <p[email protected]>
  R:    Michael Walle <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -19306,7 -18988,6 +19307,7 @@@ F:   drivers/staging/olpc_dcon
  STAGING - REALTEK RTL8188EU DRIVERS
  M:    Larry Finger <[email protected]>
  M:    Phillip Potter <[email protected]>
 +R:    Pavel Skripkin <[email protected]>
  S:    Supported
  F:    drivers/staging/r8188eu/
  
@@@ -19537,6 -19218,7 +19538,6 @@@ F:   arch/x86/boot/video
  
  SWIOTLB SUBSYSTEM
  M:    Christoph Hellwig <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/users/hch/dma-mapping.git
@@@ -19699,7 -19381,7 +19700,7 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdhci-pci-dwc-mshc.c
  
  SYSTEM CONFIGURATION (SYSCON)
 -M:    Lee Jones <lee.jones@linaro.org>
 +M:    Lee Jones <lee@kernel.org>
  M:    Arnd Bergmann <[email protected]>
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
@@@ -20017,7 -19699,7 +20018,7 @@@ M:   Sowjanya Komatineni <skomatineni@nvi
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
 +F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml
  F:    drivers/staging/media/tegra-video/
  
  TEGRA XUSB PADCTL DRIVER
@@@ -20140,7 -19822,6 +20141,7 @@@ F:   Documentation/ABI/testing/sysfs-clas
  F:    Documentation/devicetree/bindings/thermal/
  F:    Documentation/driver-api/thermal/
  F:    drivers/thermal/
 +F:    include/dt-bindings/thermal/
  F:    include/linux/cpu_cooling.h
  F:    include/linux/thermal.h
  F:    include/uapi/linux/thermal.h
@@@ -20615,7 -20296,7 +20616,7 @@@ F:   tools/tracing/rtla
  
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    https://github.com/srcres258/linux-doc
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
@@@ -20735,13 -20416,6 +20736,13 @@@ F: Documentation/filesystems/ubifs-auth
  F:    Documentation/filesystems/ubifs.rst
  F:    fs/ubifs/
  
 +UBLK USERSPACE BLOCK DRIVER
 +M:    Ming Lei <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/block/ublk_drv.c
 +F:    include/uapi/linux/ublk_cmd.h
 +
  UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/ufs/host/ufs-mediatek*
  
 +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS
 +M:    Yoshihiro Shimoda <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ufs/host/ufs-renesas.c
 +
  UNSORTED BLOCK IMAGES (UBI)
  M:    Richard Weinberger <[email protected]>
  L:    [email protected]
@@@ -21277,6 -20944,7 +21278,7 @@@ M:   OGAWA Hirofumi <[email protected]
  S:    Maintained
  F:    Documentation/filesystems/vfat.rst
  F:    fs/fat/
+ F:    tools/testing/selftests/filesystems/fat/
  
  VFIO DRIVER
  M:    Alex Williamson <[email protected]>
@@@ -21452,7 -21120,6 +21454,7 @@@ M:   Jason Wang <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-vdpa
 +F:    Documentation/ABI/testing/sysfs-class-vduse
  F:    Documentation/devicetree/bindings/virtio/
  F:    drivers/block/virtio_blk.c
  F:    drivers/crypto/virtio/
@@@ -21633,10 -21300,12 +21635,10 @@@ M:        Martyn Welch <[email protected]
  M:    Manohar Vanga <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
  F:    drivers/staging/vme_user/
 -F:    drivers/vme/
 -F:    include/linux/vme*
  
  VM SOCKETS (AF_VSOCK)
  M:    Stefano Garzarella <[email protected]>
  S:    Maintained
  F:    drivers/input/tablet/wacom_serial4.c
  
 +WANGXUN ETHERNET DRIVER
 +M:    Jiawen Wu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/ethernet/wangxun/txgbe.rst
 +F:    drivers/net/ethernet/wangxun/
 +
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <[email protected]>
  M:    Guenter Roeck <[email protected]>
@@@ -21869,13 -21531,13 +21871,13 @@@ S:        Maintaine
  F:    drivers/media/rc/winbond-cir.c
  
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/watchdog/ebc-c384_wdt.c
  
  WINSYSTEMS WS16C48 GPIO DRIVER
 -M:    William Breathitt Gray <[email protected]>
 +M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-ws16c48.c
@@@ -22142,7 -21804,8 +22144,7 @@@ F:   include/uapi/linux/if_xdp.
  F:    include/uapi/linux/xdp_diag.h
  F:    include/net/netns/xdp.h
  F:    net/xdp/
 -F:    samples/bpf/xdpsock*
 -F:    tools/lib/bpf/xsk*
 +F:    tools/testing/selftests/bpf/*xsk*
  
  XEN BLOCK SUBSYSTEM
  M:    Roger Pau Monné <[email protected]>
@@@ -22232,6 -21895,7 +22234,6 @@@ XEN SWIOTLB SUBSYSTE
  M:    Juergen Gross <[email protected]>
  M:    Stefano Stabellini <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
@@@ -22382,7 -22046,7 +22384,7 @@@ F:   include/linux/yam.
  YAMA SECURITY MODULE
  M:    Kees Cook <[email protected]>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/admin-guide/LSM/Yama.rst
  F:    security/yama/
  
@@@ -22496,7 -22160,7 +22498,7 @@@ M:   Nitin Gupta <[email protected]
  R:    Sergey Senozhatsky <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/vm/zsmalloc.rst
 +F:    Documentation/mm/zsmalloc.rst
  F:    include/linux/zsmalloc.h
  F:    mm/zsmalloc.c
  
index 6b850c157a622e38cb21a4c965e7f4ecea0d44c4,c037c26540ddc6fc92cb2e0f336e723f7a2c5f6f..169703fead57668a8667ab483079f161546547d7
@@@ -35,7 -35,6 +35,7 @@@
  #include <linux/stackprotector.h>
  #include <linux/pgtable.h>
  #include <linux/clockchips.h>
 +#include <linux/kexec.h>
  
  #include <asm/ptrace.h>
  #include <linux/atomic.h>
@@@ -56,6 -55,7 +56,6 @@@
  #endif
  #include <asm/vdso.h>
  #include <asm/debug.h>
 -#include <asm/kexec.h>
  #include <asm/cpu_has_feature.h>
  #include <asm/ftrace.h>
  #include <asm/kup.h>
@@@ -619,6 -619,20 +619,6 @@@ void crash_send_ipi(void (*crash_ipi_ca
  }
  #endif
  
 -#ifdef CONFIG_NMI_IPI
 -static void crash_stop_this_cpu(struct pt_regs *regs)
 -#else
 -static void crash_stop_this_cpu(void *dummy)
 -#endif
 -{
 -      /*
 -       * Just busy wait here and avoid marking CPU as offline to ensure
 -       * register data is captured appropriately.
 -       */
 -      while (1)
 -              cpu_relax();
 -}
 -
  void crash_smp_send_stop(void)
  {
        static bool stopped = false;
  
        stopped = true;
  
 -#ifdef CONFIG_NMI_IPI
 -      smp_send_nmi_ipi(NMI_IPI_ALL_OTHERS, crash_stop_this_cpu, 1000000);
 -#else
 -      smp_call_function(crash_stop_this_cpu, NULL, 0);
 -#endif /* CONFIG_NMI_IPI */
 +#ifdef CONFIG_KEXEC_CORE
 +      if (kexec_crash_image) {
 +              crash_kexec_prepare();
 +              return;
 +      }
 +#endif
 +
 +      smp_send_stop();
  }
  
  #ifdef CONFIG_NMI_IPI
@@@ -1663,13 -1674,6 +1663,6 @@@ void start_secondary(void *unused
        BUG();
  }
  
- #ifdef CONFIG_PROFILING
- int setup_profiling_timer(unsigned int multiplier)
- {
-       return 0;
- }
- #endif
  static void __init fixup_topology(void)
  {
        int i;
diff --combined arch/riscv/kernel/smp.c
index 018e7dc45df6c64365cae27e9906bfc5c870baf1,441d0ceb80adbca8d091562532125966dd85c89e..760a64518c585e7409d557473ae5c5432f4c0cba
@@@ -47,7 -47,7 +47,7 @@@ static struct 
        unsigned long bits ____cacheline_aligned;
  } ipi_data[NR_CPUS] __cacheline_aligned;
  
 -int riscv_hartid_to_cpuid(int hartid)
 +int riscv_hartid_to_cpuid(unsigned long hartid)
  {
        int i;
  
@@@ -55,7 -55,7 +55,7 @@@
                if (cpuid_to_hartid_map(i) == hartid)
                        return i;
  
 -      pr_err("Couldn't find cpu id for hartid [%d]\n", hartid);
 +      pr_err("Couldn't find cpu id for hartid [%lu]\n", hartid);
        return -ENOENT;
  }
  
@@@ -64,12 -64,6 +64,6 @@@ bool arch_match_cpu_phys_id(int cpu, u6
        return phys_id == cpuid_to_hartid_map(cpu);
  }
  
- /* Unsupported */
- int setup_profiling_timer(unsigned int multiplier)
- {
-       return -EINVAL;
- }
  static void ipi_stop(void)
  {
        set_cpu_online(smp_processor_id(), false);
index a4347605ab005042306ef1ef43721352657fc91e,df764ceac2c85dfcec75d021977641d275d0c376..6d303d1d276c3751448f4d517f1e4b9316d189d8
@@@ -275,7 -275,7 +275,7 @@@ void native_apic_icr_write(u32 low, u3
        unsigned long flags;
  
        local_irq_save(flags);
 -      apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));
 +      apic_write(APIC_ICR2, SET_XAPIC_DEST_FIELD(id));
        apic_write(APIC_ICR, low);
        local_irq_restore(flags);
  }
@@@ -1115,11 -1115,6 +1115,6 @@@ DEFINE_IDTENTRY_SYSVEC(sysvec_apic_time
        set_irq_regs(old_regs);
  }
  
- int setup_profiling_timer(unsigned int multiplier)
- {
-       return -EINVAL;
- }
  /*
   * Local APIC start and shutdown
   */
diff --combined fs/squashfs/file.c
index 7f0904b203294c61281bc588011981ba56937818,7ff0b03cceab017f9f86c7fae3343363e388b98d..98e64fec75b77e09048757fc28ea04f2f81bf53c
@@@ -39,6 -39,7 +39,7 @@@
  #include "squashfs_fs_sb.h"
  #include "squashfs_fs_i.h"
  #include "squashfs.h"
+ #include "page_actor.h"
  
  /*
   * Locate cache slot in range [offset, index] for specified inode.  If
@@@ -454,7 -455,7 +455,7 @@@ static int squashfs_read_folio(struct f
        int expected = index == file_end ?
                        (i_size_read(inode) & (msblk->block_size - 1)) :
                         msblk->block_size;
 -      int res;
 +      int res = 0;
        void *pageaddr;
  
        TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n",
        if (index < file_end || squashfs_i(inode)->fragment_block ==
                                        SQUASHFS_INVALID_BLK) {
                u64 block = 0;
 -              int bsize = read_blocklist(inode, index, &block);
 -              if (bsize < 0)
 +
 +              res = read_blocklist(inode, index, &block);
 +              if (res < 0)
                        goto error_out;
  
 -              if (bsize == 0)
 +              if (res == 0)
                        res = squashfs_readpage_sparse(page, expected);
                else
 -                      res = squashfs_readpage_block(page, block, bsize, expected);
 +                      res = squashfs_readpage_block(page, block, res, expected);
        } else
                res = squashfs_readpage_fragment(page, expected);
  
        memset(pageaddr, 0, PAGE_SIZE);
        kunmap_atomic(pageaddr);
        flush_dcache_page(page);
 -      if (!PageError(page))
 +      if (res == 0)
                SetPageUptodate(page);
        unlock_page(page);
  
 -      return 0;
 +      return res;
  }
  
+ static int squashfs_readahead_fragment(struct page **page,
+       unsigned int pages, unsigned int expected)
+ {
+       struct inode *inode = page[0]->mapping->host;
+       struct squashfs_cache_entry *buffer = squashfs_get_fragment(inode->i_sb,
+               squashfs_i(inode)->fragment_block,
+               squashfs_i(inode)->fragment_size);
+       struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+       unsigned int n, mask = (1 << (msblk->block_log - PAGE_SHIFT)) - 1;
+       if (buffer->error)
+               goto out;
+       expected += squashfs_i(inode)->fragment_offset;
+       for (n = 0; n < pages; n++) {
+               unsigned int base = (page[n]->index & mask) << PAGE_SHIFT;
+               unsigned int offset = base + squashfs_i(inode)->fragment_offset;
+               if (expected > offset) {
+                       unsigned int avail = min_t(unsigned int, expected -
+                               offset, PAGE_SIZE);
+                       squashfs_fill_page(page[n], buffer, offset, avail);
+               }
+               unlock_page(page[n]);
+               put_page(page[n]);
+       }
+ out:
+       squashfs_cache_put(buffer);
+       return buffer->error;
+ }
+ static void squashfs_readahead(struct readahead_control *ractl)
+ {
+       struct inode *inode = ractl->mapping->host;
+       struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
+       size_t mask = (1UL << msblk->block_log) - 1;
+       unsigned short shift = msblk->block_log - PAGE_SHIFT;
+       loff_t start = readahead_pos(ractl) & ~mask;
+       size_t len = readahead_length(ractl) + readahead_pos(ractl) - start;
+       struct squashfs_page_actor *actor;
+       unsigned int nr_pages = 0;
+       struct page **pages;
+       int i, file_end = i_size_read(inode) >> msblk->block_log;
+       unsigned int max_pages = 1UL << shift;
+       readahead_expand(ractl, start, (len | mask) + 1);
+       pages = kmalloc_array(max_pages, sizeof(void *), GFP_KERNEL);
+       if (!pages)
+               return;
+       for (;;) {
+               pgoff_t index;
+               int res, bsize;
+               u64 block = 0;
+               unsigned int expected;
+               nr_pages = __readahead_batch(ractl, pages, max_pages);
+               if (!nr_pages)
+                       break;
+               if (readahead_pos(ractl) >= i_size_read(inode))
+                       goto skip_pages;
+               index = pages[0]->index >> shift;
+               if ((pages[nr_pages - 1]->index >> shift) != index)
+                       goto skip_pages;
+               expected = index == file_end ?
+                          (i_size_read(inode) & (msblk->block_size - 1)) :
+                           msblk->block_size;
+               if (index == file_end && squashfs_i(inode)->fragment_block !=
+                                               SQUASHFS_INVALID_BLK) {
+                       res = squashfs_readahead_fragment(pages, nr_pages,
+                                                         expected);
+                       if (res)
+                               goto skip_pages;
+                       continue;
+               }
+               bsize = read_blocklist(inode, index, &block);
+               if (bsize == 0)
+                       goto skip_pages;
+               actor = squashfs_page_actor_init_special(msblk, pages, nr_pages,
+                                                        expected);
+               if (!actor)
+                       goto skip_pages;
+               res = squashfs_read_data(inode->i_sb, block, bsize, NULL, actor);
+               kfree(actor);
+               if (res == expected) {
+                       int bytes;
+                       /* Last page (if present) may have trailing bytes not filled */
+                       bytes = res % PAGE_SIZE;
+                       if (pages[nr_pages - 1]->index == file_end && bytes)
+                               memzero_page(pages[nr_pages - 1], bytes,
+                                            PAGE_SIZE - bytes);
+                       for (i = 0; i < nr_pages; i++) {
+                               flush_dcache_page(pages[i]);
+                               SetPageUptodate(pages[i]);
+                       }
+               }
+               for (i = 0; i < nr_pages; i++) {
+                       unlock_page(pages[i]);
+                       put_page(pages[i]);
+               }
+       }
+       kfree(pages);
+       return;
+ skip_pages:
+       for (i = 0; i < nr_pages; i++) {
+               unlock_page(pages[i]);
+               put_page(pages[i]);
+       }
+       kfree(pages);
+ }
  
  const struct address_space_operations squashfs_aops = {
-       .read_folio = squashfs_read_folio
+       .read_folio = squashfs_read_folio,
+       .readahead = squashfs_readahead
  };
diff --combined include/linux/cpumask.h
index 4592d08459417d1072321665967a71cde7556c3f,523857884ae44035b3579126763f9796b48df555..7073873238621f482e33233d459d33aeb9cb46e8
@@@ -116,85 -116,6 +116,6 @@@ static __always_inline unsigned int cpu
        return cpu;
  }
  
- #if NR_CPUS == 1
- /* Uniprocessor.  Assume all masks are "1". */
- static inline unsigned int cpumask_first(const struct cpumask *srcp)
- {
-       return 0;
- }
- static inline unsigned int cpumask_first_zero(const struct cpumask *srcp)
- {
-       return 0;
- }
- static inline unsigned int cpumask_first_and(const struct cpumask *srcp1,
-                                            const struct cpumask *srcp2)
- {
-       return 0;
- }
- static inline unsigned int cpumask_last(const struct cpumask *srcp)
- {
-       return 0;
- }
- /* Valid inputs for n are -1 and 0. */
- static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
- {
-       return n+1;
- }
- static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
- {
-       return n+1;
- }
- static inline unsigned int cpumask_next_and(int n,
-                                           const struct cpumask *srcp,
-                                           const struct cpumask *andp)
- {
-       return n+1;
- }
- static inline unsigned int cpumask_next_wrap(int n, const struct cpumask *mask,
-                                            int start, bool wrap)
- {
-       /* cpu0 unless stop condition, wrap and at cpu0, then nr_cpumask_bits */
-       return (wrap && n == 0);
- }
- /* cpu must be a valid cpu, ie 0, so there's no other choice. */
- static inline unsigned int cpumask_any_but(const struct cpumask *mask,
-                                          unsigned int cpu)
- {
-       return 1;
- }
- static inline unsigned int cpumask_local_spread(unsigned int i, int node)
- {
-       return 0;
- }
- static inline int cpumask_any_and_distribute(const struct cpumask *src1p,
-                                            const struct cpumask *src2p) {
-       return cpumask_first_and(src1p, src2p);
- }
- static inline int cpumask_any_distribute(const struct cpumask *srcp)
- {
-       return cpumask_first(srcp);
- }
- #define for_each_cpu(cpu, mask)                       \
-       for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
- #define for_each_cpu_not(cpu, mask)           \
-       for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
- #define for_each_cpu_wrap(cpu, mask, start)   \
-       for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask, (void)(start))
- #define for_each_cpu_and(cpu, mask1, mask2)   \
-       for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask1, (void)mask2)
- #else
  /**
   * cpumask_first - get the first cpu in a cpumask
   * @srcp: the cpumask pointer
@@@ -260,10 -181,29 +181,29 @@@ static inline unsigned int cpumask_next
  
  int __pure cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
  int __pure cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
+ #if NR_CPUS == 1
+ /* Uniprocessor: there is only one valid CPU */
+ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
+ {
+       return 0;
+ }
+ static inline int cpumask_any_and_distribute(const struct cpumask *src1p,
+                                            const struct cpumask *src2p) {
+       return cpumask_first_and(src1p, src2p);
+ }
+ static inline int cpumask_any_distribute(const struct cpumask *srcp)
+ {
+       return cpumask_first(srcp);
+ }
+ #else
  unsigned int cpumask_local_spread(unsigned int i, int node);
  int cpumask_any_and_distribute(const struct cpumask *src1p,
                               const struct cpumask *src2p);
  int cpumask_any_distribute(const struct cpumask *srcp);
+ #endif /* NR_CPUS */
  
  /**
   * for_each_cpu - iterate over every cpu in a mask
                (cpu) = cpumask_next_zero((cpu), (mask)),       \
                (cpu) < nr_cpu_ids;)
  
extern int cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap);
int __pure cpumask_next_wrap(int n, const struct cpumask *mask, int start, bool wrap);
  
  /**
   * for_each_cpu_wrap - iterate over every cpu in a mask, starting at a specified location
        for ((cpu) = -1;                                                \
                (cpu) = cpumask_next_and((cpu), (mask1), (mask2)),      \
                (cpu) < nr_cpu_ids;)
- #endif /* SMP */
  
  #define CPU_BITS_NONE                                         \
  {                                                             \
@@@ -811,9 -750,16 +750,16 @@@ extern const DECLARE_BITMAP(cpu_all_bit
  /* First bits of cpu_bit_bitmap are in fact unset. */
  #define cpu_none_mask to_cpumask(cpu_bit_bitmap[0])
  
+ #if NR_CPUS == 1
+ /* Uniprocessor: the possible/online/present masks are always "1" */
+ #define for_each_possible_cpu(cpu)    for ((cpu) = 0; (cpu) < 1; (cpu)++)
+ #define for_each_online_cpu(cpu)      for ((cpu) = 0; (cpu) < 1; (cpu)++)
+ #define for_each_present_cpu(cpu)     for ((cpu) = 0; (cpu) < 1; (cpu)++)
+ #else
  #define for_each_possible_cpu(cpu) for_each_cpu((cpu), cpu_possible_mask)
  #define for_each_online_cpu(cpu)   for_each_cpu((cpu), cpu_online_mask)
  #define for_each_present_cpu(cpu)  for_each_cpu((cpu), cpu_present_mask)
+ #endif
  
  /* Wrappers for arch boot code to manipulate normally-constant masks */
  void init_cpu_present(const struct cpumask *src);
@@@ -1071,22 -1017,4 +1017,22 @@@ cpumap_print_list_to_buf(char *buf, con
        [0] =  1UL                                                      \
  } }
  
 +/*
 + * Provide a valid theoretical max size for cpumap and cpulist sysfs files
 + * to avoid breaking userspace which may allocate a buffer based on the size
 + * reported by e.g. fstat.
 + *
 + * for cpumap NR_CPUS * 9/32 - 1 should be an exact length.
 + *
 + * For cpulist 7 is (ceil(log10(NR_CPUS)) + 1) allowing for NR_CPUS to be up
 + * to 2 orders of magnitude larger than 8192. And then we divide by 2 to
 + * cover a worst-case of every other cpu being on one of two nodes for a
 + * very large NR_CPUS.
 + *
 + *  Use PAGE_SIZE as a minimum for smaller configurations.
 + */
 +#define CPUMAP_FILE_MAX_BYTES  ((((NR_CPUS * 9)/32 - 1) > PAGE_SIZE) \
 +                                      ? (NR_CPUS * 9)/32 - 1 : PAGE_SIZE)
 +#define CPULIST_FILE_MAX_BYTES  (((NR_CPUS * 7)/2 > PAGE_SIZE) ? (NR_CPUS * 7)/2 : PAGE_SIZE)
 +
  #endif /* __LINUX_CPUMASK_H */
diff --combined include/linux/net.h
index a03485e8cbb2d89a897b3063367589a62f41d478,8613772a1f580e0a1881a6fbece7927f3110c767..711c3593c3b8d34513f80d7cdb42b5ce6e8f3c7e
@@@ -152,8 -152,6 +152,8 @@@ struct module
  struct sk_buff;
  typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *,
                               unsigned int, size_t);
 +typedef int (*skb_read_actor_t)(struct sock *, struct sk_buff *);
 +
  
  struct proto_ops {
        int             family;
         */
        int             (*read_sock)(struct sock *sk, read_descriptor_t *desc,
                                     sk_read_actor_t recv_actor);
 +      /* This is different from read_sock(), it reads an entire skb at a time. */
 +      int             (*read_skb)(struct sock *sk, skb_read_actor_t recv_actor);
        int             (*sendpage_locked)(struct sock *sk, struct page *page,
                                           int offset, size_t size, int flags);
        int             (*sendmsg_locked)(struct sock *sk, struct msghdr *msg,
@@@ -307,8 -303,6 +307,6 @@@ do {                                                                       
  
  #define net_get_random_once(buf, nbytes)                      \
        get_random_once((buf), (nbytes))
- #define net_get_random_once_wait(buf, nbytes)                 \
-       get_random_once_wait((buf), (nbytes))
  
  /*
   * E.g. XFS meta- & log-data is in slab pages, or bcache meta
diff --combined kernel/kallsyms.c
index 79a85834ce9d4a93bdfc70757f6b015588a0f3f5,510fba0ba5b4a52e680ab94dbe18d4918b2ad3a3..3e7e2c2ad2f75ef603c32750e94c7afe5fdef994
  #include <linux/module.h>
  #include <linux/kernel.h>
  #include <linux/bsearch.h>
 +#include <linux/btf_ids.h>
  
- /*
-  * These will be re-linked against their real values
-  * during the second link stage.
-  */
- extern const unsigned long kallsyms_addresses[] __weak;
- extern const int kallsyms_offsets[] __weak;
- extern const u8 kallsyms_names[] __weak;
- /*
-  * Tell the compiler that the count isn't in the small data section if the arch
-  * has one (eg: FRV).
-  */
- extern const unsigned int kallsyms_num_syms
- __section(".rodata") __attribute__((weak));
- extern const unsigned long kallsyms_relative_base
- __section(".rodata") __attribute__((weak));
- extern const char kallsyms_token_table[] __weak;
- extern const u16 kallsyms_token_index[] __weak;
- extern const unsigned int kallsyms_markers[] __weak;
+ #include "kallsyms_internal.h"
  
  /*
   * Expand a compressed symbol data into the resulting uncompressed string,
@@@ -800,96 -778,6 +779,96 @@@ static const struct seq_operations kall
        .show = s_show
  };
  
 +#ifdef CONFIG_BPF_SYSCALL
 +
 +struct bpf_iter__ksym {
 +      __bpf_md_ptr(struct bpf_iter_meta *, meta);
 +      __bpf_md_ptr(struct kallsym_iter *, ksym);
 +};
 +
 +static int ksym_prog_seq_show(struct seq_file *m, bool in_stop)
 +{
 +      struct bpf_iter__ksym ctx;
 +      struct bpf_iter_meta meta;
 +      struct bpf_prog *prog;
 +
 +      meta.seq = m;
 +      prog = bpf_iter_get_info(&meta, in_stop);
 +      if (!prog)
 +              return 0;
 +
 +      ctx.meta = &meta;
 +      ctx.ksym = m ? m->private : NULL;
 +      return bpf_iter_run_prog(prog, &ctx);
 +}
 +
 +static int bpf_iter_ksym_seq_show(struct seq_file *m, void *p)
 +{
 +      return ksym_prog_seq_show(m, false);
 +}
 +
 +static void bpf_iter_ksym_seq_stop(struct seq_file *m, void *p)
 +{
 +      if (!p)
 +              (void) ksym_prog_seq_show(m, true);
 +      else
 +              s_stop(m, p);
 +}
 +
 +static const struct seq_operations bpf_iter_ksym_ops = {
 +      .start = s_start,
 +      .next = s_next,
 +      .stop = bpf_iter_ksym_seq_stop,
 +      .show = bpf_iter_ksym_seq_show,
 +};
 +
 +static int bpf_iter_ksym_init(void *priv_data, struct bpf_iter_aux_info *aux)
 +{
 +      struct kallsym_iter *iter = priv_data;
 +
 +      reset_iter(iter, 0);
 +
 +      /* cache here as in kallsyms_open() case; use current process
 +       * credentials to tell BPF iterators if values should be shown.
 +       */
 +      iter->show_value = kallsyms_show_value(current_cred());
 +
 +      return 0;
 +}
 +
 +DEFINE_BPF_ITER_FUNC(ksym, struct bpf_iter_meta *meta, struct kallsym_iter *ksym)
 +
 +static const struct bpf_iter_seq_info ksym_iter_seq_info = {
 +      .seq_ops                = &bpf_iter_ksym_ops,
 +      .init_seq_private       = bpf_iter_ksym_init,
 +      .fini_seq_private       = NULL,
 +      .seq_priv_size          = sizeof(struct kallsym_iter),
 +};
 +
 +static struct bpf_iter_reg ksym_iter_reg_info = {
 +      .target                 = "ksym",
 +      .feature                = BPF_ITER_RESCHED,
 +      .ctx_arg_info_size      = 1,
 +      .ctx_arg_info           = {
 +              { offsetof(struct bpf_iter__ksym, ksym),
 +                PTR_TO_BTF_ID_OR_NULL },
 +      },
 +      .seq_info               = &ksym_iter_seq_info,
 +};
 +
 +BTF_ID_LIST(btf_ksym_iter_id)
 +BTF_ID(struct, kallsym_iter)
 +
 +static int __init bpf_ksym_iter_register(void)
 +{
 +      ksym_iter_reg_info.ctx_arg_info[0].btf_id = *btf_ksym_iter_id;
 +      return bpf_iter_reg_target(&ksym_iter_reg_info);
 +}
 +
 +late_initcall(bpf_ksym_iter_register);
 +
 +#endif /* CONFIG_BPF_SYSCALL */
 +
  static inline int kallsyms_for_perf(void)
  {
  #ifdef CONFIG_PERF_EVENTS
diff --combined kernel/kexec_file.c
index a7b411c22f19cdbc99ba60eb3c1447039eabf9c0,9b2839775c837ba55199fa9c8526fde67b04c8ca..1d546dc97c5023a9aa148277acd45ba026609c22
  #include <linux/vmalloc.h>
  #include "kexec_internal.h"
  
 +#ifdef CONFIG_KEXEC_SIG
 +static bool sig_enforce = IS_ENABLED(CONFIG_KEXEC_SIG_FORCE);
 +
 +void set_kexec_sig_enforced(void)
 +{
 +      sig_enforce = true;
 +}
 +#endif
 +
  static int kexec_calculate_store_digests(struct kimage *image);
  
+ /* Maximum size in bytes for kernel/initrd files. */
+ #define KEXEC_FILE_SIZE_MAX   min_t(s64, 4LL << 30, SSIZE_MAX)
  /*
   * Currently this is the only default function that is exported as some
   * architectures need it to do additional handlings.
@@@ -62,7 -56,14 +65,7 @@@ int kexec_image_probe_default(struct ki
        return ret;
  }
  
 -/* Architectures can provide this probe function */
 -int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
 -                                       unsigned long buf_len)
 -{
 -      return kexec_image_probe_default(image, buf, buf_len);
 -}
 -
 -static void *kexec_image_load_default(struct kimage *image)
 +void *kexec_image_load_default(struct kimage *image)
  {
        if (!image->fops || !image->fops->load)
                return ERR_PTR(-ENOEXEC);
                                 image->cmdline_buf_len);
  }
  
 -void * __weak arch_kexec_kernel_image_load(struct kimage *image)
 -{
 -      return kexec_image_load_default(image);
 -}
 -
  int kexec_image_post_load_cleanup_default(struct kimage *image)
  {
        if (!image->fops || !image->fops->cleanup)
        return image->fops->cleanup(image->image_loader_data);
  }
  
 -int __weak arch_kimage_file_post_load_cleanup(struct kimage *image)
 -{
 -      return kexec_image_post_load_cleanup_default(image);
 -}
 -
 -#ifdef CONFIG_KEXEC_SIG
 -static int kexec_image_verify_sig_default(struct kimage *image, void *buf,
 -                                        unsigned long buf_len)
 -{
 -      if (!image->fops || !image->fops->verify_sig) {
 -              pr_debug("kernel loader does not support signature verification.\n");
 -              return -EKEYREJECTED;
 -      }
 -
 -      return image->fops->verify_sig(buf, buf_len);
 -}
 -
 -int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf,
 -                                      unsigned long buf_len)
 -{
 -      return kexec_image_verify_sig_default(image, buf, buf_len);
 -}
 -#endif
 -
  /*
   * Free up memory used by kernel, initrd, and command line. This is temporary
   * memory allocation which is not needed any more after these buffers have
@@@ -123,44 -153,16 +126,44 @@@ void kimage_file_post_load_cleanup(stru
  }
  
  #ifdef CONFIG_KEXEC_SIG
 +#ifdef CONFIG_SIGNED_PE_FILE_VERIFICATION
 +int kexec_kernel_verify_pe_sig(const char *kernel, unsigned long kernel_len)
 +{
 +      int ret;
 +
 +      ret = verify_pefile_signature(kernel, kernel_len,
 +                                    VERIFY_USE_SECONDARY_KEYRING,
 +                                    VERIFYING_KEXEC_PE_SIGNATURE);
 +      if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) {
 +              ret = verify_pefile_signature(kernel, kernel_len,
 +                                            VERIFY_USE_PLATFORM_KEYRING,
 +                                            VERIFYING_KEXEC_PE_SIGNATURE);
 +      }
 +      return ret;
 +}
 +#endif
 +
 +static int kexec_image_verify_sig(struct kimage *image, void *buf,
 +                                unsigned long buf_len)
 +{
 +      if (!image->fops || !image->fops->verify_sig) {
 +              pr_debug("kernel loader does not support signature verification.\n");
 +              return -EKEYREJECTED;
 +      }
 +
 +      return image->fops->verify_sig(buf, buf_len);
 +}
 +
  static int
  kimage_validate_signature(struct kimage *image)
  {
        int ret;
  
 -      ret = arch_kexec_kernel_verify_sig(image, image->kernel_buf,
 -                                         image->kernel_buf_len);
 +      ret = kexec_image_verify_sig(image, image->kernel_buf,
 +                                   image->kernel_buf_len);
        if (ret) {
  
 -              if (IS_ENABLED(CONFIG_KEXEC_SIG_FORCE)) {
 +              if (sig_enforce) {
                        pr_notice("Enforced kernel signature verification failed (%d).\n", ret);
                        return ret;
                }
@@@ -190,11 -192,12 +193,12 @@@ kimage_file_prepare_segments(struct kim
                             const char __user *cmdline_ptr,
                             unsigned long cmdline_len, unsigned flags)
  {
-       int ret;
+       ssize_t ret;
        void *ldata;
  
        ret = kernel_read_file_from_fd(kernel_fd, 0, &image->kernel_buf,
-                                      INT_MAX, NULL, READING_KEXEC_IMAGE);
+                                      KEXEC_FILE_SIZE_MAX, NULL,
+                                      READING_KEXEC_IMAGE);
        if (ret < 0)
                return ret;
        image->kernel_buf_len = ret;
        /* It is possible that there no initramfs is being loaded */
        if (!(flags & KEXEC_FILE_NO_INITRAMFS)) {
                ret = kernel_read_file_from_fd(initrd_fd, 0, &image->initrd_buf,
-                                              INT_MAX, NULL,
+                                              KEXEC_FILE_SIZE_MAX, NULL,
                                               READING_KEXEC_INITRAMFS);
                if (ret < 0)
                        goto out;
@@@ -613,6 -616,19 +617,6 @@@ int kexec_locate_mem_hole(struct kexec_
        return ret == 1 ? 0 : -EADDRNOTAVAIL;
  }
  
 -/**
 - * arch_kexec_locate_mem_hole - Find free memory to place the segments.
 - * @kbuf:                       Parameters for the memory search.
 - *
 - * On success, kbuf->mem will have the start address of the memory region found.
 - *
 - * Return: 0 on success, negative errno on error.
 - */
 -int __weak arch_kexec_locate_mem_hole(struct kexec_buf *kbuf)
 -{
 -      return kexec_locate_mem_hole(kbuf);
 -}
 -
  /**
   * kexec_add_buffer - place a buffer in a kexec segment
   * @kbuf:     Buffer contents and memory parameters.
diff --combined lib/Kconfig
index 55c27e1ec9cbff85ab14a21b48bb35906cdbc7e4,986ea474836c3ab33a628be5341935d591b859e0..dc1ab2ed1dc6e7d19b9aa492081da04d6a40fee2
@@@ -118,13 -118,6 +118,13 @@@ config INDIRECT_IOMEM_FALLBAC
          mmio accesses when the IO memory address is not a registered
          emulated region.
  
 +config TRACE_MMIO_ACCESS
 +      bool "Register read/write tracing"
 +      depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS
 +      help
 +        Create tracepoints for MMIO read/write operations. These trace events
 +        can be used for logging all MMIO read/write operations.
 +
  source "lib/crypto/Kconfig"
  
  config LIB_MEMNEQ
@@@ -692,15 -685,6 +692,6 @@@ config STACKDEPOT_ALWAYS_INI
        bool
        select STACKDEPOT
  
- config STACK_HASH_ORDER
-       int "stack depot hash size (12 => 4KB, 20 => 1024KB)"
-       range 12 20
-       default 20
-       depends on STACKDEPOT
-       help
-        Select the hash size as a power of 2 for the stackdepot hash table.
-        Choose a lower value to reduce the memory impact.
  config REF_TRACKER
        bool
        depends on STACKTRACE_SUPPORT
diff --combined lib/Kconfig.debug
index 403071ff0bcfb5b9df4a0134ce3e855fce8e5965,04aaa20d50f9823fa9b7567b4a1f5fe12fdd33b9..072e4b289c13e2b312000092b59e12868c7cf301
@@@ -498,7 -498,7 +498,7 @@@ config STACK_VALIDATIO
          runtime stack traces are more reliable.
  
          For more information, see
 -        tools/objtool/Documentation/stack-validation.txt.
 +        tools/objtool/Documentation/objtool.txt.
  
  config NOINSTR_VALIDATION
        bool
@@@ -699,14 -699,6 +699,14 @@@ config DEBUG_OBJECTS_ENABLE_DEFAUL
        help
          Debug objects boot parameter default value
  
 +config SHRINKER_DEBUG
 +      bool "Enable shrinker debugging support"
 +      depends on DEBUG_FS
 +      help
 +        Say Y to enable the shrinker debugfs interface which provides
 +        visibility into the kernel memory shrinkers subsystem.
 +        Disable it to avoid an extra memory footprint.
 +
  config HAVE_DEBUG_KMEMLEAK
        bool
  
@@@ -1568,7 -1560,7 +1568,7 @@@ config DEBUG_KOBJECT_RELEAS
        help
          kobjects are reference counted objects.  This means that their
          last reference count put is not predictable, and the kobject can
 -        live on past the point at which a driver decides to drop it's
 +        live on past the point at which a driver decides to drop its
          initial reference to the kobject gained on allocation.  An
          example of this would be a struct device which has just been
          unregistered.
@@@ -2029,6 -2021,15 +2029,15 @@@ config LKDT
        Documentation on how to use the module can be found in
        Documentation/fault-injection/provoke-crashes.rst
  
+ config TEST_CPUMASK
+       tristate "cpumask tests" if !KUNIT_ALL_TESTS
+       depends on KUNIT
+       default KUNIT_ALL_TESTS
+       help
+         Enable to turn on cpumask tests, running at boot or module load time.
+         If unsure, say N.
  config TEST_LIST_SORT
        tristate "Linked list sorting test" if !KUNIT_ALL_TESTS
        depends on KUNIT
diff --combined lib/Makefile
index 0eb8114600c1647447350562cbb1a86fb87713d6,de3e47453fe8ebde6e96412c4537a6ce97ad0d33..17e48da223e28322ecf9d8e6c19a7713f395ba38
@@@ -29,15 -29,14 +29,14 @@@ endi
  
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
         rbtree.o radix-tree.o timerqueue.o xarray.o \
 -       idr.o extable.o sha1.o irq_regs.o argv_split.o \
 +       idr.o extable.o irq_regs.o argv_split.o \
         flex_proportions.o ratelimit.o show_mem.o \
         is_single_threaded.o plist.o decompress.o kobject_uevent.o \
         earlycpio.o seq_buf.o siphash.o dec_and_lock.o \
         nmi_backtrace.o nodemask.o win_minmax.o memcat_p.o \
-        buildid.o
+        buildid.o cpumask.o
  
  lib-$(CONFIG_PRINTK) += dump_stack.o
- lib-$(CONFIG_SMP) += cpumask.o
  
  lib-y += kobject.o klist.o
  obj-y += lockref.o
@@@ -46,7 -45,7 +45,7 @@@ obj-y += bcd.o sort.o parser.o debug_lo
         bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
         list_sort.o uuid.o iov_iter.o clz_ctz.o \
         bsearch.o find_bit.o llist.o memweight.o kfifo.o \
 -       percpu-refcount.o rhashtable.o \
 +       percpu-refcount.o rhashtable.o base64.o \
         once.o refcount.o usercopy.o errseq.o bucket_locks.o \
         generic-radix-tree.o
  obj-$(CONFIG_STRING_SELFTEST) += test_string.o
@@@ -100,6 -99,7 +99,7 @@@ obj-$(CONFIG_TEST_HMM) += test_hmm.
  obj-$(CONFIG_TEST_FREE_PAGES) += test_free_pages.o
  obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
  obj-$(CONFIG_TEST_REF_TRACKER) += test_ref_tracker.o
+ obj-$(CONFIG_TEST_CPUMASK) += test_cpumask.o
  CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
  obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
  #
@@@ -151,8 -151,6 +151,8 @@@ lib-y += logic_pio.
  
  lib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o
  
 +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o
 +
  obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
  
  obj-$(CONFIG_BTREE) += btree.o
index 5047d8eef53ee0250ed627ecea704aa0576e293e,67668a9fa115ed9666318934ee8fba1bc5dc50f8..10b34bb03bc1b8af48c4c056e609154ce2b14a23
@@@ -17,6 -17,7 +17,7 @@@ TARGETS += exe
  TARGETS += filesystems
  TARGETS += filesystems/binderfs
  TARGETS += filesystems/epoll
+ TARGETS += filesystems/fat
  TARGETS += firmware
  TARGETS += fpu
  TARGETS += ftrace
@@@ -143,6 -144,7 +144,6 @@@ endi
  # Prepare for headers install
  include $(top_srcdir)/scripts/subarch.include
  ARCH           ?= $(SUBARCH)
 -export KSFT_KHDR_INSTALL_DONE := 1
  export BUILD
  export KHDR_INCLUDES
  
  # all isn't the first target in the file.
  .DEFAULT_GOAL := all
  
 -# Install headers here once for all tests. KSFT_KHDR_INSTALL_DONE
 -# is used to avoid running headers_install from lib.mk.
 -# Invoke headers install with --no-builtin-rules to avoid circular
 -# dependency in "make kselftest" case. In this case, second level
 -# make inherits builtin-rules which will use the rule generate
 -# Makefile.o and runs into
 -# "Circular Makefile.o <- prepare dependency dropped."
 -# and headers_install fails and test compile fails.
 -#
 -# O= KBUILD_OUTPUT cases don't run into this error, since main Makefile
 -# invokes them as sub-makes and --no-builtin-rules is not necessary,
 -# but doesn't cause any failures. Keep it simple and use the same
 -# flags in both cases.
 -# Local build cases: "make kselftest", "make -C" - headers are installed
 -# in the default INSTALL_HDR_PATH usr/include.
 -khdr:
 -ifeq (1,$(DEFAULT_INSTALL_HDR_PATH))
 -      $(MAKE) --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
 -else
 -      $(MAKE) --no-builtin-rules INSTALL_HDR_PATH=$(abs_objtree)/usr \
 -              ARCH=$(ARCH) -C $(top_srcdir) headers_install
 -endif
 -
 -all: khdr
 +all:
        @ret=1;                                                 \
        for TARGET in $(TARGETS); do                            \
                BUILD_TARGET=$$BUILD/$$TARGET;                  \
@@@ -229,7 -254,7 +230,7 @@@ ifdef INSTALL_PAT
        for TARGET in $(TARGETS); do \
                BUILD_TARGET=$$BUILD/$$TARGET;  \
                [ ! -d $(INSTALL_PATH)/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \
 -              echo -n "Emit Tests for $$TARGET\n"; \
 +              echo -ne "Emit Tests for $$TARGET\n"; \
                $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \
                        -C $$TARGET emit_tests >> $(TEST_LIST); \
        done;
@@@ -250,4 -275,4 +251,4 @@@ clean
                $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
        done;
  
 -.PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean gen_tar
 +.PHONY: all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean gen_tar
This page took 0.302142 seconds and 4 git commands to generate.