]> www.infradead.org Git - users/jedix/linux-maple.git/log
users/jedix/linux-maple.git
4 years agoscripts/spelling.txt: add "overlfow"
Drew Fustini [Thu, 22 Apr 2021 06:43:23 +0000 (16:43 +1000)]
scripts/spelling.txt: add "overlfow"

Add typo "overlfow" for "overflow". This typo was found and fixed in
net/sctp/tsnmap.c.

Link: https://lore.kernel.org/netdev/20210304055548.56829-1-drew@beagleboard.org/
Link: https://lkml.kernel.org/r/20210304072657.64577-1-drew@beagleboard.org
Signed-off-by: Drew Fustini <drew@beagleboard.org>
Suggested-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agoarm: print alloc free paths for address in registers
Maninder Singh [Thu, 22 Apr 2021 06:43:23 +0000 (16:43 +1000)]
arm: print alloc free paths for address in registers

In case of a use after free kernel oops, the freeing path of the object is
required to debug futher.  In most of cases the object address is present
in one of the registers.

Thus check the register's address and if it belongs to slab, print its
alloc and free path.

e.g.  in the below issue register r6 belongs to slab, and a use after free
issue occurred on one of its dereferenced values:

[   20.182197] Unable to handle kernel paging request at virtual address 6b6b6b6f
....
[   20.185035] pc : [<c0538afc>]    lr : [<c0465674>]    psr: 60000013
[   20.185271] sp : c8927d40  ip : ffffefff  fp : c8aa8020
[   20.185462] r10: c8927e10  r9 : 00000001  r8 : 00400cc0
[   20.185674] r7 : 00000000  r6 : c8ab0180  r5 : c1804a80  r4 : c8aa8008
[   20.185924] r3 : c1a5661c  r2 : 00000000  r1 : 6b6b6b6b  r0 : c139bf48
.....
[   20.191499] Register r6 information: slab kmalloc-64 start c8ab0140 data offset 64 pointer offset 0 size 64 allocated at meminfo_proc_show+0x40/0x4fc
[   20.192078]     meminfo_proc_show+0x40/0x4fc
[   20.192263]     seq_read_iter+0x18c/0x4c4
[   20.192430]     proc_reg_read_iter+0x84/0xac
[   20.192617]     generic_file_splice_read+0xe8/0x17c
[   20.192816]     splice_direct_to_actor+0xb8/0x290
[   20.193008]     do_splice_direct+0xa0/0xe0
[   20.193185]     do_sendfile+0x2d0/0x438
[   20.193345]     sys_sendfile64+0x12c/0x140
[   20.193523]     ret_fast_syscall+0x0/0x58
[   20.193695]     0xbeeacde4
[   20.193822]  Free path:
[   20.193935]     meminfo_proc_show+0x5c/0x4fc
[   20.194115]     seq_read_iter+0x18c/0x4c4
[   20.194285]     proc_reg_read_iter+0x84/0xac
[   20.194475]     generic_file_splice_read+0xe8/0x17c
[   20.194685]     splice_direct_to_actor+0xb8/0x290
[   20.194870]     do_splice_direct+0xa0/0xe0
[   20.195014]     do_sendfile+0x2d0/0x438
[   20.195174]     sys_sendfile64+0x12c/0x140
[   20.195336]     ret_fast_syscall+0x0/0x58
[   20.195491]     0xbeeacde4

Link: https://lkml.kernel.org/r/1615891032-29160-3-git-send-email-maninder1.s@samsung.com
Co-developed-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agomm/vmalloc: remove vwrite()
David Hildenbrand [Thu, 22 Apr 2021 06:43:23 +0000 (16:43 +1000)]
mm/vmalloc: remove vwrite()

The last user (/dev/kmem) is gone. Let's drop it.

Link: https://lkml.kernel.org/r/20210324102351.6932-4-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hillf Danton <hdanton@sina.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sonymobile.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: huang ying <huang.ying.caritas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agomm: remove xlate_dev_kmem_ptr()
David Hildenbrand [Thu, 22 Apr 2021 06:43:22 +0000 (16:43 +1000)]
mm: remove xlate_dev_kmem_ptr()

