summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2018-07-31 20:19:52 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2018-07-31 20:19:52 +0200
commit05670d3d98f96844679f61cad014f74e85446999 (patch)
treeb1ca20ca06b113eae697a3427334f141afa53fa6 /Makefile
parent4b2d6badbc4057bd43e442eb20141fb40c549f6d (diff)
parentac15b2b23808ee2c3264329b035a8f0f7d7f50e6 (diff)
Merge 4.4.145 into android-4.4
Changes in 4.4.145 MIPS: ath79: fix register address in ath79_ddr_wb_flush() ip: hash fragments consistently net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper rtnetlink: add rtnl_link_state check in rtnl_configure_link tcp: fix dctcp delayed ACK schedule tcp: helpers to send special DCTCP ack tcp: do not cancel delay-AcK on DCTCP special ACK tcp: do not delay ACK in DCTCP upon CE status change tcp: avoid collapses in tcp_prune_queue() if possible tcp: detect malicious patterns in tcp_collapse_ofo_queue() ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull usb: cdc_acm: Add quirk for Castles VEGA3000 usb: core: handle hub C_PORT_OVER_CURRENT condition usb: gadget: f_fs: Only return delayed status when len is 0 driver core: Partially revert "driver core: correct device's shutdown order" can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK can: xilinx_can: fix recovery from error states not being propagated can: xilinx_can: fix device dropping off bus on RX overrun can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting can: xilinx_can: fix incorrect clear of non-processed interrupts can: xilinx_can: fix RX overflow interrupt not being enabled turn off -Wattribute-alias ARM: fix put_user() for gcc-8 Linux 4.4.145 Change-Id: I449c110f7f186f2c72c9cc45e00a8deda0d54e40 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f38e385c0158..73cc5dfdd69e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 144
+SUBLEVEL = 145
EXTRAVERSION =
NAME = Blurry Fish Butt
@@ -625,6 +625,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
+KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)