forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: mediatek: add filogic 820 (MT7981) subtarget support kernel: modules: package Marvell gigE PHY driver uboot-mediatek: optimize MMC erase tools: update versions (coolsnowwolf#10444) kernel: bump 5.15 to 5.15.79 (coolsnowwolf#10441) kernel: bump 5.10 to 5.10.155 (coolsnowwolf#10443) libnetfilter-conntrack: bump to 1.0.9 (coolsnowwolf#10442) ipq60xx: sync patches from upstream Update README.md netsupport.mk: fix rxrpc dependence ipq6000: add usb3 DT description kernel: bump 6.0 to 6.0.9 (coolsnowwolf#10429)
- Loading branch information
Showing
76 changed files
with
3,822 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.10 = .154 | ||
| LINUX_KERNEL_HASH-5.10.154 = c6ae3d4da4324933160260d0f092a40cd27f9ed03449380790afbe6ce91ee688 | ||
| LINUX_VERSION-5.10 = .155 | ||
| LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.15 = .78 | ||
| LINUX_KERNEL_HASH-5.15.78 = 0db99f7347a38c27b8c155f3c9c8b260011aea0a4ded85ee95e6095b1e69a499 | ||
| LINUX_VERSION-5.15 = .79 | ||
| LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.0 = .8 | ||
| LINUX_KERNEL_HASH-6.0.8 = 0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257 | ||
| LINUX_VERSION-6.0 = .9 | ||
| LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,12 +8,12 @@ | |
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=libnetfilter_conntrack | ||
| PKG_VERSION:=1.0.8 | ||
| PKG_RELEASE:=1 | ||
| PKG_VERSION:=1.0.9 | ||
| PKG_RELEASE:=2 | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 | ||
| PKG_SOURCE_URL:=https://www.netfilter.org/projects/libnetfilter_conntrack/files | ||
| PKG_HASH:=0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf | ||
| PKG_HASH:=67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 | ||
|
|
||
| PKG_MAINTAINER:=Jo-Philipp Wich <[email protected]> | ||
| PKG_LICENSE:=GPL-2.0-or-later | ||
|
|
||
49 changes: 49 additions & 0 deletions
49
...s/libnetfilter-conntrack/patches/0001-conntrack-fix-build-with-kernel-5_15-and-musl.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 | ||
| From: Robert Marko <[email protected]> | ||
| Date: Thu, 24 Feb 2022 15:01:11 +0100 | ||
| Subject: conntrack: fix build with kernel 5.15 and musl | ||
|
|
||
| Currently, with kernel 5.15 headers and musl building is failing with | ||
| redefinition errors due to a conflict between the kernel and musl headers. | ||
|
|
||
| Musl is able to suppres the conflicting kernel header definitions if they | ||
| are included after the standard libc ones, however since ICMP definitions | ||
| were moved into a separate internal header to avoid duplication this has | ||
| stopped working and is breaking the builds. | ||
|
|
||
| It seems that the issue is that <netinet/in.h> which contains the UAPI | ||
| suppression defines is included in the internal.h header and not in the | ||
| proto.h which actually includes the kernel ICMP headers and thus UAPI | ||
| supression defines are not present. | ||
|
|
||
| Solve this by moving the <netinet/in.h> include before the ICMP kernel | ||
| includes in the proto.h | ||
|
|
||
| Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") | ||
| Signed-off-by: Robert Marko <[email protected]> | ||
| Signed-off-by: Florian Westphal <[email protected]> | ||
| --- | ||
| include/internal/internal.h | 1 - | ||
| include/internal/proto.h | 1 + | ||
| 2 files changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/include/internal/internal.h | ||
| +++ b/include/internal/internal.h | ||
| @@ -14,7 +14,6 @@ | ||
| #include <arpa/inet.h> | ||
| #include <time.h> | ||
| #include <errno.h> | ||
| -#include <netinet/in.h> | ||
|
|
||
| #include <libnfnetlink/libnfnetlink.h> | ||
| #include <libnetfilter_conntrack/libnetfilter_conntrack.h> | ||
| --- a/include/internal/proto.h | ||
| +++ b/include/internal/proto.h | ||
| @@ -2,6 +2,7 @@ | ||
| #define _NFCT_PROTO_H_ | ||
|
|
||
| #include <stdint.h> | ||
| +#include <netinet/in.h> | ||
| #include <linux/icmp.h> | ||
| #include <linux/icmpv6.h> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
|
||
| --- a/sound/usb/quirks.c | ||
| +++ b/sound/usb/quirks.c | ||
| @@ -1883,6 +1883,8 @@ static const struct usb_audio_quirk_flag | ||
| @@ -1884,6 +1884,8 @@ static const struct usb_audio_quirk_flag | ||
| QUIRK_FLAG_GENERIC_IMPLICIT_FB), | ||
| DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */ | ||
| QUIRK_FLAG_GENERIC_IMPLICIT_FB), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
|
||
| --- a/sound/usb/card.c | ||
| +++ b/sound/usb/card.c | ||
| @@ -843,8 +843,14 @@ static int usb_audio_probe(struct usb_in | ||
| @@ -855,8 +855,14 @@ static int usb_audio_probe(struct usb_in | ||
| if (ignore_ctl_error) | ||
| chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -775,15 +775,15 @@ Signed-off-by: David S. Miller <[email protected]> | |
| /* bring up the dma engine and IP core */ | ||
| --- a/drivers/net/ethernet/marvell/mv643xx_eth.c | ||
| +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | ||
| @@ -2700,7 +2700,6 @@ static int mv643xx_eth_shared_of_add_por | ||
| @@ -2701,7 +2701,6 @@ static int mv643xx_eth_shared_of_add_por | ||
| struct platform_device *ppdev; | ||
| struct mv643xx_eth_platform_data ppd; | ||
| struct resource res; | ||
| - const char *mac_addr; | ||
| int ret; | ||
| int dev_num = 0; | ||
|
|
||
| @@ -2731,9 +2730,7 @@ static int mv643xx_eth_shared_of_add_por | ||
| @@ -2732,9 +2731,7 @@ static int mv643xx_eth_shared_of_add_por | ||
| return -EINVAL; | ||
| } | ||
|
|
||
|
|
@@ -1250,7 +1250,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
|
|
||
| --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | ||
| +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | ||
| @@ -372,7 +372,7 @@ static int meson8b_dwmac_probe(struct pl | ||
| @@ -370,7 +370,7 @@ static int meson8b_dwmac_probe(struct pl | ||
| if (ret) | ||
| return ret; | ||
|
|
||
|
|
@@ -1455,15 +1455,15 @@ Signed-off-by: David S. Miller <[email protected]> | |
| of_node_put(node); | ||
| --- a/drivers/net/ethernet/ti/cpsw.c | ||
| +++ b/drivers/net/ethernet/ti/cpsw.c | ||
| @@ -1306,7 +1306,6 @@ static int cpsw_probe_dt(struct cpsw_pla | ||
| @@ -1308,7 +1308,6 @@ static int cpsw_probe_dt(struct cpsw_pla | ||
|
|
||
| for_each_available_child_of_node(node, slave_node) { | ||
| struct cpsw_slave_data *slave_data = data->slave_data + i; | ||
| - const void *mac_addr = NULL; | ||
| int lenp; | ||
| const __be32 *parp; | ||
|
|
||
| @@ -1378,10 +1377,8 @@ static int cpsw_probe_dt(struct cpsw_pla | ||
| @@ -1380,10 +1379,8 @@ static int cpsw_probe_dt(struct cpsw_pla | ||
| } | ||
|
|
||
| no_phy_slave: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| /* Align . to a 8 byte boundary equals to maximum function alignment. */ | ||
| #define ALIGN_FUNCTION() . = ALIGN(8) | ||
|
|
||
| @@ -473,14 +483,14 @@ | ||
| @@ -474,14 +484,14 @@ | ||
| /* Kernel symbol table: Normal symbols */ \ | ||
| __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ | ||
| __start___ksymtab = .; \ | ||
|
|
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| __stop___ksymtab_gpl = .; \ | ||
| } \ | ||
| \ | ||
| @@ -542,7 +552,7 @@ | ||
| @@ -543,7 +553,7 @@ | ||
| \ | ||
| /* Kernel symbol table: strings */ \ | ||
| __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| /* Align . to a 8 byte boundary equals to maximum function alignment. */ | ||
| #define ALIGN_FUNCTION() . = ALIGN(8) | ||
|
|
||
| @@ -484,14 +494,14 @@ | ||
| @@ -485,14 +495,14 @@ | ||
| /* Kernel symbol table: Normal symbols */ \ | ||
| __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ | ||
| __start___ksymtab = .; \ | ||
|
|
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| __stop___ksymtab_gpl = .; \ | ||
| } \ | ||
| \ | ||
| @@ -511,7 +521,7 @@ | ||
| @@ -512,7 +522,7 @@ | ||
| \ | ||
| /* Kernel symbol table: strings */ \ | ||
| __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| /* Align . to a 8 byte boundary equals to maximum function alignment. */ | ||
| #define ALIGN_FUNCTION() . = ALIGN(8) | ||
|
|
||
| @@ -478,14 +488,14 @@ | ||
| @@ -479,14 +489,14 @@ | ||
| /* Kernel symbol table: Normal symbols */ \ | ||
| __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ | ||
| __start___ksymtab = .; \ | ||
|
|
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
| __stop___ksymtab_gpl = .; \ | ||
| } \ | ||
| \ | ||
| @@ -505,7 +515,7 @@ | ||
| @@ -506,7 +516,7 @@ | ||
| \ | ||
| /* Kernel symbol table: strings */ \ | ||
| __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -236,6 +236,10 @@ | |
| status = "okay"; | ||
| }; | ||
|
|
||
| &ssphy_0 { | ||
| status = "ok"; | ||
| }; | ||
|
|
||
| &qusb_phy_0 { | ||
| status = "ok"; | ||
| }; | ||
|
|
||
Oops, something went wrong.