Since /dev/kmem has been removed, let's remove the xlate_dev_kmem_ptr()
leftovers.

Link: https://lkml.kernel.org/r/20210324102351.6932-3-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Palmer Dabbelt <palmerdabbelt@google.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: Pierre Morel <pmorel@linux.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agodrivers/char: remove /dev/kmem for good
David Hildenbrand [Thu, 22 Apr 2021 06:43:22 +0000 (16:43 +1000)]
drivers/char: remove /dev/kmem for good

Patch series "drivers/char: remove /dev/kmem for good".

Exploring /dev/kmem and /dev/mem in the context of memory hot(un)plug and
memory ballooning, I started questioning the existence of /dev/kmem.

Comparing it with the /proc/kcore implementation, it does not seem to be
able to deal with things like

a) Pages unmapped from the direct mapping (e.g., to be used by secretmem)
  -> kern_addr_valid(). virt_addr_valid() is not sufficient.

b) Special cases like gart aperture memory that is not to be touched
  -> mem_pfn_is_ram()

Unless I am missing something, it's at least broken in some cases and might
fault/crash the machine.

Looks like its existence has been questioned before in 2005 and 2010 [1],
after ~11 additional years, it might make sense to revive the discussion.

CONFIG_DEVKMEM is only enabled in a single defconfig (on purpose or by
mistake?).  All distributions disable it: in Ubuntu it has been disabled
for more than 10 years, in Debian since 2.6.31, in Fedora at least
starting with FC3, in RHEL starting with RHEL4, in SUSE starting from
15sp2, and OpenSUSE has it disabled as well.

1) /dev/kmem was popular for rootkits [2] before it got disabled
   basically everywhere. Ubuntu documents [3] "There is no modern user of
   /dev/kmem any more beyond attackers using it to load kernel rootkits.".
   RHEL documents in a BZ [5] "it served no practical purpose other than to
   serve as a potential security problem or to enable binary module drivers
   to access structures/functions they shouldn't be touching"

2) /proc/kcore is a decent interface to have a controlled way to read
   kernel memory for debugging puposes. (will need some extensions to
   deal with memory offlining/unplug, memory ballooning, and poisoned
   pages, though)

3) It might be useful for corner case debugging [1]. KDB/KGDB might be a
   better fit, especially, to write random memory; harder to shoot
   yourself into the foot.

4) "Kernel Memory Editor" [4] hasn't seen any updates since 2000 and seems
   to be incompatible with 64bit [1]. For educational purposes,
   /proc/kcore might be used to monitor value updates -- or older
   kernels can be used.

5) It's broken on arm64, and therefore, completely disabled there.

Looks like it's essentially unused and has been replaced by better
suited interfaces for individual tasks (/proc/kcore, KDB/KGDB). Let's
just remove it.

[1] https://lwn.net/Articles/147901/
[2] https://www.linuxjournal.com/article/10505
[3] https://wiki.ubuntu.com/Security/Features#A.2Fdev.2Fkmem_disabled
[4] https://sourceforge.net/projects/kme/
[5] https://bugzilla.redhat.com/show_bug.cgi?id=154796

Link: https://lkml.kernel.org/r/20210324102351.6932-1-david@redhat.com
Link: https://lkml.kernel.org/r/20210324102351.6932-2-david@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Alexander A. Klimov" <grandmaster@al2klimov.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Chris Zankel <chris@zankel.net>
Cc: Corentin Labbe <clabbe@baylibre.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Hillf Danton <hdanton@sina.com>
Cc: huang ying <huang.ying.caritas@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: James Troup <james.troup@canonical.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kairui Song <kasong@redhat.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Niklas Schnelle <schnelle@linux.ibm.com>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sonymobile.com>
Cc: openrisc@lists.librecores.org
Cc: Palmer Dabbelt <palmerdabbelt@google.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "Pavel Machek (CIP)" <pavel@denx.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Pierre Morel <pmorel@linux.ibm.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Rich Felker <dalias@libc.org>
Cc: Robert Richter <rric@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: sparclinux@vger.kernel.org
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Theodore Dubois <tblodt@icloud.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: William Cohen <wcohen@redhat.com>
Cc: Xiaoming Ni <nixiaoming@huawei.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agomm: fix some typos and code style problems
Shijie Luo [Thu, 22 Apr 2021 06:43:22 +0000 (16:43 +1000)]
mm: fix some typos and code style problems

