1
0
Fork 0
alistair23-linux/arch
Linus Torvalds a67012412e It appears that the zero-day bot did find a bug in my sh build.
And that I didn't have the bad code in my config file when I
 cross compiled it, although there are a few other errors in sh
 that makes it not build for me, I missed that I added one more.
 
 I replaced WARN_ON(current->curr_ret_stack) with
  WARN_ON(ftrace_graph_get_ret_stack(current, 1) where it should be:
  WARN_ON(ftrace_graph_get_ret_stack(current, 1))
 -----BEGIN PGP SIGNATURE-----
 
 iIoEABYIADIWIQRRSw7ePDh/lE+zeZMp5XQQmuv6qgUCXC7PuRQccm9zdGVkdEBn
 b29kbWlzLm9yZwAKCRAp5XQQmuv6qv7rAQDMtgYCknUW6P5TOgytQ9x7+TfMld1O
 mqD689wl9Rb5GwD/ec9BsDoSu7jeVizb7Si1kUAPYndV4E/3NFbwSZbaqAU=
 =W7wU
 -----END PGP SIGNATURE-----

Merge tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull ftrace sh build fix from Steven Rostedt:
 "It appears that the zero-day bot did find a bug in my sh build.

  And that I didn't have the bad code in my config file when I cross
  compiled it, although there are a few other errors in sh that makes it
  not build for me, I missed that I added one more"

* tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  sh: ftrace: Fix missing parenthesis in WARN_ON()
2019-01-05 14:08:00 -08:00
..
alpha Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
arc Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2019-01-05 13:25:58 -08:00
arm Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2019-01-05 13:25:58 -08:00
arm64 ARM: SoC: late updates 2019-01-05 11:30:37 -08:00
c6x Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
csky arch/csky patches for 4.21-rc1 2019-01-05 09:50:07 -08:00
h8300 h8300 build problem fix. 2019-01-05 11:35:55 -08:00
hexagon Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
ia64 Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
m68k Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
microblaze Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
mips A few early MIPS fixes for 4.21: 2019-01-05 12:48:25 -08:00
nds32 Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
nios2 Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
openrisc Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
parisc Merge branch 'parisc-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 2019-01-05 11:44:20 -08:00
powerpc powerpc fixes for 4.21 #2 2019-01-05 11:48:44 -08:00
riscv Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
s390 Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
sh It appears that the zero-day bot did find a bug in my sh build. 2019-01-05 14:08:00 -08:00
sparc Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2019-01-05 13:25:58 -08:00
um Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
unicore32 Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
x86 Merge branch 'mount.part1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2019-01-05 13:25:58 -08:00
xtensa Merge branch 'akpm' (patches from Andrew) 2019-01-05 09:16:18 -08:00
.gitignore
Kconfig mm: speed up mremap by 20x on large regions 2019-01-04 13:13:48 -08:00