summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-11-10 08:01:52 -0800
committerGreg Kroah-Hartman <gregkh@google.com>2018-11-10 08:01:52 -0800
commit494c2659e60e1f872c1dfc3159068b183b4a252c (patch)
tree4561ceb12cc77ed834920af37a34a6c0cfd4ecc2 /Makefile
parent87485dbe777b1114409acb43210000524ca01d15 (diff)
parent0b047cbc44ae7d0cea41a99cd7ec1f009360a605 (diff)
Merge 4.14.80 into android-4.14
Changes in 4.14.80 eeprom: at24: Add support for address-width property vfs: swap names of {do,vfs}_clone_file_range() USB: serial: option: improve Quectel EP06 detection USB: serial: option: add two-endpoints device-id flag bpf: fix partial copy of map_ptr when dst is scalar Revert "ARM: tegra: Fix ULPI regression on Tegra20" fsnotify: fix ignore mask logic in fsnotify() gpio: mxs: Get rid of external API call xfs: truncate transaction does not modify the inobt cachefiles: fix the race between cachefiles_bury_object() and rmdir(2) ptp: fix Spectre v1 vulnerability drm/edid: Add 6 bpc quirk for BOE panel in HP Pavilion 15-n233sl drm/edid: VSDB yCBCr420 Deep Color mode bit definitions drm: fb-helper: Reject all pixel format changing requests RDMA/ucma: Fix Spectre v1 vulnerability IB/ucm: Fix Spectre v1 vulnerability cdc-acm: do not reset notification buffer index upon urb unlinking cdc-acm: correct counting of UART states in serial state notification cdc-acm: fix race between reset and control messaging usb: usbip: Fix BUG: KASAN: slab-out-of-bounds in vhci_hub_control() usb: gadget: storage: Fix Spectre v1 vulnerability USB: fix the usbfs flag sanitization for control transfers Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM sched/fair: Fix throttle_list starvation with low CFS quota x86/tsc: Force inlining of cyc2ns bits x86, hibernate: Fix nosave_regions setup for hibernation x86/percpu: Fix this_cpu_read() x86/time: Correct the attribute on jiffies' definition x86/fpu: Fix i486 + no387 boot crash by only saving FPU registers on context switch if there is an FPU net: fs_enet: do not call phy_stop() in interrupts Linux 4.14.80 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 497685c302d7..d1a764153581 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
-SUBLEVEL = 79
+SUBLEVEL = 80
EXTRAVERSION =
NAME = Petit Gorille