fix some typos and code style problems in mm.

gfp.h: s/MAXNODES/MAX_NUMNODES
mmzone.h: s/then/than
rmap.c: s/__vma_split()/__vma_adjust()
swap.c: s/__mod_zone_page_stat/__mod_zone_page_state, s/is is/is
swap_state.c: s/whoes/whose
z3fold.c: code style problem fix in z3fold_unregister_migration
zsmalloc.c: s/of/or, s/give/given

Link: https://lkml.kernel.org/r/20210419083057.64820-1-luoshijie1@huawei.com
Signed-off-by: Shijie Luo <luoshijie1@huawei.com>
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
4 years agoMerge branch 'akpm-current/current'
Stephen Rothwell [Thu, 6 May 2021 01:31:40 +0000 (11:31 +1000)]
Merge branch 'akpm-current/current'

4 years agoMerge remote-tracking branch 'tpmdd-jejb/tpmdd-for-next'
Stephen Rothwell [Thu, 6 May 2021 01:08:47 +0000 (11:08 +1000)]
Merge remote-tracking branch 'tpmdd-jejb/tpmdd-for-next'

4 years agoMerge remote-tracking branch 'rust/rust-next'
Stephen Rothwell [Thu, 6 May 2021 00:54:03 +0000 (10:54 +1000)]
Merge remote-tracking branch 'rust/rust-next'

# Conflicts:
# Makefile
# include/uapi/linux/android/binder.h
# kernel/printk/printk.c

4 years agoMerge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup'
Stephen Rothwell [Thu, 6 May 2021 00:42:21 +0000 (10:42 +1000)]
Merge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup'

4 years agoMerge remote-tracking branch 'hyperv/hyperv-next'
Stephen Rothwell [Thu, 6 May 2021 00:40:42 +0000 (10:40 +1000)]
Merge remote-tracking branch 'hyperv/hyperv-next'

4 years agoMerge remote-tracking branch 'nvmem/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:39:06 +0000 (10:39 +1000)]
Merge remote-tracking branch 'nvmem/for-next'

4 years agoMerge remote-tracking branch 'slimbus/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:37:30 +0000 (10:37 +1000)]
Merge remote-tracking branch 'slimbus/for-next'

# Conflicts:
# drivers/nvmem/Kconfig
# drivers/nvmem/Makefile

4 years agoMerge remote-tracking branch 'gnss/gnss-next'
Stephen Rothwell [Thu, 6 May 2021 00:35:48 +0000 (10:35 +1000)]
Merge remote-tracking branch 'gnss/gnss-next'

4 years agoMerge remote-tracking branch 'kspp/for-next/kspp'
Stephen Rothwell [Thu, 6 May 2021 00:35:47 +0000 (10:35 +1000)]
Merge remote-tracking branch 'kspp/for-next/kspp'

4 years agoMerge remote-tracking branch 'nvdimm/libnvdimm-for-next'
Stephen Rothwell [Thu, 6 May 2021 00:35:45 +0000 (10:35 +1000)]
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'

4 years agoMerge remote-tracking branch 'coresight/next'
Stephen Rothwell [Thu, 6 May 2021 00:35:42 +0000 (10:35 +1000)]
Merge remote-tracking branch 'coresight/next'

4 years agoMerge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:35:41 +0000 (10:35 +1000)]
Merge remote-tracking branch 'livepatching/for-next'

