diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-25 21:43:43 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-25 21:43:43 +0300 |
commit | 002322402dafd846c424ffa9240a937f49b48c42 (patch) | |
tree | 73382f24d0dc7dfc2dfb4347ff978bad3712859e /net/netfilter/nf_flow_table_core.c | |
parent | 2ba9bea2d3682361f0f22f68a400bcee4248c205 (diff) | |
parent | d3e2ff28ca27352d43a41053263d620202324c1f (diff) | |
download | linux-002322402dafd846c424ffa9240a937f49b48c42.tar.xz |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"14 patches.
Subsystems affected by this patch series: mm (hugetlb, kasan, gup,
selftests, z3fold, kfence, memblock, and highmem), squashfs, ia64,
gcov, and mailmap"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mailmap: update Andrey Konovalov's email address
mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP
mm: memblock: fix section mismatch warning again
kfence: make compatible with kmemleak
gcov: fix clang-11+ support
ia64: fix format strings for err_inject
ia64: mca: allocate early mca with GFP_ATOMIC
squashfs: fix xattr id and id lookup sanity checks
squashfs: fix inode lookup sanity checks
z3fold: prevent reclaim/free race for headless pages
selftests/vm: fix out-of-tree build
mm/mmu_notifiers: ensure range_end() is paired with range_start()
kasan: fix per-page tags for non-page_alloc pages
hugetlb_cgroup: fix imbalanced css_get and css_put pair for shared mappings
Diffstat (limited to 'net/netfilter/nf_flow_table_core.c')
0 files changed, 0 insertions, 0 deletions