mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-17 04:33:57 +02:00
kernel: Update kernel 4.9 to version 4.9.234
Compile and runtime tested on lantiq/xrx200. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
b8336ebab9
commit
3ad44fcd12
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-4.9 = .232
|
LINUX_VERSION-4.9 = .234
|
||||||
LINUX_VERSION-4.14 = .195
|
LINUX_VERSION-4.14 = .195
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60
|
LINUX_KERNEL_HASH-4.9.234 = 756f8544d261e8117716c911261690e4fb5491e14c1f4612c83e0986453782e3
|
||||||
LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021
|
LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
|
|
|
@ -888,7 +888,7 @@
|
||||||
*sum = csum_fold(csum_partial(diff, sizeof(diff),
|
*sum = csum_fold(csum_partial(diff, sizeof(diff),
|
||||||
--- a/drivers/net/vxlan.c
|
--- a/drivers/net/vxlan.c
|
||||||
+++ b/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;
|
goto out_free;
|
||||||
|
|
||||||
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
|
vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
|
||||||
|
|
|
@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
|
||||||
rwlock_t sk_callback_lock;
|
rwlock_t sk_callback_lock;
|
||||||
--- a/net/core/sock.c
|
--- a/net/core/sock.c
|
||||||
+++ b/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_max_pacing_rate = ~0U;
|
||||||
sk->sk_pacing_rate = ~0U;
|
sk->sk_pacing_rate = ~0U;
|
||||||
|
|
|
@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
extern void __free_page_frag(void *addr);
|
extern void __free_page_frag(void *addr);
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -3936,6 +3936,20 @@ static struct page *__page_frag_refill(s
|
@@ -3941,6 +3941,20 @@ static struct page *__page_frag_refill(s
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
void *napi_alloc_frag(unsigned int fragsz);
|
void *napi_alloc_frag(unsigned int fragsz);
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -3950,8 +3950,8 @@ void __page_frag_drain(struct page *page
|
@@ -3955,8 +3955,8 @@ void __page_frag_drain(struct page *page
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(__page_frag_drain);
|
EXPORT_SYMBOL(__page_frag_drain);
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
{
|
{
|
||||||
unsigned int size = PAGE_SIZE;
|
unsigned int size = PAGE_SIZE;
|
||||||
struct page *page;
|
struct page *page;
|
||||||
@@ -4002,19 +4002,19 @@ refill:
|
@@ -4007,19 +4007,19 @@ refill:
|
||||||
|
|
||||||
return nc->va + offset;
|
return nc->va + offset;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
extern void page_frag_free(void *addr);
|
extern void page_frag_free(void *addr);
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -3915,8 +3915,8 @@ EXPORT_SYMBOL(free_pages);
|
@@ -3920,8 +3920,8 @@ EXPORT_SYMBOL(free_pages);
|
||||||
* drivers to provide a backing region of memory for use as either an
|
* drivers to provide a backing region of memory for use as either an
|
||||||
* sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
|
* sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
|
||||||
*/
|
*/
|
||||||
|
@ -44,7 +44,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
{
|
{
|
||||||
struct page *page = NULL;
|
struct page *page = NULL;
|
||||||
gfp_t gfp = gfp_mask;
|
gfp_t gfp = gfp_mask;
|
||||||
@@ -3936,19 +3936,20 @@ static struct page *__page_frag_refill(s
|
@@ -3941,19 +3941,20 @@ static struct page *__page_frag_refill(s
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
|
|
||||||
void *page_frag_alloc(struct page_frag_cache *nc,
|
void *page_frag_alloc(struct page_frag_cache *nc,
|
||||||
unsigned int fragsz, gfp_t gfp_mask)
|
unsigned int fragsz, gfp_t gfp_mask)
|
||||||
@@ -3959,7 +3960,7 @@ void *page_frag_alloc(struct page_frag_c
|
@@ -3964,7 +3965,7 @@ void *page_frag_alloc(struct page_frag_c
|
||||||
|
|
||||||
if (unlikely(!nc->va)) {
|
if (unlikely(!nc->va)) {
|
||||||
refill:
|
refill:
|
||||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
|
||||||
|
|
||||||
--- a/drivers/leds/led-class.c
|
--- a/drivers/leds/led-class.c
|
||||||
+++ b/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];
|
char name[64];
|
||||||
int ret;
|
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);
|
led_cdev, led_cdev->groups, "%s", name);
|
||||||
if (IS_ERR(led_cdev->dev))
|
if (IS_ERR(led_cdev->dev))
|
||||||
return PTR_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)
|
if (ret)
|
||||||
dev_warn(parent, "Led %s renamed to %s due to name collision",
|
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;
|
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.
|
* 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;
|
struct led_classdev **dr;
|
||||||
int rc;
|
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)
|
if (!dr)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
|
||||||
if (rc) {
|
if (rc) {
|
||||||
devres_free(dr);
|
devres_free(dr);
|
||||||
return rc;
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1379,7 +1379,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
*/
|
*/
|
||||||
--- a/drivers/net/xen-netfront.c
|
--- a/drivers/net/xen-netfront.c
|
||||||
+++ b/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) {
|
if (work_done < budget) {
|
||||||
int more_to_do = 0;
|
int more_to_do = 0;
|
||||||
|
|
||||||
|
|
|
@ -309,7 +309,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Data section helpers
|
* Data section helpers
|
||||||
@@ -304,35 +305,35 @@
|
@@ -305,35 +306,35 @@
|
||||||
/* PCI quirks */ \
|
/* PCI quirks */ \
|
||||||
.pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
|
.pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \
|
VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \
|
||||||
|
@ -354,7 +354,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__end_builtin_fw) = .; \
|
VMLINUX_SYMBOL(__end_builtin_fw) = .; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
@@ -410,7 +411,7 @@
|
@@ -411,7 +412,7 @@
|
||||||
\
|
\
|
||||||
/* Kernel symbol table: strings */ \
|
/* Kernel symbol table: strings */ \
|
||||||
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
||||||
|
@ -363,7 +363,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* __*init sections */ \
|
/* __*init sections */ \
|
||||||
@@ -423,14 +424,14 @@
|
@@ -424,14 +425,14 @@
|
||||||
/* Built-in module parameters. */ \
|
/* Built-in module parameters. */ \
|
||||||
__param : AT(ADDR(__param) - LOAD_OFFSET) { \
|
__param : AT(ADDR(__param) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__start___param) = .; \
|
VMLINUX_SYMBOL(__start___param) = .; \
|
||||||
|
@ -380,7 +380,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__stop___modver) = .; \
|
VMLINUX_SYMBOL(__stop___modver) = .; \
|
||||||
. = ALIGN((align)); \
|
. = ALIGN((align)); \
|
||||||
VMLINUX_SYMBOL(__end_rodata) = .; \
|
VMLINUX_SYMBOL(__end_rodata) = .; \
|
||||||
@@ -496,7 +497,7 @@
|
@@ -497,7 +498,7 @@
|
||||||
#define ENTRY_TEXT \
|
#define ENTRY_TEXT \
|
||||||
ALIGN_FUNCTION(); \
|
ALIGN_FUNCTION(); \
|
||||||
VMLINUX_SYMBOL(__entry_text_start) = .; \
|
VMLINUX_SYMBOL(__entry_text_start) = .; \
|
||||||
|
@ -389,7 +389,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__entry_text_end) = .;
|
VMLINUX_SYMBOL(__entry_text_end) = .;
|
||||||
|
|
||||||
#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
|
#if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
|
||||||
@@ -534,7 +535,7 @@
|
@@ -535,7 +536,7 @@
|
||||||
. = ALIGN(align); \
|
. = ALIGN(align); \
|
||||||
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \
|
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__start___ex_table) = .; \
|
VMLINUX_SYMBOL(__start___ex_table) = .; \
|
||||||
|
@ -398,7 +398,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__stop___ex_table) = .; \
|
VMLINUX_SYMBOL(__stop___ex_table) = .; \
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -550,9 +551,9 @@
|
@@ -551,9 +552,9 @@
|
||||||
#ifdef CONFIG_CONSTRUCTORS
|
#ifdef CONFIG_CONSTRUCTORS
|
||||||
#define KERNEL_CTORS() . = ALIGN(8); \
|
#define KERNEL_CTORS() . = ALIGN(8); \
|
||||||
VMLINUX_SYMBOL(__ctors_start) = .; \
|
VMLINUX_SYMBOL(__ctors_start) = .; \
|
||||||
|
@ -410,7 +410,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__ctors_end) = .;
|
VMLINUX_SYMBOL(__ctors_end) = .;
|
||||||
#else
|
#else
|
||||||
#define KERNEL_CTORS()
|
#define KERNEL_CTORS()
|
||||||
@@ -609,7 +610,7 @@
|
@@ -610,7 +611,7 @@
|
||||||
#define SBSS(sbss_align) \
|
#define SBSS(sbss_align) \
|
||||||
. = ALIGN(sbss_align); \
|
. = ALIGN(sbss_align); \
|
||||||
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
|
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
|
||||||
|
@ -419,7 +419,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
*(.scommon) \
|
*(.scommon) \
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -676,7 +677,7 @@
|
@@ -679,7 +680,7 @@
|
||||||
. = ALIGN(8); \
|
. = ALIGN(8); \
|
||||||
__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
|
__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__start___bug_table) = .; \
|
VMLINUX_SYMBOL(__start___bug_table) = .; \
|
||||||
|
@ -428,7 +428,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__stop___bug_table) = .; \
|
VMLINUX_SYMBOL(__stop___bug_table) = .; \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@@ -688,7 +689,7 @@
|
@@ -691,7 +692,7 @@
|
||||||
. = ALIGN(4); \
|
. = ALIGN(4); \
|
||||||
.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \
|
.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__tracedata_start) = .; \
|
VMLINUX_SYMBOL(__tracedata_start) = .; \
|
||||||
|
@ -437,7 +437,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
VMLINUX_SYMBOL(__tracedata_end) = .; \
|
VMLINUX_SYMBOL(__tracedata_end) = .; \
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
@@ -705,7 +706,7 @@
|
@@ -708,7 +709,7 @@
|
||||||
#define INIT_SETUP(initsetup_align) \
|
#define INIT_SETUP(initsetup_align) \
|
||||||
. = ALIGN(initsetup_align); \
|
. = ALIGN(initsetup_align); \
|
||||||
VMLINUX_SYMBOL(__setup_start) = .; \
|
VMLINUX_SYMBOL(__setup_start) = .; \
|
||||||
|
|
|
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
|
|
||||||
/* Align . to a 8 byte boundary equals to maximum function alignment. */
|
/* Align . to a 8 byte boundary equals to maximum function alignment. */
|
||||||
@@ -342,14 +352,14 @@
|
@@ -343,14 +353,14 @@
|
||||||
/* Kernel symbol table: Normal symbols */ \
|
/* Kernel symbol table: Normal symbols */ \
|
||||||
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
|
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
|
||||||
VMLINUX_SYMBOL(__start___ksymtab) = .; \
|
VMLINUX_SYMBOL(__start___ksymtab) = .; \
|
||||||
|
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \
|
VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
@@ -411,7 +421,7 @@
|
@@ -412,7 +422,7 @@
|
||||||
\
|
\
|
||||||
/* Kernel symbol table: strings */ \
|
/* Kernel symbol table: strings */ \
|
||||||
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
||||||
|
@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* __*init sections */ \
|
/* __*init sections */ \
|
||||||
@@ -763,6 +773,8 @@
|
@@ -766,6 +776,8 @@
|
||||||
EXIT_TEXT \
|
EXIT_TEXT \
|
||||||
EXIT_DATA \
|
EXIT_DATA \
|
||||||
EXIT_CALL \
|
EXIT_CALL \
|
||||||
|
|
|
@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/core/sock.c
|
--- a/net/core/sock.c
|
||||||
+++ b/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)
|
static int __init proto_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
||||||
|
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -5925,7 +5925,7 @@ static void __ref alloc_node_mem_map(str
|
@@ -5931,7 +5931,7 @@ static void __ref alloc_node_mem_map(str
|
||||||
mem_map = NODE_DATA(0)->node_mem_map;
|
mem_map = NODE_DATA(0)->node_mem_map;
|
||||||
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
|
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
|
||||||
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
||||||
|
|
|
@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/fs/jffs2/dir.c
|
--- a/fs/jffs2/dir.c
|
||||||
+++ b/fs/jffs2/dir.c
|
+++ b/fs/jffs2/dir.c
|
||||||
@@ -752,6 +752,24 @@ static int jffs2_mknod (struct inode *di
|
@@ -756,6 +756,24 @@ static int jffs2_mknod (struct inode *di
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
|
static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
|
||||||
struct inode *new_dir_i, struct dentry *new_dentry,
|
struct inode *new_dir_i, struct dentry *new_dentry,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
@@ -762,7 +780,7 @@ static int jffs2_rename (struct inode *o
|
@@ -766,7 +784,7 @@ static int jffs2_rename (struct inode *o
|
||||||
uint8_t type;
|
uint8_t type;
|
||||||
uint32_t now;
|
uint32_t now;
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* The VFS will check for us and prevent trying to rename a
|
/* The VFS will check for us and prevent trying to rename a
|
||||||
@@ -828,9 +846,14 @@ static int jffs2_rename (struct inode *o
|
@@ -832,9 +850,14 @@ static int jffs2_rename (struct inode *o
|
||||||
if (d_is_dir(old_dentry) && !victim_f)
|
if (d_is_dir(old_dentry) && !victim_f)
|
||||||
inc_nlink(new_dir_i);
|
inc_nlink(new_dir_i);
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/fs/jffs2/dir.c
|
--- a/fs/jffs2/dir.c
|
||||||
+++ b/fs/jffs2/dir.c
|
+++ b/fs/jffs2/dir.c
|
||||||
@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o
|
@@ -781,18 +781,31 @@ static int jffs2_rename (struct inode *o
|
||||||
int ret;
|
int ret;
|
||||||
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
|
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
|
||||||
struct jffs2_inode_info *victim_f = NULL;
|
struct jffs2_inode_info *victim_f = NULL;
|
||||||
|
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
|
victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
|
||||||
if (d_is_dir(new_dentry)) {
|
if (d_is_dir(new_dentry)) {
|
||||||
struct jffs2_full_dirent *fd;
|
struct jffs2_full_dirent *fd;
|
||||||
@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o
|
@@ -827,7 +840,7 @@ static int jffs2_rename (struct inode *o
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
/* There was a victim. Kill it off nicely */
|
/* There was a victim. Kill it off nicely */
|
||||||
if (d_is_dir(new_dentry))
|
if (d_is_dir(new_dentry))
|
||||||
clear_nlink(d_inode(new_dentry));
|
clear_nlink(d_inode(new_dentry));
|
||||||
@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o
|
@@ -853,6 +866,12 @@ static int jffs2_rename (struct inode *o
|
||||||
if (flags & RENAME_WHITEOUT)
|
if (flags & RENAME_WHITEOUT)
|
||||||
/* Replace with whiteout */
|
/* Replace with whiteout */
|
||||||
ret = jffs2_whiteout(old_dir_i, old_dentry);
|
ret = jffs2_whiteout(old_dir_i, old_dentry);
|
||||||
|
@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
else
|
else
|
||||||
/* Unlink the original */
|
/* Unlink the original */
|
||||||
ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
|
ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
|
||||||
@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o
|
@@ -884,7 +903,7 @@ static int jffs2_rename (struct inode *o
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
/* The Mellanox Tavor device gives false positive parity errors
|
/* The Mellanox Tavor device gives false positive parity errors
|
||||||
* Mark this device with a broken_parity_status, to allow
|
* Mark this device with a broken_parity_status, to allow
|
||||||
* PCI scanning code to "skip" this now blacklisted device.
|
* 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, 0x65f9, quirk_intel_mc_errata);
|
||||||
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, 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
|
* 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,
|
* Some BIOS implementations leave the Intel GPU interrupts enabled,
|
||||||
* even though no one is handling them (f.e. i915 driver is never loaded).
|
* 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, 0x010a, disable_igfx_irq);
|
||||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
|
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
|
|
||||||
--- a/drivers/mtd/mtdchar.c
|
--- a/drivers/mtd/mtdchar.c
|
||||||
+++ b/drivers/mtd/mtdchar.c
|
+++ b/drivers/mtd/mtdchar.c
|
||||||
@@ -455,7 +455,7 @@ static int mtdchar_readoob(struct file *
|
@@ -452,7 +452,7 @@ static int mtdchar_readoob(struct file *
|
||||||
* data. For our userspace tools it is important to dump areas
|
* data. For our userspace tools it is important to dump areas
|
||||||
* with ECC errors!
|
* with ECC errors!
|
||||||
* For kernel internal usage it also might return -EUCLEAN
|
* For kernel internal usage it also might return -EUCLEAN
|
||||||
|
|
|
@ -2060,7 +2060,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
}
|
}
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -4697,3 +4697,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
@@ -4710,3 +4710,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_IN
|
||||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
|
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2031, quirk_no_aersid);
|
||||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
|
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2032, quirk_no_aersid);
|
||||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
|
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2033, quirk_no_aersid);
|
||||||
|
|
|
@ -28723,7 +28723,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
#define CRYPTO_ALG_DEAD 0x00000020
|
#define CRYPTO_ALG_DEAD 0x00000020
|
||||||
--- a/include/uapi/linux/cryptouser.h
|
--- a/include/uapi/linux/cryptouser.h
|
||||||
+++ b/include/uapi/linux/cryptouser.h
|
+++ b/include/uapi/linux/cryptouser.h
|
||||||
@@ -46,6 +46,7 @@ enum crypto_attr_type_t {
|
@@ -48,6 +48,7 @@ enum crypto_attr_type_t {
|
||||||
CRYPTOCFGA_REPORT_CIPHER, /* struct crypto_report_cipher */
|
CRYPTOCFGA_REPORT_CIPHER, /* struct crypto_report_cipher */
|
||||||
CRYPTOCFGA_REPORT_AKCIPHER, /* struct crypto_report_akcipher */
|
CRYPTOCFGA_REPORT_AKCIPHER, /* struct crypto_report_akcipher */
|
||||||
CRYPTOCFGA_REPORT_KPP, /* struct crypto_report_kpp */
|
CRYPTOCFGA_REPORT_KPP, /* struct crypto_report_kpp */
|
||||||
|
@ -28731,7 +28731,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||||
__CRYPTOCFGA_MAX
|
__CRYPTOCFGA_MAX
|
||||||
|
|
||||||
#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
|
#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
|
||||||
@@ -112,5 +113,9 @@ struct crypto_report_kpp {
|
@@ -114,5 +115,9 @@ struct crypto_report_kpp {
|
||||||
char type[CRYPTO_MAX_NAME];
|
char type[CRYPTO_MAX_NAME];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user