Commit 59a2ceee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "87 patches.

  Subsystems affected by this patch series: mm (pagecache and hugetlb),
  procfs, misc, MAINTAINERS, lib, checkpatch, binfmt, kallsyms, ramfs,
  init, codafs, nilfs2, hfs, crash_dump, signals, seq_file, fork,
  sysvfs, kcov, gdb, resource, selftests, and ipc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (87 commits)
  ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL
  ipc: check checkpoint_restore_ns_capable() to modify C/R proc files
  selftests/kselftest/runner/run_one(): allow running non-executable files
  virtio-mem: disallow mapping virtio-mem memory via /dev/mem
  kernel/resource: disallow access to exclusive system RAM regions
  kernel/resource: clean up and optimize iomem_is_exclusive()
  scripts/gdb: handle split debug for vmlinux
  kcov: replace local_irq_save() with a local_lock_t
  kcov: avoid enable+disable interrupts if !in_task()
  kcov: allocate per-CPU memory on the relevant node
  Documentation/kcov: define `ip' in the example
  Documentation/kcov: include types.h in the example
  sysv: use BUILD_BUG_ON instead of runtime check
  kernel/fork.c: unshare(): use swap() to make code cleaner
  seq_file: fix passing wrong private data
  seq_file: move seq_escape() to a header
  signal: remove duplicate include in signal.h
  crash_dump: remove duplicate include in crash_dump.h
  crash_dump: fix boolreturn.cocci warning
  hfs/hfsplus: use WARN_ON for sanity check
  ...
parents d2f38a3c 0e9beb8a

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com> 
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Documentation/dev-tools/kcov.rst

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ program using kcov: 
    #include <sys/mman.h>

    #include <unistd.h>

    #include <fcntl.h>

    #include <linux/types.h>



    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)

    #define KCOV_ENABLE			_IO('c', 100)
@@ -177,6 +178,8 @@ Comparison operands collection is similar to coverage collection: 
	/* Read number of comparisons collected. */

	n = __atomic_load_n(&cover[0], __ATOMIC_RELAXED);

	for (i = 0; i < n; i++) {

		uint64_t ip;



		type = cover[i * KCOV_WORDS_PER_CMP + 1];

		/* arg1 and arg2 - operands of the comparison. */

		arg1 = cover[i * KCOV_WORDS_PER_CMP + 2];
@@ -251,6 +254,8 @@ selectively from different subsystems. 


.. code-block:: c



    /* Same includes and defines as above. */



    struct kcov_remote_arg {

	__u32		trace_mode;

	__u32		area_size;

MAINTAINERS

+17 −4
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ F: drivers/crypto/allwinner/ 
ALLWINNER HARDWARE SPINLOCK SUPPORT

M:	Wilken Gottwalt <wilken.gottwalt@posteo.net>

S:	Maintained

F:	Documentation/devicetree/bindings/hwlock/allwinner,sun6i-hwspinlock.yaml

F:	Documentation/devicetree/bindings/hwlock/allwinner,sun6i-a31-hwspinlock.yaml

F:	drivers/hwspinlock/sun6i_hwspinlock.c









ALLWINNER THERMAL DRIVER








@@ -2783,7 +2783,7 @@ F:	Documentation/devicetree/bindings/arm/toshiba.yaml







F:	Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml









F:	Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml









F:	Documentation/devicetree/bindings/pci/toshiba,visconti-pcie.yaml









F:	Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml









F:	Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml









F:	Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml









F:	arch/arm64/boot/dts/toshiba/









F:	drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c








@@ -7119,6 +7119,20 @@ F:	include/uapi/linux/mdio.h







F:	include/uapi/linux/mii.h









F:	net/core/of_net.c

















EXEC & BINFMT API









R:	Eric Biederman <ebiederm@xmission.com>









R:	Kees Cook <keescook@chromium.org>









F:	arch/alpha/kernel/binfmt_loader.c









F:	arch/x86/ia32/ia32_aout.c









F:	fs/*binfmt_*.c









F:	fs/exec.c









F:	include/linux/binfmts.h









F:	include/linux/elf.h









F:	include/uapi/linux/binfmts.h









F:	tools/testing/selftests/exec/









N:	asm/elf.h









N:	binfmt

















EXFAT FILE SYSTEM









M:	Namjae Jeon <linkinjeon@kernel.org>









M:	Sungjong Seo <sj1557.seo@samsung.com>








@@ -8562,7 +8576,6 @@ M:	John Stultz <john.stultz@linaro.org>







L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	drivers/misc/hisi_hikey_usb.c









F:	Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml

















HISILICON PMU DRIVER









M:	Shaokun Zhang <zhangshaokun@hisilicon.com>








@@ -9621,7 +9634,7 @@ INTEL KEEM BAY DRM DRIVER







M:	Anitha Chrisanthus <anitha.chrisanthus@intel.com>









M:	Edmund Dea <edmund.j.dea@intel.com>









S:	Maintained









F:	Documentation/devicetree/bindings/display/intel,kmb_display.yaml









F:	Documentation/devicetree/bindings/display/intel,keembay-display.yaml









F:	drivers/gpu/drm/kmb/

















INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVER
































arch/alpha/kernel/traps.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -129,9 +129,7 @@ dik_show_trace(unsigned long *sp, const char *loglvl)







		extern char _stext[], _etext[];









		unsigned long tmp = *sp;









		sp++;









		if (tmp < (unsigned long) &_stext)









			continue;









		if (tmp >= (unsigned long) &_etext)









		if (!is_kernel_text(tmp))









			continue;









		printk("%s[<%lx>] %pSR\n", loglvl, tmp, (void *)tmp);









		if (i > 40) {
































arch/microblaze/mm/pgtable.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -34,6 +34,7 @@







#include <linux/mm_types.h>









#include <linux/pgtable.h>









#include <linux/memblock.h>









#include <linux/kallsyms.h>



















#include <asm/pgalloc.h>









#include <linux/io.h>








@@ -171,7 +172,7 @@ void __init mapin_ram(void)







	for (s = 0; s < lowmem_size; s += PAGE_SIZE) {









		f = _PAGE_PRESENT | _PAGE_ACCESSED |









				_PAGE_SHARED | _PAGE_HWEXEC;









		if ((char *) v < _stext || (char *) v >= _etext)









		if (!is_kernel_text(v))









			f |= _PAGE_WRENABLE;









		else









			/* On the MicroBlaze, no user access