4 years agoMerge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:21:03 +0000 (10:21 +1000)]
Merge remote-tracking branch 'userns/for-next'

4 years agoMerge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:21:02 +0000 (10:21 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'

4 years agoMerge remote-tracking branch 'gpio-intel/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:21:01 +0000 (10:21 +1000)]
Merge remote-tracking branch 'gpio-intel/for-next'

4 years agoMerge remote-tracking branch 'rpmsg/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:20:58 +0000 (10:20 +1000)]
Merge remote-tracking branch 'rpmsg/for-next'

4 years agoMerge remote-tracking branch 'vhost/linux-next'
Stephen Rothwell [Thu, 6 May 2021 00:18:53 +0000 (10:18 +1000)]
Merge remote-tracking branch 'vhost/linux-next'

4 years agoMerge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:17:17 +0000 (10:17 +1000)]
Merge remote-tracking branch 'scsi/for-next'

4 years agoMerge remote-tracking branch 'phy-next/next'
Stephen Rothwell [Thu, 6 May 2021 00:17:15 +0000 (10:17 +1000)]
Merge remote-tracking branch 'phy-next/next'

4 years agoMerge remote-tracking branch 'usb-chipidea-next/for-usb-next'
Stephen Rothwell [Thu, 6 May 2021 00:15:39 +0000 (10:15 +1000)]
Merge remote-tracking branch 'usb-chipidea-next/for-usb-next'

4 years agoMerge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:13:27 +0000 (10:13 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'

4 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:13:26 +0000 (10:13 +1000)]
Merge remote-tracking branch 'percpu/for-next'

4 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 6 May 2021 00:11:06 +0000 (10:11 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

4 years agoMerge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Thu, 6 May 2021 00:09:01 +0000 (10:09 +1000)]
Merge remote-tracking branch 'ftrace/for-next'

4 years agoMerge remote-tracking branch 'irqchip/irq/irqchip-next'
Stephen Rothwell [Thu, 6 May 2021 00:07:43 +0000 (10:07 +1000)]
Merge remote-tracking branch 'irqchip/irq/irqchip-next'

4 years agoMerge remote-tracking branch 'edac/edac-for-next'
Stephen Rothwell [Thu, 6 May 2021 00:07:43 +0000 (10:07 +1000)]
Merge remote-tracking branch 'edac/edac-for-next'

4 years agoMerge remote-tracking branch 'keys/keys-next'
Stephen Rothwell [Thu, 6 May 2021 00:07:42 +0000 (10:07 +1000)]
Merge remote-tracking branch 'keys/keys-next'

# Conflicts:
# certs/system_keyring.c

4 years agoMerge remote-tracking branch 'apparmor/apparmor-next'
Stephen Rothwell [Thu, 6 May 2021 00:05:10 +0000 (10:05 +1000)]
Merge remote-tracking branch 'apparmor/apparmor-next'

4 years agoMerge remote-tracking branch 'security/next-testing'
Stephen Rothwell [Thu, 6 May 2021 00:05:08 +0000 (10:05 +1000)]
Merge remote-tracking branch 'security/next-testing'

4 years agoMerge remote-tracking branch 'pcmcia/pcmcia-next'
Stephen Rothwell [Thu, 6 May 2021 00:03:30 +0000 (10:03 +1000)]
Merge remote-tracking branch 'pcmcia/pcmcia-next'

4 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:55:00 +0000 (09:55 +1000)]
Merge remote-tracking branch 'block/for-next'

4 years agoMerge remote-tracking branch 'etnaviv/etnaviv/next'
Stephen Rothwell [Wed, 5 May 2021 23:53:14 +0000 (09:53 +1000)]
Merge remote-tracking branch 'etnaviv/etnaviv/next'

4 years agoMerge remote-tracking branch 'imx-drm/imx-drm/next'
Stephen Rothwell [Wed, 5 May 2021 23:53:14 +0000 (09:53 +1000)]
Merge remote-tracking branch 'imx-drm/imx-drm/next'

