Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git

# Conflicts:
# drivers/gpu/drm/drm_cache.c

Merge branch 'sysctl-next' of git://git./linux/kernel/git/mcgrof/linux.git

# Conflicts:
# include/linux/sched/sysctl.h
# kernel/sysctl.c

Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git

Merge branch 'next' of git://git./linux/kernel/git/mic/linux.git

Merge branch 'master' of git://git./linux/kernel/git/crng/random.git

Merge branch 'for-next' of git://git./linux/kernel/git/vbabka/slab.git

Merge branch 'next' of git://git./linux/kernel/git/efi/efi.git

Merge branch 'next' of git://git./linux/kernel/git/cxl/cxl.git

Merge branch 'for-next' of git://git./linux/kernel/git/rppt/memblock.git

Merge branch 'mhi-next' of git://git./linux/kernel/git/mani/mhi.git

Merge branch 'kunit' of git://git./linux/kernel/git/shuah/linux-kselftest.git

Merge branch 'for-next' of git://git./linux/kernel/git/mdf/linux-fpga.git

Merge branch 'hyperv-next' of git://git./linux/kernel/git/hyperv/linux.git

Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git

Merge branch 'for-next' of git://git./linux/kernel/git/srini/nvmem.git

# Conflicts:
# MAINTAINERS
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile

Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git

Merge branch 'libnvdimm-for-next' of git://git./linux/kernel/git/nvdimm/nvdimm.git

Merge branch 'rtc-next' of git://git./linux/kernel/git/abelloni/linux.git

Merge branch 'next' of git://git./linux/kernel/git/coresight/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/livepatching/livepatching

Merge branch 'next' of git://git./linux/kernel/git/shuah/linux-kselftest.git

Merge branch 'for-next' of git://git./linux/kernel/git/ebiederm/user-namespace.git

Merge branch 'for-next' of git://git./linux/kernel/git/thierry.reding/linux-pwm.git

Merge branch 'for-next' of git://git./linux/kernel/git/linusw/linux-pinctrl.git

Merge branch 'for-next' of git://git./linux/kernel/git/andy/linux-gpio-intel.git

Merge branch 'gpio/for-next' of git://git./linux/kernel/git/brgl/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/remoteproc/linux.git

Merge branch 'linux-next' of git://git./linux/kernel/git/mst/vhost.git

Merge branch 'for-next' of git://git./linux/kernel/git/mkp/scsi.git

Merge branch 'for-next' of git://git./linux/kernel/git/jejb/scsi.git

# Conflicts:
# block/blk-lib.c
# drivers/block/rnbd/rnbd-clt.c

Merge branch 'for-next' of git://git./linux/kernel/git/tj/cgroup.git

Merge branch 'next' of git://git./linux/kernel/git/vkoul/dmaengine.git

Merge branch 'icc-next' of git://git./linux/kernel/git/djakov/icc.git

Merge branch 'togreg' of git://git./linux/kernel/git/jic23/iio.git

# Conflicts:
# .mailmap
# drivers/iio/accel/fxls8962af-core.c

Merge branch 'staging-next' of git://git./linux/kernel/git/gregkh/staging.git

# Conflicts:
# drivers/staging/fbtft/fbtft.h

Merge branch 'next' of git://git./linux/kernel/git/westeri/thunderbolt.git

Merge branch 'next' of git://git./linux/kernel/git/vkoul/soundwire.git

Merge branch 'next' of git://git./linux/kernel/git/phy/linux-phy.git

Merge branch 'extcon-next' of git://git./linux/kernel/git/chanwoo/extcon.git

# Conflicts:
# drivers/power/supply/max8997_charger.c

next-20220224/char-misc

Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty.git

# Conflicts:
# MAINTAINERS

Merge branch 'for-usb-next' of git://git./linux/kernel/git/peter.chen/usb.git

Merge branch 'usb-next' of git://git./linux/kernel/git/gregkh/usb.git

# Conflicts:
# arch/arm64/boot/dts/qcom/ipq6018.dtsi
# arch/arm64/boot/dts/xilinx/zynqmp.dtsi

Merge branch 'driver-core-next' of git://git./linux/kernel/git/gregkh/driver-core.git

# Conflicts:
# drivers/power/supply/ab8500_chargalg.c

Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git

Merge branch 'for-next' of git://git./linux/kernel/git/pavel/linux-leds.git

Merge branch 'for-next' of git://git./linux/kernel/git/chrome-platform/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/pdx86/platform-drivers-x86.git

Merge branch 'for-next' of git://git./linux/kernel/git/tj/wq.git

Merge branch 'for-next' of git://git./linux/kernel/git/dennis/percpu.git

Merge branch 'next' of git://git./linux/kernel/git/kvms390/linux.git

Merge branch 'next' of git://git./linux/kernel/git/kvmarm/kvmarm.git

Merge branch 'next' of git://git./virt/kvm/kvm.git

# Conflicts:
# arch/x86/kvm/x86.c

Merge branch 'rcu/next' of git://git./linux/kernel/git/paulmck/linux-rcu.git

# Conflicts:
# kernel/rcu/tree_plugin.h

