summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-04-01 10:23:42 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2018-04-01 10:23:42 +0200
commit51e322a7f111b32e1c31c6a6fe213b9f2ca04116 (patch)
treef84cad6f84fa062b443002ee54842169e7a4732b /Makefile
parent331d833ece4f7fcc0b6be45779701526a1d4b06c (diff)
parent9a2e216d9e892249b63d10603c75495749202df9 (diff)
Merge 4.14.32 into android-4.14
Changes in 4.14.32 tcp: reset sk_send_head in tcp_write_queue_purge tcp: purge write queue upon aborting the connection qed: Fix non TCP packets should be dropped on iWARP ll2 connection sysfs: symlink: export sysfs_create_link_nowarn() net: phy: relax error checking when creating sysfs link netdev->phydev devlink: Remove redundant free on error path macvlan: filter out unsupported feature flags net: ipv6: keep sk status consistent after datagram connect failure ipv6: old_dport should be a __be16 in __ip6_datagram_connect() ipv6: sr: fix NULL pointer dereference when setting encap source address ipv6: sr: fix scheduling in RCU when creating seg6 lwtunnel state mlxsw: spectrum_buffers: Set a minimum quota for CPU port traffic net: phy: Tell caller result of phy_change() net sched actions: return explicit error when tunnel_key mode is not specified ppp: avoid loop in xmit recursion detection code rhashtable: Fix rhlist duplicates insertion kcm: lock lower socket in kcm_attach sch_netem: fix skb leak in netem_enqueue() ieee802154: 6lowpan: fix possible NULL deref in lowpan_device_event() net: use skb_to_full_sk() in skb_update_prio() net: Fix hlist corruptions in inet_evict_bucket() dccp: check sk for closed state in dccp_sendmsg() ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() l2tp: do not accept arbitrary sockets net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred net: ethernet: ti: cpsw: add check for in-band mode setting with RGMII PHY interface net: fec: Fix unbalanced PM runtime calls net/iucv: Free memory obtained by kzalloc netlink: avoid a double skb free in genlmsg_mcast() net: Only honor ifindex in IP_PKTINFO if non-0 net: systemport: Rewrite __bcm_sysport_tx_reclaim() qede: Fix qedr link update skbuff: Fix not waking applications when errors are enqueued team: Fix double free in error path soc/fsl/qbman: fix issue in qman_delete_cgr_safe() dpaa_eth: fix error in dpaa_remove() dpaa_eth: remove duplicate initialization dpaa_eth: increment the RX dropped counter when needed dpaa_eth: remove duplicate increment of the tx_errors counter s390/qeth: free netdevice when removing a card s390/qeth: when thread completes, wake up all waiters s390/qeth: lock read device while queueing next buffer s390/qeth: on channel error, reject further cmd requests Linux 4.14.32 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ccca33567811..25be45fdd620 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
-SUBLEVEL = 31
+SUBLEVEL = 32
EXTRAVERSION =
NAME = Petit Gorille