summaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-11 10:31:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-11 10:31:46 -0800
commit1ce42845f987e92eabfc6e026d44d826c25c74a5 (patch)
treed62cdad8adc590faad42bc656e31b2a8a786a77c /include/net/xfrm.h
parentfdb0ee7c65781464168e2943a3fd6f1e66a397c9 (diff)
parent146fbb766934dc003fcbf755b519acef683576bf (diff)
downloadlinux-1ce42845f987e92eabfc6e026d44d826c25c74a5.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Last minute x86 fixes: - Fix a softlockup detector warning and long delays if using ptdump with KASAN enabled. - Two more TSC-adjust fixes for interesting firmware interactions. - Two commits to fix an AMD CPU topology enumeration bug that caused a measurable gaming performance regression" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/mm/ptdump: Fix soft lockup in page table walker x86/tsc: Make the TSC ADJUST sanitizing work for tsc_reliable x86/tsc: Avoid the large time jump when sanitizing TSC ADJUST x86/CPU/AMD: Fix Zen SMT topology x86/CPU/AMD: Bring back Compute Unit ID
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions