Merge 'pagemap-headers' from git://git.infradead.org/users/willy/pagecache.git (headers) Merged-SHA: e02cb91d4644dfff593146f89e70d2008cc6ac16 arch/alpha/include/asm/pgtable.h | 2 +- arch/arc/include/asm/Kbuild | 1 + arch/arc/include/asm/pgtable-levels.h | 2 ++ arch/arc/include/asm/tlb.h | 12 ---------- arch/arm/include/asm/pgalloc.h | 2 -- arch/arm/include/asm/tlb.h | 2 -- arch/arm/mach-pxa/pxa3xx.c | 1 + arch/arm64/include/asm/tlb.h | 3 --- arch/hexagon/include/asm/tlb.h | 1 - arch/microblaze/include/asm/pgtable.h | 2 +- arch/nios2/include/asm/tlb.h | 1 - arch/openrisc/include/asm/Kbuild | 1 + arch/openrisc/include/asm/tlb.h | 26 ---------------------- arch/powerpc/include/asm/tlb.h | 2 -- arch/sh/include/asm/pgtable.h | 2 +- arch/sh/include/asm/tlb.h | 1 - arch/sparc/include/asm/pgtable_64.h | 2 +- arch/sparc/include/asm/tlb_64.h | 1 - arch/x86/include/asm/pgalloc.h | 1 - arch/x86/virt/vmx/tdx/tdx.c | 1 + arch/xtensa/kernel/hibernate.c | 1 + block/fops.c | 1 + drivers/char/agp/backend.c | 1 - drivers/char/agp/generic.c | 1 - drivers/char/agp/intel-agp.c | 1 - drivers/char/agp/intel-gtt.c | 1 - drivers/char/agp/uninorth-agp.c | 3 ++- drivers/dma/ste_dma40.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 - drivers/gpu/drm/display/drm_dp_cec.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 + drivers/gpu/drm/i915/display/intel_display_power.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + drivers/gpu/drm/msm/msm_fb.c | 2 ++ drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 ++ drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c | 1 + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 ++ drivers/gpu/drm/panthor/panthor_gem.c | 3 +++ drivers/hwmon/pmbus/pmbus_core.c | 1 + drivers/i2c/busses/i2c-amd-asf-plat.c | 1 + drivers/i2c/busses/i2c-gxp.c | 1 + drivers/i2c/busses/i2c-k1.c | 1 + drivers/i2c/busses/i2c-pasemi-platform.c | 1 + drivers/iio/accel/fxls8962af-core.c | 1 + drivers/iio/adc/nct7201.c | 1 + drivers/iio/adc/ti-ads1298.c | 1 + drivers/iio/light/rohm-bu27034.c | 1 + drivers/iio/pressure/bmp280-core.c | 1 + drivers/iio/pressure/bmp280.h | 1 + drivers/input/misc/aw86927.c | 1 + drivers/input/touchscreen/goodix_berlin_core.c | 1 + drivers/input/touchscreen/hynitron_cstxxx.c | 1 + drivers/input/touchscreen/imagis.c | 1 + drivers/leds/leds-turris-omnia.c | 1 + drivers/media/common/videobuf2/frame_vector.c | 1 - drivers/media/pci/cx18/cx18-driver.h | 1 - drivers/media/pci/ivtv/ivtv-driver.h | 2 +- drivers/media/platform/st/stm32/stm32-csi.c | 1 + drivers/media/platform/ti/omap3isp/ispvideo.c | 1 - drivers/media/usb/go7007/go7007-v4l2.c | 1 - drivers/media/usb/gspca/gspca.c | 1 - drivers/mfd/88pm886.c | 1 + drivers/mfd/abx500-core.c | 1 + drivers/mfd/adp5585.c | 1 + drivers/mfd/cs40l50-core.c | 1 + drivers/mfd/cs42l43.c | 1 + drivers/mfd/rt5120.c | 1 + drivers/mfd/tps65219.c | 1 + drivers/mfd/twl-core.c | 2 +- drivers/mmc/core/core.c | 1 - drivers/mmc/core/host.c | 1 - drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 - drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 - drivers/mmc/host/sh_mmcif.c | 1 - drivers/mmc/host/tmio_mmc.h | 1 - drivers/mmc/host/tmio_mmc_core.c | 1 - drivers/mmc/host/usdhi6rol0.c | 1 - drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 - drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 - drivers/net/ethernet/intel/e1000/e1000.h | 1 - drivers/net/ethernet/intel/e1000e/netdev.c | 1 - drivers/net/ethernet/intel/igb/igb_main.c | 1 - drivers/net/ethernet/intel/igbvf/netdev.c | 1 - drivers/phy/st/phy-stm32-combophy.c | 1 + drivers/pinctrl/pinctrl-sx150x.c | 1 + drivers/platform/arm64/huawei-gaokun-ec.c | 1 + drivers/platform/arm64/lenovo-yoga-c630.c | 2 +- .../platform/x86/intel/int3472/clk_and_regulator.c | 1 + drivers/power/supply/bq25630_charger.c | 1 + drivers/power/supply/rk817_charger.c | 2 +- drivers/regulator/fixed.c | 1 + drivers/regulator/fp9931.c | 1 + drivers/regulator/mt6360-regulator.c | 1 + drivers/regulator/qcom-labibb-regulator.c | 1 + drivers/regulator/rtq2208-regulator.c | 1 + drivers/regulator/tps65185.c | 1 + drivers/regulator/tps65219-regulator.c | 1 + drivers/regulator/tps6594-regulator.c | 1 + drivers/soc/xilinx/zynqmp_power.c | 1 + drivers/ufs/host/ufs-mediatek.c | 1 + drivers/ufs/host/ufs-qcom.c | 1 + drivers/usb/core/hcd.c | 1 + drivers/usb/typec/mux/it5205.c | 1 + drivers/usb/typec/wusb3801.c | 1 + drivers/video/fbdev/core/fb_procfs.c | 1 + drivers/xen/balloon.c | 1 + fs/aio.c | 1 + fs/buffer.c | 1 + fs/file_table.c | 1 + fs/inode.c | 1 + fs/nfs/blocklayout/blocklayout.c | 1 + fs/nfs/nfs42proc.c | 1 + fs/nfs/nfstrace.h | 1 + fs/nfs/pnfs.c | 1 + fs/nfsd/nfs4proc.c | 1 + include/drm/drm_print.h | 1 + include/drm/ttm/ttm_tt.h | 1 - include/linux/balloon.h | 1 - include/linux/ceph/libceph.h | 1 - include/linux/i3c/master.h | 1 + include/linux/ksm.h | 1 - include/linux/mempolicy.h | 1 - include/linux/nfs_fs.h | 1 - include/linux/nfs_page.h | 1 - include/linux/suspend.h | 1 - include/linux/swap.h | 1 - include/sound/cs35l41.h | 1 + kernel/power/snapshot.c | 1 + net/ceph/osd_client.c | 1 - net/ceph/pagevec.c | 1 + net/core/datagram.c | 1 - net/rds/rdma.c | 1 - net/sunrpc/auth_gss/auth_gss.c | 1 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - net/sunrpc/auth_gss/svcauth_gss.c | 1 - net/sunrpc/cache.c | 1 - net/sunrpc/rpc_pipe.c | 1 - net/sunrpc/socklib.c | 1 - net/sunrpc/xdr.c | 1 - net/sunrpc/xprtsock.c | 1 - security/commoncap.c | 3 --- security/inode.c | 1 - security/selinux/hooks.c | 1 - security/selinux/selinuxfs.c | 1 - security/smack/smack_lsm.c | 1 - sound/soc/codecs/cs35l41-lib.c | 1 + 155 files changed, 98 insertions(+), 118 deletions(-)