# Conflicts:
#	include/linux/mm.h
#	kernel/sysctl.c
#	mm/filemap.c

fix up for "rust: init: fix `Zeroable` implementation for `Option<NonNull<T>>` and `Option<KBox<T>>`"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

# Conflicts:
#	drivers/gpu/drm/drm_panic_qr.rs
#	rust/Makefile
#	rust/kernel/init.rs
#	rust/kernel/sync/condvar.rs
#	rust/kernel/sync/lock.rs
#	rust/pin-init/src/macros.rs
#	scripts/generate_rust_analyzer.py

# Conflicts:
#	kernel/rcu/tiny.c

# Conflicts:
#	tools/testing/cxl/test/mem.c

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

# Conflicts:
#	lib/Makefile

# Conflicts:
#	arch/arm64/boot/dts/rockchip/rk3576.dtsi
#	drivers/scsi/scsi_debug.c

# Conflicts:
#	Documentation/devicetree/bindings/misc/atmel-ssc.txt