summaryrefslogtreecommitdiff
path: root/include/net/ipcomp.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/ipcomp.h')
0 files changed, 0 insertions, 0 deletions
nux/net-next.git/diff/net?id=69978aa0f21f43529e11f924504dadb6ce2f229a&id2=0d6da872d3e4a60f43c295386d7ff9a4cdcd57e9'>diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "Another two bug fixes: - ptrace partial write information leak - a guest page hinting regression introduced with v4.6" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/mm: Fix cmma unused transfer from pgste into pte s390/ptrace: Preserve previous registers for short regset write
Diffstat (limited to 'net')