Commit 7b3064f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Various fixes and followups"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, compaction: make sure we isolate a valid PFN
  include/linux/generic-radix-tree.h: fix kerneldoc comment
  kernel/signal.c: trace_signal_deliver when signal_group_exit
  drivers/iommu/intel-iommu.c: fix variable 'iommu' set but not used
  spdxcheck.py: fix directory structures
  kasan: initialize tag to 0xff in __kasan_kmalloc
  z3fold: fix sheduling while atomic
  scripts/gdb: fix invocation when CONFIG_COMMON_CLK is not set
  mm/gup: continue VM_FAULT_RETRY processing even for pre-faults
  ocfs2: fix error path kobject memory leak
  memcg: make it work on sparse non-0-node systems
  mm, memcg: consider subtrees in memory.events
  prctl_set_mm: downgrade mmap_sem to read lock
  prctl_set_mm: refactor checks from validate_prctl_map
  kernel/fork.c: make max_threads symbol static
  arch/arm/boot/compressed/decompress.c: fix build error due to lz4 changes
  arch/parisc/configs/c8000_defconfig: remove obsoleted CONFIG_DEBUG_SLAB_LEAK
  mm/vmalloc.c: fix typo in comment
  lib/sort.c: fix kernel-doc notation warnings
  mm: fix Documentation/vm/hmm.rst Sphinx warnings
parents 3ab4436f e577c8b6

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number Diff line number Diff line
@@ -177,6 +177,15 @@ cgroup v2 currently supports the following mount options. 
	ignored on non-init namespace mounts.  Please refer to the

	Delegation section for details.



  memory_localevents



        Only populate memory.events with data for the current cgroup,

        and not any subtrees. This is legacy behaviour, the default

        behaviour without this option is to include subtree counts.

        This option is system wide and can only be set on mount or

        modified through remount from the init namespace. The mount

        option is ignored on non-init namespace mounts.





Organizing Processes and Threads

--------------------------------

Documentation/vm/hmm.rst

+5 −3
Original line number Diff line number Diff line
@@ -288,15 +288,17 @@ For instance if the device flags for device entries are: 
    WRITE (1 << 62)



Now let say that device driver wants to fault with at least read a range then

it does set:

    range->default_flags = (1 << 63)

it does set::



    range->default_flags = (1 << 63);

    range->pfn_flags_mask = 0;



and calls hmm_range_fault() as described above. This will fill fault all page

in the range with at least read permission.



Now let say driver wants to do the same except for one page in the range for

which its want to have write. Now driver set:

which its want to have write. Now driver set::



    range->default_flags = (1 << 63);

    range->pfn_flags_mask = (1 << 62);

    range->pfns[index_of_write] = (1 << 62);

arch/arm/boot/compressed/decompress.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
extern char * strstr(const char * s1, const char *s2);

extern size_t strlen(const char *s);

extern int memcmp(const void *cs, const void *ct, size_t count);

extern char * strchrnul(const char *, int);



#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

arch/parisc/configs/c8000_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ CONFIG_UNUSED_SYMBOLS=y 
CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_SLAB=y

CONFIG_DEBUG_SLAB_LEAK=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_PANIC_ON_OOPS=y

drivers/iommu/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -3034,7 +3034,8 @@ static int __init iommu_prepare_static_identity_mapping(int hw) 
{

	struct pci_dev *pdev = NULL;

	struct dmar_drhd_unit *drhd;

	struct intel_iommu *iommu;

	/* To avoid a -Wunused-but-set-variable warning. */

	struct intel_iommu *iommu __maybe_unused;

	struct device *dev;

	int i;

	int ret = 0;