android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_kernel_samsung_sm8650/mm
History
Tejun Heo 026e14a276 Merge branch 'for-6.0-fixes' into for-6.1 
for-6.0 has the following fix for cgroup_get_from_id().

  836ac87d ("cgroup: fix cgroup_get_from_id")

which conflicts with the following two commits in for-6.1.

  4534dee9 ("cgroup: cgroup: Honor caller's cgroup NS when resolving cgroup id")
  fa7e439c ("cgroup: Homogenize cgroup_get_from_id() return value")

While the resolution is straightforward, the code ends up pretty ugly
afterwards. Let's pull for-6.0-fixes into for-6.1 so that the code can be
fixed up there.

Signed-off-by: Tejun Heo <tj@kernel.org>
2022-09-23 07:19:38 -10:00
..
damon
mm/damon/dbgfs: avoid duplicate context directory creation
2022-08-28 14:02:45 -07:00
kasan
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
kfence
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
backing-dev.c
writeback: avoid use-after-free after removing device
2022-08-28 14:02:43 -07:00
balloon_compaction.c
mm: Convert all PageMovable users to movable_operations
2022-08-02 12:34:03 -04:00
bootmem_info.c
bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem
2022-08-28 14:02:45 -07:00
cma_debug.c
mm/cma_debug.c: align the name buffer length as struct cma
2022-07-29 18:07:16 -07:00
cma_sysfs.c
mm: cma: support sysfs
2021-05-05 11:27:24 -07:00
cma.c
Revert "mm/cma.c: remove redundant cma_mutex lock"
2022-05-13 15:11:26 -07:00
cma.h
mm/cma: provide option to opt out from exposing pages on activation failure
2022-03-22 15:57:09 -07:00
compaction.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
debug_page_ref.c
…
debug_vm_pgtable.c
docs: rename Documentation/vm to Documentation/mm
2022-06-27 12:52:53 -07:00
debug.c
mm: unexport page_init_poison
2022-03-24 19:06:45 -07:00
dmapool.c
mm/dmapool.c: revert "make dma pool to use kmalloc_node"
2022-01-15 16:30:28 +02:00
early_ioremap.c
mm/early_ioremap: declare early_memremap_pgprot_adjust()
2022-03-22 15:57:11 -07:00
fadvise.c
riscv: compat: syscall: Add compat_sys_call_table implementation
2022-04-26 13:36:25 -07:00
failslab.c
mm: fix missing handler for __GFP_NOWARN
2022-05-19 14:08:55 -07:00
filemap.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
folio-compat.c
mm/folio-compat: Remove migration compatibility functions
2022-08-02 12:34:04 -04:00
frontswap.c
docs: rename Documentation/vm to Documentation/mm
2022-06-27 12:52:53 -07:00
gup_test.c
mm: rename is_pinnable_page() to is_longterm_pinnable_page()
2022-07-17 17:14:27 -07:00
gup_test.h
selftests/vm: gup_test: fix test flag
2021-05-05 11:27:26 -07:00
gup.c
mm/gup: fix FOLL_FORCE COW security issue and remove FOLL_COW
2022-08-20 15:17:44 -07:00
highmem.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
hmm.c
mm/hmm: fault non-owner device private entries
2022-07-29 11:33:37 -07:00
huge_memory.c
mm/gup: fix FOLL_FORCE COW security issue and remove FOLL_COW
2022-08-20 15:17:44 -07:00
hugetlb_cgroup.c
hugetlb_cgroup: fix wrong hugetlb cgroup numa stat
2022-07-29 18:07:17 -07:00
hugetlb_vmemmap.c
mm: hugetlb_vmemmap: use PTRS_PER_PTE instead of PMD_SIZE / PAGE_SIZE
2022-08-08 18:06:43 -07:00
hugetlb_vmemmap.h
mm: hugetlb_vmemmap: improve hugetlb_vmemmap code readability
2022-08-08 18:06:43 -07:00
hugetlb.c
mm/hugetlb: avoid corrupting page->mapping in hugetlb_mcopy_atomic_pte
2022-08-28 14:02:43 -07:00
hwpoison-inject.c
mm/memory-failure: disable unpoison once hw error happens
2022-06-16 19:11:32 -07:00
init-mm.c
kernel/fork: Initialize mm's PASID
2022-02-14 19:51:47 +01:00
internal.h
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
interval_tree.c
mm/interval_tree: add comments to improve code readability
2021-04-30 11:20:38 -07:00
io-mapping.c
mm: add a io_mapping_map_user helper
2021-04-30 11:20:39 -07:00
ioremap.c
mm: ioremap: Add ioremap/iounmap_allowed()
2022-06-27 12:22:31 +01:00
Kconfig
cxl for 6.0
2022-08-10 11:07:26 -07:00
Kconfig.debug
Two followon fixes for the post-5.19 series "Use pageblock_order for cma
2022-05-27 11:40:49 -07:00
khugepaged.c
mm: khugepaged: reorg some khugepaged helpers
2022-07-17 17:14:33 -07:00
kmemleak.c
mm/kmemleak: prevent soft lockup in first object iteration loop of kmemleak_scan()
2022-06-16 19:48:32 -07:00
ksm.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
list_lru.c
mm: kmem: make mem_cgroup_from_obj() vmalloc()-safe
2022-06-16 19:48:31 -07:00
maccess.c
asm-generic updates for 5.18
2022-03-23 18:03:08 -07:00
madvise.c
mm: handling Non-LRU pages returned by vm_normal_pages
2022-07-17 17:14:28 -07:00
Makefile
mm: shrinkers: introduce debugfs interface for memory shrinkers
2022-07-03 18:08:40 -07:00
mapping_dirty_helpers.c
mm: move tlb_flush_pending inline helpers to mm_inline.h
2022-01-15 16:30:27 +02:00
memblock.c
memblock updates for v5.20
2022-08-09 09:48:30 -07:00
memcontrol.c
cgroup: Fix build failure when CONFIG_SHRINKER_DEBUG
2022-08-28 17:54:15 -10:00
memfd.c
memfd: fix F_SEAL_WRITE after shmem huge page allocated
2022-03-05 11:08:32 -08:00
memory_hotplug.c
mm: use is_zone_movable_page() helper
2022-07-29 18:07:20 -07:00
memory-failure.c
mm, hwpoison: enable memory error handling on 1GB hugepage
2022-08-08 18:06:44 -07:00
memory.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
mempolicy.c
mm/mempolicy: remove unneeded out label
2022-07-29 18:07:16 -07:00
mempool.c
mm/mempool: use might_alloc()
2022-06-16 19:48:30 -07:00
memremap.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
memtest.c
…
migrate_device.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
migrate.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
mincore.c
mm: teach core mm about pte markers
2022-05-13 07:20:09 -07:00
mlock.c
mm: handling Non-LRU pages returned by vm_normal_pages
2022-07-17 17:14:28 -07:00
mm_init.c
include/linux/page-flags-layout.h: cleanups
2021-04-30 11:20:42 -07:00
mmap_lock.c
mm: mmap_lock: fix disabling preemption directly
2021-07-23 17:43:28 -07:00
mmap.c
mm/hugetlb: fix hugetlb not supporting softdirty tracking
2022-08-20 15:17:45 -07:00
mmu_gather.c
mm/mmu_gather: limit free batch count and add schedule point in tlb_batch_pages_flush
2022-04-28 23:16:12 -07:00
mmu_notifier.c
mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove()
2022-04-21 20:01:10 -07:00
mmzone.c
Folio changes for 5.18
2022-03-22 17:03:12 -07:00
mprotect.c
mm/mprotect: only reference swap pfn page if type match
2022-08-28 14:02:46 -07:00
mremap.c
Yang Shi has improved the behaviour of khugepaged collapsing of readonly
2022-05-26 12:32:41 -07:00
msync.c
mm/msync: exit early when the flags is an MS_ASYNC and start < vm_start
2021-04-30 11:20:37 -07:00
nommu.c
mm: nommu: pass a pointer to virt_to_page()
2022-07-17 17:14:37 -07:00
oom_kill.c
mm/oom_kill.c: fix vm_oom_kill_table[] ifdeffery
2022-06-01 15:57:16 -07:00
page_alloc.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
page_counter.c
mm/page_counter: remove an incorrect call to propagate_protected_usage()
2022-01-15 16:30:27 +02:00
page_ext.c
mm: use for_each_online_node and node_online instead of open coding
2022-04-29 14:36:58 -07:00
page_idle.c
mm: don't be stuck to rmap lock on reclaim path
2022-05-19 14:08:54 -07:00
page_io.c
Yang Shi has improved the behaviour of khugepaged collapsing of readonly
2022-05-26 12:32:41 -07:00
page_isolation.c
mm/page_isolation.c: fix one kernel-doc comment
2022-06-16 19:11:30 -07:00
page_owner.c
Yang Shi has improved the behaviour of khugepaged collapsing of readonly
2022-05-26 12:32:41 -07:00
page_poison.c
mm: page_poison: print page info when corruption is caught
2021-04-30 11:20:36 -07:00
page_reporting.c
mm/page_reporting: allow driver to specify reporting order
2021-06-29 10:53:47 -07:00
page_reporting.h
mm/page_reporting: export reporting order as module parameter
2021-06-29 10:53:47 -07:00
page_table_check.c
Six hotfixes. One from Miaohe Lin is considered a minor thing so it isn't
2022-05-27 11:29:35 -07:00
page_vma_mapped.c
mm/page_vma_mapped.c: use helper function huge_pte_lock
2022-07-17 17:14:47 -07:00
page-writeback.c
writeback: avoid use-after-free after removing device
2022-08-28 14:02:43 -07:00
pagewalk.c
mm: pagewalk: Fix race between unmap and page walker
2022-09-03 10:13:13 -07:00
percpu-internal.h
percpu: improve percpu_alloc_percpu event trace
2022-05-13 07:20:18 -07:00
percpu-km.c
percpu: flush tlb in pcpu_reclaim_populated()
2021-07-04 18:30:17 +00:00
percpu-stats.c
mm: use vmalloc_array and vcalloc for array allocations
2022-03-08 09:30:46 -05:00
percpu-vm.c
percpu: flush tlb in pcpu_reclaim_populated()
2021-07-04 18:30:17 +00:00
percpu.c
mm: percpu: use kmemleak_ignore_phys() instead of kmemleak_free()
2022-07-17 17:14:47 -07:00
pgalloc-track.h
mm: fix typos in comments
2021-05-07 00:26:35 -07:00
pgtable-generic.c
mm: avoid unnecessary flush on change_huge_pmd()
2022-05-13 07:20:05 -07:00
process_vm_access.c
mm/process_vm_access.c: remove duplicate include
2021-05-05 11:27:27 -07:00
ptdump.c
mm: pagewalk: Fix race between unmap and page walker
2022-09-03 10:13:13 -07:00
readahead.c
filemap: Fix serialization adding transparent huge pages to page cache
2022-06-23 12:22:00 -04:00
rmap.c
mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse
2022-08-31 15:45:10 -07:00
rodata_test.c
…
secretmem.c
Folio changes for 6.0
2022-08-03 10:35:43 -07:00
shmem.c
shmem: update folio if shmem_replace_page() updates the page
2022-08-28 14:02:43 -07:00
shrinker_debug.c
mm: shrinkers: fix double kfree on shrinker name
2022-07-29 18:07:13 -07:00
shuffle.c
mm: eliminate "expecting prototype" kernel-doc warnings
2021-04-16 16:10:36 -07:00
shuffle.h
mm/shuffle: fix section mismatch warning
2021-05-22 15:09:07 -10:00
slab_common.c
mm/slab_common: Deleting kobject in kmem_cache_destroy() without holding slab_mutex/cpu_hotplug_lock
2022-09-01 12:10:31 +02:00
slab.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
slab.h
mm/slab_common: move generic bulk alloc/free functions to SLOB
2022-07-20 13:30:12 +02:00
slob.c
mm/slab_common: move generic bulk alloc/free functions to SLOB
2022-07-20 13:30:12 +02:00
slub.c
mm/sl[au]b: use own bulk free function when bulk alloc failed
2022-07-20 13:30:11 +02:00
sparse-vmemmap.c
mm: hugetlb_vmemmap: move vmemmap code related to HugeTLB to hugetlb_vmemmap.c
2022-08-08 18:06:42 -07:00
sparse.c
mm: memory_hotplug: enumerate all supported section flags
2022-07-03 18:08:49 -07:00
swap_cgroup.c
mm: use vmalloc_array and vcalloc for array allocations
2022-03-08 09:30:46 -05:00
swap_slots.c
arm64: enable THP_SWAP for arm64
2022-07-20 10:52:40 +01:00
swap_state.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
swap.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
swap.h
mm/khugepaged: try to free transhuge swapcache when possible
2022-07-03 18:08:52 -07:00
swapfile.c
mm/swap: convert delete_from_swap_cache() to take a folio
2022-07-03 18:08:48 -07:00
truncate.c
mm: Remove __delete_from_page_cache()
2022-06-29 08:51:05 -04:00
usercopy.c
usercopy: use unsigned long instead of uintptr_t
2022-07-01 17:03:38 -07:00
userfaultfd.c
mm/uffd: reset write protection when unregister with wp-mode
2022-08-20 15:17:45 -07:00
util.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
vmacache.c
…
vmalloc.c
mm/vmalloc: extend __find_vmap_area() with one more argument
2022-07-03 18:08:41 -07:00
vmpressure.c
mm/vmpressure: fix data-race with memcg->socket_pressure
2021-11-06 13:30:40 -07:00
vmscan.c
- The usual batches of cleanups from Baoquan He, Muchun Song, Miaohe
2022-08-05 16:32:45 -07:00
vmstat.c
mm: add DEVICE_ZONE to FOR_ALL_ZONES
2022-08-20 15:17:45 -07:00
workingset.c
mm: shrinkers: provide shrinkers with names
2022-07-03 18:08:40 -07:00
z3fold.c
mm: Convert all PageMovable users to movable_operations
2022-08-02 12:34:03 -04:00
zbud.c
mm/zbud: add kerneldoc fields for zbud_pool
2021-07-01 11:06:03 -07:00
zpool.c
zpool: remove the list of pools_head
2022-01-15 16:30:31 +02:00
zsmalloc.c
mm/zsmalloc: do not attempt to free IS_ERR handle
2022-08-28 14:02:44 -07:00
zswap.c
zswap: memcg accounting
2022-05-19 14:08:53 -07:00