diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-06 22:36:31 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-06 22:36:31 +0100 |
commit | 43a2898631a8beee66c1d64c1e860f43d96b2e91 (patch) | |
tree | fc2a43ca77627443d09621bdb1e364e41b4f3890 /net/ipv4/tcp_dctcp.c | |
parent | Merge tag 'powerpc-5.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
parent | docs/core-api: Remove possibly confusing sub-headings from Bit Operations (diff) | |
download | linux-43a2898631a8beee66c1d64c1e860f43d96b2e91.tar.xz linux-43a2898631a8beee66c1d64c1e860f43d96b2e91.zip |
Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull more powerpc updates from Michael Ellerman:
"A few commits splitting the KASAN instrumented bitops header in three,
to match the split of the asm-generic bitops headers.
This is needed on powerpc because we use the generic bitops for the
non-atomic case only, whereas the existing KASAN instrumented bitops
assume all the underlying operations are provided by the arch as
arch_foo() versions.
Thanks to: Daniel Axtens & Christophe Leroy"
* tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
docs/core-api: Remove possibly confusing sub-headings from Bit Operations
powerpc: support KASAN instrumentation of bitops
kasan: support instrumented bitops combined with generic bitops
Diffstat (limited to 'net/ipv4/tcp_dctcp.c')
0 files changed, 0 insertions, 0 deletions