# Conflicts:
# drivers/gpu/drm/imx/ipuv3-plane.c

4 years agoMerge remote-tracking branch 'drm-msm/msm-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:11 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-msm/msm-next'

4 years agoMerge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:10 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

4 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:53:09 +0000 (09:53 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

4 years agonext-20210504/amdgpu
Stephen Rothwell [Wed, 5 May 2021 23:41:14 +0000 (09:41 +1000)]
next-20210504/amdgpu

4 years agoMerge remote-tracking branch 'drm-misc/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:27:28 +0000 (09:27 +1000)]
Merge remote-tracking branch 'drm-misc/for-linux-next'

4 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 5 May 2021 23:25:45 +0000 (09:25 +1000)]
Merge remote-tracking branch 'bluetooth/master'

4 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:23:34 +0000 (09:23 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

4 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:21:28 +0000 (09:21 +1000)]
Merge remote-tracking branch 'pm/linux-next'

4 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Wed, 5 May 2021 23:20:11 +0000 (09:20 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

4 years agoMerge remote-tracking branch 'i3c/i3c/next'
Stephen Rothwell [Wed, 5 May 2021 23:18:33 +0000 (09:18 +1000)]
Merge remote-tracking branch 'i3c/i3c/next'

4 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:18:32 +0000 (09:18 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

4 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:15:59 +0000 (09:15 +1000)]
Merge remote-tracking branch 'hid/for-next'

4 years agoMerge remote-tracking branch 'printk/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:15:57 +0000 (09:15 +1000)]
Merge remote-tracking branch 'printk/for-next'

4 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:16 +0000 (09:13 +1000)]
Merge remote-tracking branch 'vfs/for-next'

4 years agoMerge remote-tracking branch 'iomap/iomap-for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:15 +0000 (09:13 +1000)]
Merge remote-tracking branch 'iomap/iomap-for-next'

4 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:14 +0000 (09:13 +1000)]
Merge remote-tracking branch 'xfs/for-next'

4 years agoMerge remote-tracking branch 'v9fs/9p-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:13 +0000 (09:13 +1000)]
Merge remote-tracking branch 'v9fs/9p-next'

4 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:11 +0000 (09:13 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

4 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:10 +0000 (09:13 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

4 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 5 May 2021 23:13:09 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ext3/for_next'

4 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 5 May 2021 23:13:07 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

4 years agoMerge remote-tracking branch 'cifsd/cifsd-for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:06 +0000 (09:13 +1000)]
Merge remote-tracking branch 'cifsd/cifsd-for-next'

4 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Wed, 5 May 2021 23:13:03 +0000 (09:13 +1000)]
Merge remote-tracking branch 'ceph/master'

4 years agoMerge remote-tracking branch 'btrfs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:03 +0000 (09:13 +1000)]
Merge remote-tracking branch 'btrfs/for-next'

4 years agoMerge remote-tracking branch 'pidfd/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:13:02 +0000 (09:13 +1000)]
Merge remote-tracking branch 'pidfd/for-next'

4 years agoMerge remote-tracking branch 'sh/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:12 +0000 (09:08 +1000)]
Merge remote-tracking branch 'sh/for-next'

4 years agoMerge remote-tracking branch 's390/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:12 +0000 (09:08 +1000)]
Merge remote-tracking branch 's390/for-next'

4 years agoMerge remote-tracking branch 'risc-v/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:11 +0000 (09:08 +1000)]
Merge remote-tracking branch 'risc-v/for-next'

# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
# arch/riscv/kernel/setup.c
# arch/riscv/mm/kasan_init.c

4 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 5 May 2021 23:08:10 +0000 (09:08 +1000)]
Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/Kconfig

4 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:06 +0000 (09:08 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'

4 years agoMerge remote-tracking branch 'csky/linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:06 +0000 (09:08 +1000)]
Merge remote-tracking branch 'csky/linux-next'

4 years agoMerge remote-tracking branch 'ti-k3/ti-k3-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:05 +0000 (09:08 +1000)]
Merge remote-tracking branch 'ti-k3/ti-k3-next'

4 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)]
Merge remote-tracking branch 'tegra/for-next'

