Skip to content

Commit

Permalink
generic: 5.15: refresh pending patch
Browse files Browse the repository at this point in the history
Use 'make target/linux/refresh' to refresh pending patches.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  • Loading branch information
Ansuel authored and dangowrt committed Mar 27, 2022
1 parent 49cb5e5 commit 009f8af
Show file tree
Hide file tree
Showing 85 changed files with 272 additions and 273 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -211,6 +211,8 @@ void ftrace_likely_update(struct ftrace_
__v; \
})
@@ -220,6 +220,8 @@ void ftrace_likely_update(struct ftrace_
#define function_nocfi(x) (x)
#endif

+#include <asm/rwonce.h>
+
#endif /* __KERNEL__ */

/*
@@ -243,6 +245,4 @@ static inline void *offset_to_ptr(const
@@ -252,6 +254,4 @@ static inline void *offset_to_ptr(const
*/
#define prevent_tail_call_optimization() mb()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -380,6 +380,8 @@ static inline int is_sp_move_ins(union m
@@ -393,6 +393,8 @@ static inline int is_sp_move_ins(union m

if (ip->i_format.opcode == addiu_op ||
ip->i_format.opcode == daddiu_op) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>

--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7055,7 +7055,7 @@ static void __ref alloc_node_mem_map(str
@@ -7552,7 +7552,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>

--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -682,6 +682,7 @@ static const struct of_device_id spidev_
@@ -696,6 +696,7 @@ static const struct of_device_id spidev_
{ .compatible = "menlo,m53cpld" },
{ .compatible = "cisco,spi-petra" },
{ .compatible = "micron,spi-authenta" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -609,8 +609,8 @@ static int jffs2_rmdir (struct inode *di
@@ -614,8 +614,8 @@ static int jffs2_rmdir (struct inode *di
return ret;
}

Expand All @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
{
struct jffs2_inode_info *f, *dir_f;
struct jffs2_sb_info *c;
@@ -748,7 +749,11 @@ static int jffs2_mknod (struct inode *di
@@ -754,7 +754,11 @@ static int jffs2_mknod (struct user_name
mutex_unlock(&dir_f->sem);
jffs2_complete_reservation(c);

Expand All @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0;

fail:
@@ -756,6 +761,19 @@ static int jffs2_mknod (struct inode *di
@@ -762,6 +766,19 @@ static int jffs2_mknod (struct user_name
return ret;
}

Expand All @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int jffs2_rename (struct user_namespace *mnt_userns,
struct inode *old_dir_i, struct dentry *old_dentry,
struct inode *new_dir_i, struct dentry *new_dentry,
@@ -766,7 +782,7 @@ static int jffs2_rename (struct inode *o
@@ -773,7 +790,7 @@ static int jffs2_rename (struct user_nam
uint8_t type;
uint32_t now;

Expand All @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -EINVAL;

/* The VFS will check for us and prevent trying to rename a
@@ -832,9 +848,14 @@ static int jffs2_rename (struct inode *o
@@ -839,9 +856,14 @@ static int jffs2_rename (struct user_nam
if (d_is_dir(old_dentry) && !victim_f)
inc_nlink(new_dir_i);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -779,18 +779,31 @@ static int jffs2_rename (struct inode *o
@@ -787,18 +787,31 @@ static int jffs2_rename (struct user_nam
int ret;
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
struct jffs2_inode_info *victim_f = NULL;
Expand Down Expand Up @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
if (d_is_dir(new_dentry)) {
struct jffs2_full_dirent *fd;
@@ -825,7 +838,7 @@ static int jffs2_rename (struct inode *o
@@ -833,7 +846,7 @@ static int jffs2_rename (struct user_nam
if (ret)
return ret;

Expand All @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* There was a victim. Kill it off nicely */
if (d_is_dir(new_dentry))
clear_nlink(d_inode(new_dentry));
@@ -851,6 +864,12 @@ static int jffs2_rename (struct inode *o
@@ -859,6 +872,12 @@ static int jffs2_rename (struct user_nam
if (flags & RENAME_WHITEOUT)
/* Replace with whiteout */
ret = jffs2_whiteout(mnt_userns, old_dir_i, old_dentry);
Expand All @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
else
/* Unlink the original */
ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
@@ -882,7 +901,7 @@ static int jffs2_rename (struct inode *o
@@ -890,7 +909,7 @@ static int jffs2_rename (struct user_nam
return ret;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -195,6 +195,9 @@ static void __br_handle_local_finish(str
@@ -197,6 +197,9 @@ static void __br_handle_local_finish(str
/* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
Expand All @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__br_handle_local_finish(skb);

/* return 1 to signal the okfn() was called so it's ok to use the skb */
@@ -348,6 +351,17 @@ static rx_handler_result_t br_handle_fra
@@ -362,6 +365,17 @@ static rx_handler_result_t br_handle_fra

forward:
switch (p->state) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/Makefile
+++ b/Makefile
@@ -735,11 +735,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
@@ -752,11 +752,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1384,6 +1384,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
@@ -1438,6 +1438,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference

Expand All @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -77,6 +77,11 @@ static unsigned int kallsyms_expand_symb
@@ -80,6 +80,11 @@ static unsigned int kallsyms_expand_symb
* For every byte on the compressed symbol data, copy the table
* entry for that byte.
*/
Expand All @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
while (len) {
tptr = &kallsyms_token_table[kallsyms_token_index[*data]];
data++;
@@ -109,6 +114,9 @@ tail:
@@ -112,6 +117,9 @@ tail:
*/
static char kallsyms_get_symbol_type(unsigned int off)
{
Expand Down Expand Up @@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -186,6 +186,10 @@ kallsyms()
@@ -260,6 +260,10 @@ kallsyms()
kallsymopt="${kallsymopt} --base-relative"
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -983,8 +983,10 @@ char *symbol_string(char *buf, char *end
@@ -984,8 +984,10 @@ char *symbol_string(char *buf, char *end
struct printf_spec spec, const char *fmt)
{
unsigned long value;
Expand All @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif

if (fmt[1] == 'R')
@@ -1001,8 +1003,14 @@ char *symbol_string(char *buf, char *end
@@ -1006,8 +1008,14 @@ char *symbol_string(char *buf, char *end

return string_nocheck(buf, end, sym, spec);
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -13,3 +13,5 @@ source "drivers/platform/chrome/Kconfig"
@@ -15,3 +15,5 @@ source "drivers/platform/mellanox/Kconfi
source "drivers/platform/olpc/Kconfig"

source "drivers/platform/surface/Kconfig"
+
+source "drivers/platform/mikrotik/Kconfig"
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_MIPS) += mips/
@@ -10,3 +10,4 @@ obj-$(CONFIG_OLPC_EC) += olpc/
obj-$(CONFIG_GOLDFISH) += goldfish/
obj-$(CONFIG_CHROME_PLATFORMS) += chrome/
obj-$(CONFIG_SURFACE_PLATFORMS) += surface/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1085,9 +1085,6 @@ config FW_ARC
@@ -1100,9 +1100,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

Expand Down
11 changes: 5 additions & 6 deletions target/linux/generic/pending-5.15/305-mips_module_reloc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -31,14 +31,221 @@ struct mips_hi16 {
@@ -31,23 +31,261 @@ struct mips_hi16 {
static LIST_HEAD(dbe_list);
static DEFINE_SPINLOCK(dbe_lock);

Expand Down Expand Up @@ -267,9 +267,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ return 0;
+}

static int apply_r_mips_none(struct module *me, u32 *location,
u32 base, Elf_Addr v, bool rela)
@@ -54,9 +261,40 @@ static int apply_r_mips_32(struct module
static void apply_r_mips_32(u32 *location, u32 base, Elf_Addr v)
{
*location = base + v;
}

Expand Down Expand Up @@ -310,7 +309,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (v % 4) {
pr_err("module %s: dangerous R_MIPS_26 relocation\n",
me->name);
@@ -64,13 +302,17 @@ static int apply_r_mips_26(struct module
@@ -55,13 +293,17 @@ static int apply_r_mips_26(struct module
}

if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
Expand All @@ -332,7 +331,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

return 0;
}
@@ -446,9 +688,36 @@ int module_finalize(const Elf_Ehdr *hdr,
@@ -441,9 +683,36 @@ int module_finalize(const Elf_Ehdr *hdr,
list_add(&me->arch.dbe_list, &dbe_list);
spin_unlock_irq(&dbe_lock);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/arch/mips/include/asm/mach-generic/spaces.h
+++ b/arch/mips/include/asm/mach-generic/spaces.h
@@ -54,7 +54,7 @@
@@ -46,7 +46,7 @@
* Memory above this physical address will be considered highmem.
*/
#ifndef HIGHMEM_START
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.15/308-mips32r2_tune.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -174,7 +174,7 @@ cflags-$(CONFIG_CPU_VR41XX) += -march=r4
@@ -175,7 +175,7 @@ cflags-$(CONFIG_CPU_VR41XX) += -march=r4
cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_MIPS32_R1) += -march=mips32 -Wa,--trap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
PTR_L a0, arg0
PTR_L a1, arg1
PTR_L a2, arg2
@@ -96,7 +97,7 @@ done:
@@ -98,7 +99,7 @@ done:
#endif
/* jump to kexec_start_address */
j s1
Expand All @@ -260,7 +260,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

#ifdef CONFIG_SMP
/*
@@ -182,9 +183,15 @@ kexec_indirection_page:
@@ -181,9 +182,15 @@ kexec_indirection_page:
PTR_WD 0
.size kexec_indirection_page, PTRSIZE

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>

--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -214,7 +214,7 @@ config PPC
@@ -222,7 +222,7 @@ config PPC
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZMA if DEFAULT_UIMAGE
select HAVE_KERNEL_LZO if DEFAULT_UIMAGE
Expand Down
12 changes: 6 additions & 6 deletions target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/*
* MTD methods which simply translate the effective address and pass through
@@ -236,6 +238,146 @@ static int mtd_add_partition_attrs(struc
@@ -235,6 +237,146 @@ static int mtd_add_partition_attrs(struc
return ret;
}

Expand Down Expand Up @@ -188,23 +188,23 @@
int mtd_add_partition(struct mtd_info *parent, const char *name,
long long offset, long long length)
{
@@ -274,6 +416,7 @@ int mtd_add_partition(struct mtd_info *p
@@ -273,6 +415,7 @@ int mtd_add_partition(struct mtd_info *p
if (ret)
goto err_remove_part;

+ mtd_partition_split(parent, child);
mtd_add_partition_attrs(child);

return 0;
@@ -422,6 +565,7 @@ int add_mtd_partitions(struct mtd_info *
@@ -421,6 +564,7 @@ int add_mtd_partitions(struct mtd_info *
goto err_del_partitions;
}

+ mtd_partition_split(master, child);
mtd_add_partition_attrs(child);

/* Look for subpartitions */
@@ -438,31 +582,6 @@ err_del_partitions:
@@ -437,31 +581,6 @@ err_del_partitions:
return ret;
}

Expand Down Expand Up @@ -272,7 +272,7 @@
obj-$(CONFIG_MTD_BLOCK) += mtdblock.o
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -608,6 +608,24 @@ static inline void mtd_align_erase_req(s
@@ -615,6 +615,24 @@ static inline void mtd_align_erase_req(s
req->len += mtd->erasesize - mod;
}

Expand All @@ -297,7 +297,7 @@
static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
{
if (mtd->writesize_shift)
@@ -680,6 +698,13 @@ extern void __put_mtd_device(struct mtd_
@@ -687,6 +705,13 @@ extern void __put_mtd_device(struct mtd_
extern struct mtd_info *get_mtd_device_nm(const char *name);
extern void put_mtd_device(struct mtd_info *mtd);

Expand Down

0 comments on commit 009f8af

Please sign in to comment.