git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b4aa88 74d611a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 08:09:04 +0000 (19:09 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 08:09:04 +0000 (19:09 +1100)
commit	1d60cb24ff8bd4960431c0e0f0337bb049e01970
tree	2fc391b8ae2e324c9b2901a24b67ab4d0fd084ca	tree
parent	5b4aa8875b145c4edb3745725cd3c1addfb45205	commit \| diff
parent	74d611ae53448f1cd1d1ef33e383ecffab26651f	commit \| diff

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

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

18 files changed:

arch/arm64/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/book3s/32/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/nohash/32/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/nohash/64/pgtable.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdkfd/kfd_priv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_cache.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/target/io-cmd-bdev.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_mass_storage.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/filecache.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
mm/hugetlb.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/oom_kill.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)