]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into x86/entry, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 26 Jun 2020 10:24:42 +0000 (12:24 +0200)
commitff6eafddbee9dbf779fdcb570ecf04c19961dbc0
tree51c0c567b8be2fd56073a8ce31f8ebd123a7d562
parentdb82f1d1fa21e7fb1fe1c154ad21ed92dc31f0b9
parent7a9ea5bf62a3ce336ad2e03f9cc9312e1fa152e9
Merge branch 'linus' into x86/entry, to resolve conflicts

Conflicts:
arch/x86/kernel/traps.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/traps.c
include/linux/compiler_types.h