summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-11-02 17:52:36 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2021-11-02 17:52:36 +0100
commit8a5b8c8b0a4c26bb588e0e0c4034e1bef28ff82f (patch)
tree252e2e1e0a2c24bffc0e2aae30ffd12eda708f09 /Makefile
parentf9d6c5b38776d05c5c99ae84b68caf7639c22d2f (diff)
parente0018f4c9325b36ae75a591d54879bf9a9f41a26 (diff)
Merge 4.4.291 into android-4.4-p
Changes in 4.4.291 ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned ARM: 9134/1: remove duplicate memcpy() definition ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype ARM: 8819/1: Remove '-p' from LDFLAGS usbnet: sanity check for maxpacket usbnet: fix error return code in usbnet_probe() ata: sata_mv: Fix the error handling of mv_chip_id() nfc: port100: fix using -ERRNO as command type mask Revert "net: mdiobus: Fix memory leak in __mdiobus_register" mmc: vub300: fix control-message timeouts mmc: dw_mmc: exynos: fix the finding clock sample value mmc: sdhci: Map more voltage level to SDHCI_POWER_330 net: lan78xx: fix division by zero in send path regmap: Fix possible double-free in regcache_rbtree_exit() nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST sctp: use init_tag from inithdr for ABORT chunk sctp: add vtag check in sctp_sf_violation Linux 4.4.291 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I32546318dfb86394483636588558ceced64faae0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 73ee38b8f11c..8b1ee57eb9e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 290
+SUBLEVEL = 291
EXTRAVERSION =
NAME = Blurry Fish Butt