kernel: bump 4.9 to 4.9.233

Refreshed all patches.

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
CN_SZTL 2020-08-21 23:59:02 +08:00
parent 7f210212d9
commit 879e74c482
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
11 changed files with 32 additions and 32 deletions

View File

@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .232
LINUX_VERSION-4.9 = .233
LINUX_VERSION-4.14 = .193
LINUX_VERSION-4.19 = .140
LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60
LINUX_KERNEL_HASH-4.9.233 = 2a6dcab0652ab181820d56b6014235a125cf933e0edf5bdbc038160fa9e7aca5
LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
LINUX_KERNEL_HASH-4.19.140 = ca0ff9a7bf005bef10af477b8e7bdd6e466b20c388d862426fd8842511f18ea8

View File

@ -21,7 +21,7 @@ Signed-off-by: Sungbo Eo <mans0n@gorani.run>
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -232,6 +232,8 @@ static int uart_port_startup(struct tty_
@@ -209,6 +209,8 @@ static int uart_port_startup(struct tty_
if (retval == 0) {
if (uart_console(uport) && uport->cons->cflag) {
tty->termios.c_cflag = uport->cons->cflag;
@ -30,7 +30,7 @@ Signed-off-by: Sungbo Eo <mans0n@gorani.run>
uport->cons->cflag = 0;
}
/*
@@ -2072,8 +2074,10 @@ uart_set_options(struct uart_port *port,
@@ -2055,8 +2057,10 @@ uart_set_options(struct uart_port *port,
* Allow the setting of the UART parameters with a NULL console
* too:
*/
@ -44,7 +44,7 @@ Signed-off-by: Sungbo Eo <mans0n@gorani.run>
}
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -145,6 +145,7 @@ struct console {
@@ -135,6 +135,7 @@ struct console {
short flags;
short index;
int cflag;

View File

@ -888,7 +888,7 @@
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1804,15 +1804,15 @@ static int vxlan_build_skb(struct sk_buf
@@ -1808,15 +1808,15 @@ static int vxlan_build_skb(struct sk_buf
goto out_free;
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

View File

@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
rwlock_t sk_callback_lock;
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2486,6 +2486,7 @@ void sock_init_data(struct socket *sock,
@@ -2507,6 +2507,7 @@ void sock_init_data(struct socket *sock,
sk->sk_max_pacing_rate = ~0U;
sk->sk_pacing_rate = ~0U;

View File

@ -23,7 +23,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -181,11 +181,14 @@ static int led_classdev_next_name(const
@@ -182,11 +182,14 @@ static int led_classdev_next_name(const
}
/**
@ -41,7 +41,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
{
char name[64];
int ret;
@@ -198,6 +201,7 @@ int led_classdev_register(struct device
@@ -199,6 +202,7 @@ int led_classdev_register(struct device
led_cdev, led_cdev->groups, "%s", name);
if (IS_ERR(led_cdev->dev))
return PTR_ERR(led_cdev->dev);
@ -49,7 +49,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
if (ret)
dev_warn(parent, "Led %s renamed to %s due to name collision",
@@ -228,7 +232,7 @@ int led_classdev_register(struct device
@@ -229,7 +233,7 @@ int led_classdev_register(struct device
return 0;
}
@ -58,7 +58,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
/**
* led_classdev_unregister - unregisters a object of led_properties class.
@@ -270,12 +274,14 @@ static void devm_led_classdev_release(st
@@ -271,12 +275,14 @@ static void devm_led_classdev_release(st
}
/**
@ -77,7 +77,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
{
struct led_classdev **dr;
int rc;
@@ -284,7 +290,7 @@ int devm_led_classdev_register(struct de
@@ -285,7 +291,7 @@ int devm_led_classdev_register(struct de
if (!dr)
return -ENOMEM;
@ -86,7 +86,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
if (rc) {
devres_free(dr);
return rc;
@@ -295,7 +301,7 @@ int devm_led_classdev_register(struct de
@@ -296,7 +302,7 @@ int devm_led_classdev_register(struct de
return 0;
}

View File

@ -1379,7 +1379,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
*/
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1071,7 +1071,7 @@ err:
@@ -1073,7 +1073,7 @@ err:
if (work_done < budget) {
int more_to_do = 0;

View File

@ -309,7 +309,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* Data section helpers
@@ -304,35 +305,35 @@
@@ -305,35 +306,35 @@
/* PCI quirks */ \
.pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \
@ -354,7 +354,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__end_builtin_fw) = .; \
} \
\
@@ -410,7 +411,7 @@
@@ -411,7 +412,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
@ -363,7 +363,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} \
\
/* __*init sections */ \
@@ -423,14 +424,14 @@
@@ -424,14 +425,14 @@
/* Built-in module parameters. */ \
__param : AT(ADDR(__param) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___param) = .; \
@ -380,7 +380,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__stop___modver) = .; \
. = ALIGN((align)); \
VMLINUX_SYMBOL(__end_rodata) = .; \
@@ -496,7 +497,7 @@
@@ -497,7 +498,7 @@
#define ENTRY_TEXT \
ALIGN_FUNCTION(); \
VMLINUX_SYMBOL(__entry_text_start) = .; \
@ -389,7 +389,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__entry_text_end) = .;
#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
@@ -534,7 +535,7 @@
@@ -535,7 +536,7 @@
. = ALIGN(align); \
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ex_table) = .; \
@ -398,7 +398,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__stop___ex_table) = .; \
}
@@ -550,9 +551,9 @@
@@ -551,9 +552,9 @@
#ifdef CONFIG_CONSTRUCTORS
#define KERNEL_CTORS() . = ALIGN(8); \
VMLINUX_SYMBOL(__ctors_start) = .; \
@ -410,7 +410,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__ctors_end) = .;
#else
#define KERNEL_CTORS()
@@ -609,7 +610,7 @@
@@ -610,7 +611,7 @@
#define SBSS(sbss_align) \
. = ALIGN(sbss_align); \
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
@ -419,7 +419,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
*(.scommon) \
}
@@ -676,7 +677,7 @@
@@ -679,7 +680,7 @@
. = ALIGN(8); \
__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___bug_table) = .; \
@ -428,7 +428,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__stop___bug_table) = .; \
}
#else
@@ -688,7 +689,7 @@
@@ -691,7 +692,7 @@
. = ALIGN(4); \
.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__tracedata_start) = .; \
@ -437,7 +437,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
VMLINUX_SYMBOL(__tracedata_end) = .; \
}
#else
@@ -705,7 +706,7 @@
@@ -708,7 +709,7 @@
#define INIT_SETUP(initsetup_align) \
. = ALIGN(initsetup_align); \
VMLINUX_SYMBOL(__setup_start) = .; \