4 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:08:00 +0000 (09:08 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

4 years agoMerge remote-tracking branch 'scmi/for-linux-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:57 +0000 (09:07 +1000)]
Merge remote-tracking branch 'scmi/for-linux-next'

4 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:56 +0000 (09:07 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'

4 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)]
Merge remote-tracking branch 'rockchip/for-next'

4 years agoMerge remote-tracking branch 'reset/reset/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:54 +0000 (09:07 +1000)]
Merge remote-tracking branch 'reset/reset/next'

# Conflicts:
# drivers/reset/core.c

4 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:50 +0000 (09:07 +1000)]
Merge remote-tracking branch 'renesas/next'

4 years agoMerge remote-tracking branch 'realtek/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:50 +0000 (09:07 +1000)]
Merge remote-tracking branch 'realtek/for-next'

4 years agoMerge remote-tracking branch 'raspberrypi/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:49 +0000 (09:07 +1000)]
Merge remote-tracking branch 'raspberrypi/for-next'

# Conflicts:
# arch/arm/boot/dts/bcm2711.dtsi

4 years agoMerge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:42 +0000 (09:07 +1000)]
Merge remote-tracking branch 'qcom/for-next'

4 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:36 +0000 (09:07 +1000)]
Merge remote-tracking branch 'omap/for-next'

4 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:35 +0000 (09:07 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

4 years agoMerge remote-tracking branch 'mediatek/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:33 +0000 (09:07 +1000)]
Merge remote-tracking branch 'mediatek/for-next'

4 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 5 May 2021 23:07:33 +0000 (09:07 +1000)]
Merge remote-tracking branch 'keystone/next'

4 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:27 +0000 (09:07 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

4 years agoMerge remote-tracking branch 'drivers-memory/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:27 +0000 (09:07 +1000)]
Merge remote-tracking branch 'drivers-memory/for-next'

4 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:24 +0000 (09:07 +1000)]
Merge remote-tracking branch 'at91/at91-next'

4 years agoMerge remote-tracking branch 'aspeed/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:22 +0000 (09:07 +1000)]
Merge remote-tracking branch 'aspeed/for-next'

4 years agoMerge remote-tracking branch 'amlogic/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:20 +0000 (09:07 +1000)]
Merge remote-tracking branch 'amlogic/for-next'

4 years agoMerge remote-tracking branch 'actions/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:19 +0000 (09:07 +1000)]
Merge remote-tracking branch 'actions/for-next'

4 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:19 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

# Conflicts:
# arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

4 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Wed, 5 May 2021 23:07:09 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
# arch/arm64/kernel/alternative.c

4 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 5 May 2021 23:07:07 +0000 (09:07 +1000)]
Merge remote-tracking branch 'arm/for-next'

4 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Wed, 5 May 2021 23:07:06 +0000 (09:07 +1000)]
Merge remote-tracking branch 'asm-generic/master'

4 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 5 May 2021 22:52:07 +0000 (08:52 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

4 years agoMerge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:06 +0000 (08:49 +1000)]
Merge remote-tracking branch 'drm-misc-fixes/for-linux-next-fixes'

# Conflicts:
# drivers/gpu/drm/ttm/ttm_bo.c

4 years agoMerge remote-tracking branch 'pidfd-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:03 +0000 (08:49 +1000)]
Merge remote-tracking branch 'pidfd-fixes/fixes'

4 years agoMerge remote-tracking branch 'rtc-fixes/rtc-fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:01 +0000 (08:49 +1000)]
Merge remote-tracking branch 'rtc-fixes/rtc-fixes'

4 years agoMerge remote-tracking branch 'scsi-fixes/fixes'
Stephen Rothwell [Wed, 5 May 2021 22:49:00 +0000 (08:49 +1000)]
Merge remote-tracking branch 'scsi-fixes/fixes'