summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-08-08 08:48:03 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2021-08-08 08:48:03 +0200
commitcfdd4f44ffc1eab4461c268e9d29a35e01895d0f (patch)
tree0abe7707b8f759347f35ac4ceccac1721a5040e8 /Makefile
parent449846c3e01f672fdb33412056058564d2cfaf21 (diff)
parentaff9d4e6115abc1732aef71bea36cf3beb9b2c53 (diff)
Merge 4.4.279 into android-4.4-p
Changes in 4.4.279 btrfs: mark compressed range uptodate only if all bio succeed regulator: rt5033: Fix n_voltages settings for BUCK and LDO r8152: Fix potential PM refcount imbalance net: Fix zero-copy head len calculation. Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled" can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF Linux 4.4.279 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ie3e6cadbc9c8291c2be61e0a3427225458891c18
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a52bfe44cd61..f75e0bbd96a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 278
+SUBLEVEL = 279
EXTRAVERSION =
NAME = Blurry Fish Butt