projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72e8598 6620daa)
Merge 4.9.205 into android-4.9-q
authorGreg Kroah-Hartman <gregkh@google.com>
Fri, 29 Nov 2019 09:03:20 +0000 (10:03 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Fri, 29 Nov 2019 09:03:20 +0000 (10:03 +0100)
Changes in 4.9.205
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Linux 4.9.205

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1  2 
Makefile patch | diff1 | diff2 | blob | history
net/core/sock.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc net/core/sock.c
Simple merge