Merge branch 'for-next' of git://git./linux/kernel/git/rostedt/linux-trace.git

Merge branch 'irq/irqchip-next' of git://git./linux/kernel/git/maz/arm-platforms.git

# Conflicts:
# drivers/pinctrl/pinctrl-starfive.c

Merge branch 'edac-for-next' of git://git./linux/kernel/git/ras/ras.git

Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git

Merge branch 'auto-latest' of git://git./linux/kernel/git/tip/tip.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/spi.git

# Conflicts:
# arch/arm/mach-pxa/stargate2.c

Merge branch 'for-next' of git://git./linux/kernel/git/robh/linux.git

Merge branch 'next' of git://git./linux/kernel/git/pcmoore/audit.git

Merge branch 'next' of git://git./linux/kernel/git/joro/iommu.git

Merge branch 'next' of git://git./linux/kernel/git/jarkko/linux-tpmdd.git

Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git

Merge branch 'next' of git://github.com/cschaufler/smack-next

Merge branch 'next' of git://git./linux/kernel/git/pcmoore/selinux.git

Merge branch 'next-integrity' of git://git./linux/kernel/git/zohar/linux-integrity

Merge branch 'apparmor-next' of git://git./linux/kernel/git/jj/linux-apparmor

Merge branch 'next-testing' of git://git./linux/kernel/git/jmorris/linux-security.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regulator.git

Merge branch 'for-next' of git://git./linux/kernel/git/sre/linux-power-supply.git

Merge branch 'for-mfd-next' of git://git./linux/kernel/git/lee/mfd.git

Merge branch 'next' of git://git./linux/kernel/git/ulfh/mmc.git

Merge branch 'pcmcia-next' of git://git./linux/kernel/git/brodo/linux.git

Merge branch 'for-next' of git://git./linux/kernel/git/dlemoal/libata.git

Merge branch 'for-next' of git://git./linux/kernel/git/device-mapper/linux-dm.git

Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

# Conflicts:
# fs/iomap/direct-io.c

Merge branch 'next' of git://git./linux/kernel/git/dtor/input.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/sound.git

Merge branch 'for-next' of git://git./linux/kernel/git/tiwai/sound.git

Merge branch 'for-next' of git://git./linux/kernel/git/broonie/regmap.git

Merge branch 'for-next' of git://git./linux/kernel/git/deller/linux-fbdev.git

Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux

Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git

Merge branch 'drm/tegra/for-next' of git://anongit.freedesktop.org/tegra/linux.git

Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel

# Conflicts:
# drivers/gpu/drm/dp/drm_dp.c
# drivers/gpu/drm/i915/display/intel_bw.c
# drivers/gpu/drm/i915/display/intel_snps_phy.c

Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux

selftests/vm/transhuge-stress: Support file-backed PMD folios

Add a -f <filename> option to test PMD folios on files

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/filemap: Support VM_HUGEPAGE for file mappings

If the VM_HUGEPAGE flag is set, attempt to allocate PMD-sized folios
during readahead, even if we have no history of readahead being
successful.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/readahead: Switch to page_cache_ra_order

do_page_cache_ra() was being exposed for the benefit of
do_sync_mmap_readahead().  Switch it over to page_cache_ra_order()
partly because it's a better interface but mostly for the benefit of
the next patch.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/readahead: Align file mappings for non-DAX

When we have the opportunity to use PMDs to map a file, we want to follow
the same rules as DAX.

Signed-off-by: William Kucharski <william.kucharski@oracle.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/readahead: Add large folio readahead

Allocate large folios in the readahead code when the filesystem supports
them and it seems worth doing.  The heuristic for choosing which folio
sizes will surely need some tuning, but this aggressive ramp-up has been
good for testing.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm: Support arbitrary THP sizes

For code which has not yet been converted from THP to folios, use the
compound size of the page instead of assuming PTE or PMD size.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm: Make large folios depend on THP

Some parts of the VM still depend on THP to handle large folios
correctly.  Until those are fixed, prevent creating large folios
if THP are disabled.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm: Fix READ_ONLY_THP warning

These counters only exist if CONFIG_READ_ONLY_THP_FOR_FS is defined,
but we do not need to warn if the filesystem natively supports large
folios.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/filemap: Allow large folios to be added to the page cache

We return -EEXIST if there are any non-shadow entries in the page
cache in the range covered by the folio.  If there are multiple
shadow entries in the range, we set *shadowp to one of them (currently
the one at the highest index).  If that turns out to be the wrong
answer, we can implement something more complex.  This is mostly
modelled after the equivalent function in the shmem code.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm: Turn can_split_huge_page() into can_split_folio()

This function already required a head page to be passed, so this
just adds type-safety and removes a few implicit calls to
compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/vmscan: Convert pageout() to take a folio

We always write out an entire folio at once.  This conversion removes
a few calls to compound_head() and gets the NR_VMSCAN_WRITE statistic
right when writing out a large folio.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

mm/vmscan: Turn page_check_references() into folio_check_references()

This function only has one caller, and it already has a folio.  This
removes a number of calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>