summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-01-23 16:13:31 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2021-01-23 16:13:31 +0100
commitd084fe8b5d59276b99fc5931479b7311fbf1a30c (patch)
tree2917eec6dd49fb7955caaec52b7eced1c05b6dfb /Makefile
parent1fd210f0a5e003903f384cd16106bd2414b1b287 (diff)
parent2263955bf7e71ca8419b64d7a60510aad29002f6 (diff)
downloadomap-d084fe8b5d59276b99fc5931479b7311fbf1a30c.tar.gz
Merge 4.19.170 into android-4.19-stable
Changes in 4.19.170 usb: ohci: Make distrust_firmware param default to false compiler.h: Raise minimum version of GCC to 5.1 for arm64 dm integrity: fix flush with external metadata device crypto: x86/crc32c - fix building with clang ias nfsd4: readdirplus shouldn't return parent of export udp: Prevent reuseport_select_sock from reading uninitialized socks netxen_nic: fix MSI/MSI-x interrupts net: mvpp2: Remove Pause and Asym_Pause support rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request esp: avoid unneeded kmap_atomic call net: dcb: Validate netlink message in DCB handler net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands rxrpc: Call state should be read with READ_ONCE() under some circumstances net: stmmac: Fixed mtu channged by cache aligned net: sit: unregister_netdevice on newlink's error path net: avoid 32 x truesize under-estimation for tiny skbs rxrpc: Fix handling of an unsupported token type in rxrpc_read() tipc: fix NULL deref in tipc_link_xmit() net: introduce skb_list_walk_safe for skb segment walking net: skbuff: disambiguate argument and member for skb_list_walk_safe helper net: ipv6: Validate GSO SKB before finish IPv6 processing spi: cadence: cache reference clock rate during probe Linux 4.19.170 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4a12e49eae7097a468161952228c57c974a1b0ac
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f16fb7621fe6..87964445c60c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
-SUBLEVEL = 169
+SUBLEVEL = 170
EXTRAVERSION =
NAME = "People's Front"