summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-04-30 06:18:45 -0700
committerGreg Kroah-Hartman <gregkh@google.com>2018-04-30 06:18:45 -0700
commit3f8d1912e9140e603df0d42211fa4739655d5a3c (patch)
treedbb842b5d68667cab223a45cfbe78c423e3f10aa /Makefile
parentd23515ea8a7fdd0f5015b81232d3ef2056cf577e (diff)
parenta87463f7420cd33c8cb3ece420468023c16f27b4 (diff)
Merge 4.14.38 into android-4.14
Changes in 4.14.38 Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs i40e: Fix attach VF to VM issue tpm: cmd_ready command can be issued only after granting locality tpm: tpm-interface: fix tpm_transmit/_cmd kdoc tpm: add retry logic Revert "ath10k: send (re)assoc peer command when NSS changed" bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy ipv6: sr: fix NULL pointer dereference in seg6_do_srh_encap()- v4 pkts KEYS: DNS: limit the length of option strings l2tp: check sockaddr length in pppol2tp_connect() net: validate attribute sizes in neigh_dump_table() llc: delete timers synchronously in llc_sk_free() tcp: don't read out-of-bounds opsize net: af_packet: fix race in PACKET_{R|T}X_RING tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: fix deadlock while clearing neighbor proxy table team: avoid adding twice the same option to the event list net/smc: fix shutdown in state SMC_LISTEN team: fix netconsole setup over team packet: fix bitfield update race tipc: add policy for TIPC_NLA_NET_ADDR pppoe: check sockaddr length in pppoe_connect() vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi amd-xgbe: Add pre/post auto-negotiation phy hooks sctp: do not check port in sctp_inet6_cmp_addr amd-xgbe: Improve KR auto-negotiation and training strparser: Do not call mod_delayed_work with a timeout of LONG_MAX amd-xgbe: Only use the SFP supported transceiver signals strparser: Fix incorrect strp->need_bytes value. net: sched: ife: signal not finding metaid tcp: clear tp->packets_out when purging write queue net: sched: ife: handle malformed tlv length net: sched: ife: check on metadata length llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED net: ethernet: ti: cpsw: fix tx vlan priority mapping virtio_net: split out ctrl buffer virtio_net: fix adding vids on big-endian s390: introduce CPU alternatives s390: enable CPU alternatives unconditionally KVM: s390: wire up bpb feature s390: scrub registers on kernel entry and KVM exit s390: add optimized array_index_mask_nospec s390/alternative: use a copy of the facility bit mask s390: add options to change branch prediction behaviour for the kernel s390: run user space and KVM guests with modified branch prediction s390: introduce execute-trampolines for branches KVM: s390: force bp isolation for VSIE s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) s390: do not bypass BPENTER for interrupt system calls s390/entry.S: fix spurious zeroing of r0 s390: move nobp parameter functions to nospec-branch.c s390: add automatic detection of the spectre defense s390: report spectre mitigation via syslog s390: add sysfs attributes for spectre s390: correct nospec auto detection init order s390: correct module section names for expoline code revert microblaze: Setup dependencies for ASM optimized lib functions arm64: dts: rockchip: remove vdd_log from rk3399-puma Revert "mm/hmm: fix header file if/else/endif maze" commoncap: Handle memory allocation failure. scsi: mptsas: Disable WRITE SAME cdrom: information leak in cdrom_ioctl_media_changed() fsnotify: Fix fsnotify_mark_connector race m68k/mac: Don't remap SWIM MMIO region block/swim: Check drive type block/swim: Don't log an error message for an invalid ioctl block/swim: Remove extra put_disk() call from error path block/swim: Rename macros to avoid inconsistent inverted logic block/swim: Select appropriate drive on device open block/swim: Fix array bounds check block/swim: Fix IO error at end of medium tracing: Fix missing tab for hwlat_detector print format s390/cio: update chpid descriptor after resource accessibility event s390/dasd: fix IO error for newly defined devices s390/uprobes: implement arch_uretprobe_is_alive() ACPI / video: Only default only_lcd to true on Win8-ready _desktops_ Linux 4.14.38 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 064c38ebb209..19b7aba91f98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
-SUBLEVEL = 37
+SUBLEVEL = 38
EXTRAVERSION =
NAME = Petit Gorille