tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
"6 patches.

Subsystems affected by this patch series: mm/pagemap, scripts,
MAINTAINERS, and h8300"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
MAINTAINERS: add Andrey Konovalov to KASAN reviewers
MAINTAINERS: update Andrey Konovalov's email address
MAINTAINERS: update KASAN file list
scripts/recordmcount.pl: support big endian for ARCH sh
m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU

Linus Torvalds 25cbda46 8cc8e6aa

+14 -5
+5 -3
MAINTAINERS
··· 9561 9561 KASAN 9562 9562 M: Andrey Ryabinin <ryabinin.a.a@gmail.com> 9563 9563 R: Alexander Potapenko <glider@google.com> 9564 + R: Andrey Konovalov <andreyknvl@gmail.com> 9564 9565 R: Dmitry Vyukov <dvyukov@google.com> 9565 9566 L: kasan-dev@googlegroups.com 9566 9567 S: Maintained 9567 9568 F: Documentation/dev-tools/kasan.rst 9568 - F: arch/*/include/asm/kasan.h 9569 + F: arch/*/include/asm/*kasan.h 9569 9570 F: arch/*/mm/kasan_init* 9570 9571 F: include/linux/kasan*.h 9571 - F: lib/test_kasan.c 9572 + F: lib/Kconfig.kasan 9573 + F: lib/test_kasan*.c 9572 9574 F: mm/kasan/ 9573 9575 F: scripts/Makefile.kasan 9574 9576 ··· 9585 9583 9586 9584 KCOV 9587 9585 R: Dmitry Vyukov <dvyukov@google.com> 9588 - R: Andrey Konovalov <andreyknvl@google.com> 9586 + R: Andrey Konovalov <andreyknvl@gmail.com> 9589 9587 L: kasan-dev@googlegroups.com 9590 9588 S: Maintained 9591 9589 F: Documentation/dev-tools/kcov.rst
+3
arch/h8300/kernel/asm-offsets.c
··· 63 63 OFFSET(TI_FLAGS, thread_info, flags); 64 64 OFFSET(TI_CPU, thread_info, cpu); 65 65 OFFSET(TI_PRE, thread_info, preempt_count); 66 + #ifdef CONFIG_PREEMPTION 67 + DEFINE(TI_PRE_COUNT, offsetof(struct thread_info, preempt_count)); 68 + #endif 66 69 67 70 return 0; 68 71 }
+1 -1
arch/m68k/include/asm/page.h
··· 62 62 #include <asm/page_no.h> 63 63 #endif 64 64 65 - #ifdef CONFIG_DISCONTIGMEM 65 + #if !defined(CONFIG_MMU) || defined(CONFIG_DISCONTIGMEM) 66 66 #define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT)) 67 67 #define __pfn_to_phys(pfn) PFN_PHYS(pfn) 68 68 #endif
+5 -1
scripts/recordmcount.pl
··· 265 265 266 266 # force flags for this arch 267 267 $ld .= " -m shlelf_linux"; 268 - $objcopy .= " -O elf32-sh-linux"; 268 + if ($endian eq "big") { 269 + $objcopy .= " -O elf32-shbig-linux"; 270 + } else { 271 + $objcopy .= " -O elf32-sh-linux"; 272 + } 269 273 270 274 } elsif ($arch eq "powerpc") { 271 275 my $ldemulation;