summaryrefslogtreecommitdiff
path: root/net/ipv6/exthdrs_offload.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-09 12:25:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-09 12:25:42 -0800
commit2b369478e1856e3809f439495567474725931585 (patch)
tree717b0016c8fcc0c5255b14778c89530070fbe475 /net/ipv6/exthdrs_offload.c
parent99378fd26803328cbab64ae60fa98e1394d07a6d (diff)
parent8672aed7bd865774257efd40929702759a869329 (diff)
Merge tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fix from Kees Cook: "Fix pstore regression (boot Oops) when ftrace disabled, from Brian Norris" * tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: don't OOPS when there are no ftrace zones
Diffstat (limited to 'net/ipv6/exthdrs_offload.c')
0 files changed, 0 insertions, 0 deletions
subject'>Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni: "A single fix for this cycle. It is worth taking it for 4.10 so that distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to y in their config. Summary: - Allow jz4740 to build as a module again by using kernel_halt()" * tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'tools/testing/selftests/rcutorture/configs/lock/LOCK05')