From c79cb9fda71a49590dc785d7c6e1472eee134e02 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 18 Sep 2019 12:50:22 +0200 Subject: kernel: bump 4.19 to 4.19.73 Refreshed all patches. Remove upstreamed: - 840-media-i2c-tda1997x-select-V4L2_FWNODE.patch - 079-v4.20-ARM-dts-qcom-ipq4019-fix-PCI-range.patch - 083-ARM-dts-qcom-ipq4019-enlarge-PCIe-BAR-range.patch - 084-ARM-dts-qcom-ipq4019-Fix-MSI-IRQ-type.patch Fixes: - CVE-2019-15030 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- .../linux/generic/hack-4.19/204-module_strip.patch | 4 +- target/linux/generic/hack-4.19/930-crashlog.patch | 2 +- ...840-media-i2c-tda1997x-select-V4L2_FWNODE.patch | 43 ---------------------- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch (limited to 'target/linux/generic') diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index c0650b3670..2524307f45 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3009,9 +3009,11 @@ static int setup_load_info(struct load_i +@@ -3016,9 +3016,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3032,6 +3034,7 @@ static int check_modinfo(struct module * +@@ -3039,6 +3041,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-4.19/930-crashlog.patch b/target/linux/generic/hack-4.19/930-crashlog.patch index 0088b7a081..1562df44a4 100644 --- a/target/linux/generic/hack-4.19/930-crashlog.patch +++ b/target/linux/generic/hack-4.19/930-crashlog.patch @@ -280,7 +280,7 @@ Signed-off-by: Felix Fietkau +module_init(crashlog_init_fs); --- a/kernel/module.c +++ b/kernel/module.c -@@ -256,6 +256,9 @@ static void mod_update_bounds(struct mod +@@ -251,6 +251,9 @@ static void mod_update_bounds(struct mod #ifdef CONFIG_KGDB_KDB struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ #endif /* CONFIG_KGDB_KDB */ diff --git a/target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch b/target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch deleted file mode 100644 index 65fcfb5bfe..0000000000 --- a/target/linux/generic/pending-4.19/840-media-i2c-tda1997x-select-V4L2_FWNODE.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 237e88dcbcb0098e1a8a0887fb7299fcf18650a5 Mon Sep 17 00:00:00 2001 -From: Koen Vandeputte -Date: Mon, 18 Mar 2019 17:39:26 +0100 -Subject: [PATCH] media: i2c: tda1997x: select V4L2_FWNODE - -Building tda1997x fails now unless V4L2_FWNODE is selected: - -drivers/media/i2c/tda1997x.o: in function `tda1997x_parse_dt' -undefined reference to `v4l2_fwnode_endpoint_parse' - -While at it, also sort the selections alphabetically - -Fixes: 9ac0038db9a7 ("media: i2c: Add TDA1997x HDMI receiver driver") -Signed-off-by: Koen Vandeputte -Cc: Akinobu Mita -Cc: Bingbu Cao -Cc: Hans Verkuil -Cc: Jacopo Mondi -Cc: Matt Ranostay -Cc: Mauro Carvalho Chehab -Cc: Robin Leblon -Cc: Rui Miguel Silva -Cc: Sakari Ailus -Cc: Tim Harvey -Cc: linux-kernel@vger.kernel.org -Cc: stable@vger.kernel.org # v4.17+ ---- - drivers/media/i2c/Kconfig | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/media/i2c/Kconfig -+++ b/drivers/media/i2c/Kconfig -@@ -60,8 +60,9 @@ config VIDEO_TDA1997X - tristate "NXP TDA1997x HDMI receiver" - depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API - depends on SND_SOC -- select SND_PCM - select HDMI -+ select SND_PCM -+ select V4L2_FWNODE - ---help--- - V4L2 subdevice driver for the NXP TDA1997x HDMI receivers. - -- cgit v1.2.3