diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2021-03-21 22:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2021-03-21 22:16:08 +0100 |
| commit | ca8778c45e401067cefe2abbfb8b547c30d45908 (patch) | |
| tree | c10beaf40adb2bbc6a8933f87ff9da7a5366bf42 /arch/x86/math-emu | |
| parent | x86/kaslr: Return boolean values from a function returning bool (diff) | |
| parent | Merge tag 'io_uring-5.12-2021-03-21' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-ca8778c45e401067cefe2abbfb8b547c30d45908.tar.gz linux-ca8778c45e401067cefe2abbfb8b547c30d45908.tar.bz2 linux-ca8778c45e401067cefe2abbfb8b547c30d45908.zip | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
Conflicts:
arch/x86/kernel/kprobes/ftrace.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/math-emu')
0 files changed, 0 insertions, 0 deletions