refs/heads/deprecated/android-4-4-n - kernel/common.git

commit: f068d7f0f3ea4e5bd55afdb079652dad68c57b13
[log]
author: Greg Kroah-Hartman <gregkh@google.com>
Fri Nov 29 09:41:18 2019 +0100
committer: Greg Kroah-Hartman <gregkh@google.com>
Fri Nov 29 09:41:18 2019 +0100
tree: bc34b22e16e05b784653c2a44304769a9bff8e34
parent: 212c6f1b614d4fd212965a492db1388fd0ebb4c2 [diff]
parent: 2810f15bcb6e4c1f7663a399488525c219ac45f3 [diff]

Merge 4.4.205 into android-4.4-n

Changes in 4.4.205
	Revert "sock: Reset dst when changing sk_mark via setsockopt"
	Linux 4.4.205

Change-Id: I326abfb60549454743bac5704479cda98831ae81
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>