summaryrefslogtreecommitdiff
path: root/net/tipc/trace.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-23 11:57:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-23 11:57:52 -0700
commite9680017b2dc8686a908ea1b51941a91b6da9f1d (patch)
tree5ce46edbf7513cee7620d5f62fa0aaed7ee6e882 /net/tipc/trace.h
parentf488790059fe7be6b2b059ddee10835b2500b603 (diff)
parent8fe76a1c2264a02155895cda9f97a6a5a9b97d91 (diff)
Merge tag 'sh-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz: "This is rather small this time and contains just three changes. The first change by Oscar Salvador drops support for memory hotplug and hotremove for sh as the kernel stopped supporting it on 32-bit platforms since 7ec58a2b941e ("mm/memory_hotplug: restrict CONFIG_MEMORY_HOTPLUG to 64 bit"). That then results in a follow-up change to update all affected board config files. The third change comes from Jeff Johnson which adds the missing MODULE_DESCRIPTION() macro to the push-switch driver" * tag 'sh-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: sh: push-switch: Add missing MODULE_DESCRIPTION() macro sh: config: Drop CONFIG_MEMORY_{HOTPLUG,HOTREMOVE} sh: Drop support for memory hotplug and memory hotremove
Diffstat (limited to 'net/tipc/trace.h')
0 files changed, 0 insertions, 0 deletions