Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Jan 2022 00:18:49 +0000 (11:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Jan 2022 00:18:49 +0000 (11:18 +1100)
commitc1299ad9ef669c63077c349376071184699a68bd
tree921c049319757ed484212e844998e29cab63d4f3
parent7ab258790a2acefac50e9b8fe4535019b143b534
parent785cb064e2f87b6cd2157554f50193dba0642d75
Merge branch 'bitmap-master-5.15' of https://guthub.com/norov/linux.git

# Conflicts:
# arch/parisc/include/asm/bitops.h
# arch/powerpc/include/asm/cputhreads.h
# arch/s390/kvm/kvm-s390.c
# drivers/dma/ti/edma.c
33 files changed:
MAINTAINERS
arch/arc/Kconfig
arch/arm64/Kconfig
arch/csky/include/asm/bitops.h
arch/m68k/include/asm/bitops.h
arch/mips/Kconfig
arch/mips/include/asm/bitops.h
arch/parisc/include/asm/bitops.h
arch/powerpc/include/asm/bitops.h
arch/s390/Kconfig
arch/s390/include/asm/bitops.h
arch/s390/kvm/kvm-s390.c
arch/x86/Kconfig
block/blk-mq.c
drivers/block/rnbd/rnbd-clt.c
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
drivers/iio/adc/ad7124.c
drivers/infiniband/hw/irdma/hw.c
drivers/media/cec/core/cec-core.c
drivers/mmc/host/renesas_sdhi_core.c
drivers/net/virtio_net.c
drivers/pci/controller/dwc/pci-dra7xx.c
drivers/scsi/lpfc/lpfc_sli.c
drivers/soc/ti/k3-ringacc.c
drivers/tty/n_tty.c
fs/f2fs/segment.c
fs/ocfs2/dlm/dlmrecovery.c
include/linux/bitmap.h
include/linux/cpumask.h
kernel/time/clocksource.c
lib/Kconfig
lib/vsprintf.c
mm/percpu.c