View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/export.h>
/* Align . to a 8 byte boundary equals to maximum function alignment. */
@@ -342,14 +352,14 @@
@@ -343,14 +353,14 @@
/* Kernel symbol table: Normal symbols */ \
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab) = .; \
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \
} \
\
@@ -411,7 +421,7 @@
@@ -412,7 +422,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} \
\
/* __*init sections */ \
@@ -763,6 +773,8 @@
@@ -766,6 +776,8 @@
EXIT_TEXT \
EXIT_DATA \
EXIT_CALL \

View File

@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3095,6 +3095,8 @@ static __net_initdata struct pernet_oper
@@ -3116,6 +3116,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5925,7 +5925,7 @@ static void __ref alloc_node_mem_map(str
@@ -5926,7 +5926,7 @@ static void __ref alloc_node_mem_map(str
mem_map = NODE_DATA(0)->node_mem_map;
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

View File

@ -32,7 +32,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
@@ -3055,6 +3056,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
@@ -3068,6 +3069,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
@ -40,7 +40,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To
@@ -3111,6 +3113,8 @@ static void fixup_debug_report(struct pc
@@ -3124,6 +3126,8 @@ static void fixup_debug_report(struct pc
}
}
@ -49,7 +49,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded).
@@ -3149,6 +3153,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
@@ -3162,6 +3166,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);