Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed93de84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixlets from Andrew Morton:
 "4 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  tools/objtool/Makefile: don't assume sync-check.sh is executable
  kdump: write correct address of mem_section into vmcoreinfo
  kmemleak: allow to coexist with fault injection
  MAINTAINERS, nilfs2: change project home URLs
parents c92a9a46 0f908ccb

Documentation/filesystems/nilfs2.txt

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ available from the following download page. At least "mkfs.nilfs2", 
cleaner or garbage collector) are required.  Details on the tools are

described in the man pages included in the package.



Project web page:    http://nilfs.sourceforge.net/

Download page:       http://nilfs.sourceforge.net/en/download.html

Project web page:    https://nilfs.sourceforge.io/

Download page:       https://nilfs.sourceforge.io/en/download.html

List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs



Caveats

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9638,8 +9638,8 @@ F: include/uapi/linux/sunrpc/ 
NILFS2 FILESYSTEM

M:	Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

L:	linux-nilfs@vger.kernel.org

W:	http://nilfs.sourceforge.net/

W:	http://nilfs.osdn.jp/

W:	https://nilfs.sourceforge.io/

W:	https://nilfs.osdn.jp/

T:	git git://github.com/konis/nilfs2.git

S:	Supported

F:	Documentation/filesystems/nilfs2.txt

include/linux/crash_core.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ phys_addr_t paddr_vmcoreinfo_note(void); 
	vmcoreinfo_append_str("PAGESIZE=%ld\n", value)

#define VMCOREINFO_SYMBOL(name) \

	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)

#define VMCOREINFO_SYMBOL_ARRAY(name) \

	vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)

#define VMCOREINFO_SIZE(name) \

	vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \

			      (unsigned long)sizeof(name))

kernel/crash_core.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static int __init crash_save_vmcoreinfo_init(void) 
	VMCOREINFO_SYMBOL(contig_page_data);

#endif

#ifdef CONFIG_SPARSEMEM

	VMCOREINFO_SYMBOL(mem_section);

	VMCOREINFO_SYMBOL_ARRAY(mem_section);

	VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);

	VMCOREINFO_STRUCT_SIZE(mem_section);

	VMCOREINFO_OFFSET(mem_section, section_mem_map);

mm/kmemleak.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
/* GFP bitmask for kmemleak internal allocations */

#define gfp_kmemleak_mask(gfp)	(((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \

				 __GFP_NORETRY | __GFP_NOMEMALLOC | \

				 __GFP_NOWARN)

				 __GFP_NOWARN | __GFP_NOFAIL)



/* scanning area inside a memory block */

struct kmemleak_scan_area {