www.infradead.org Git - users/jedix/linux-maple.git/commit

]> www.infradead.org Git - users/jedix/linux-maple.git/commit

projects / users / jedix / linux-maple.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 40355c2 1a90e9d)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 04:27:19 +0000 (14:27 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 04:27:19 +0000 (14:27 +1000)
commit	5ae461ede85cc74c47d18748c83a0c32973d62a5
tree	5147aaad82f132305dffd27f9f33003e29d69341	tree
parent	40355c2a9374fbfdf9c30ceb1093b80f0f5f3c61	commit \| diff
parent	1a90e9dae32ce26de43c1c5eddb3ecce27f2a640	commit \| diff

Merge remote-tracking branch 'folio/for-next'

# Conflicts:
# mm/filemap.c
# mm/rmap.c
# mm/util.c

24 files changed:

fs/afs/write.c	diff1 \|	diff2 \|	blob \| history
fs/io_uring.c	diff1 \|	diff2 \|	blob \| history
include/linux/backing-dev.h	diff1 \|	diff2 \|	blob \| history
include/linux/highmem.h	diff1 \|	diff2 \|	blob \| history
include/linux/memcontrol.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
include/linux/netfs.h	diff1 \|	diff2 \|	blob \| history
include/linux/page-flags.h	diff1 \|	diff2 \|	blob \| history
include/linux/writeback.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
mm/hugetlb.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/memory-failure.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/migrate.c	diff1 \|	diff2 \|	blob \| history
mm/page-writeback.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/rmap.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
mm/swap_state.c	diff1 \|	diff2 \|	blob \| history
mm/util.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.