Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2022-11-17 04:08:19 +04:00 committed by GitHub
commit ef277e6708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/kernel-5.10
View file

@ -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

4
include/kernel-5.15
View file

@ -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

2
target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
View file

@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- 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),

2
target/linux/bcm27xx/patches-5.15/950-0471-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
View file

@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- 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;

4
target/linux/bcm4908/image/Makefile
View file

@ -75,7 +75,7 @@ define Device/Default
endef
define Device/asus_gt-ac5300
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := GT-AC5300
DEVICE_DTS := broadcom/bcmbca/bcm4908-asus-gt-ac5300
IMAGES := bin
@ -88,7 +88,7 @@ endef
TARGET_DEVICES += asus_gt-ac5300
define Device/asus_gt-ax6000
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := GT-AX6000
DEVICE_DTS := broadcom/bcmbca/bcm4912-asus-gt-ax6000
IMAGES := pkgtb

10
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View file

@ -775,7 +775,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* 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;
@ -783,7 +783,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
--- 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,7 +1455,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
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;
@ -1463,7 +1463,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
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:

4
target/linux/generic/hack-5.10/221-module_exports.patch
View file

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* 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 <nbd@nbd.name>
__stop___ksymtab_gpl = .; \
} \
\
@@ -542,7 +552,7 @@
@@ -543,7 +553,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

4
target/linux/generic/hack-5.15/221-module_exports.patch
View file

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* 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 <nbd@nbd.name>
__stop___ksymtab_gpl = .; \
} \
\
@@ -511,7 +521,7 @@
@@ -512,7 +522,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

1
target/linux/mpc85xx/config-5.15
View file

@ -71,6 +71,7 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_ETHERNET_PACKET_MANGLE=y
CONFIG_FIXED_PHY=y
CONFIG_FSL_BOOKE=y
# CONFIG_FSL_DPAA2_SWITCH is not set
CONFIG_FSL_EMB_PERFMON=y
# CONFIG_FSL_FMAN is not set
CONFIG_FSL_LBC=y

10
target/linux/ramips/image/mt7620.mk
View file

@ -91,7 +91,7 @@ TARGET_DEVICES += ampedwireless_b1200ex
define Device/asus_rp-n53
SOC := mt7620a
IMAGE_SIZE := 7872k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RP-N53
DEVICE_PACKAGES := kmod-rt2800-pci
SUPPORTED_DEVICES += rp-n53
@ -101,7 +101,7 @@ TARGET_DEVICES += asus_rp-n53
define Device/asus_rt-ac51u
SOC := mt7620a
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC51U
DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci \
kmod-usb-ledtrig-usbport
@ -112,7 +112,7 @@ TARGET_DEVICES += asus_rt-ac51u
define Device/asus_rt-ac54u
SOC := mt7620a
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC54U
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \
kmod-usb-ledtrig-usbport
@ -122,7 +122,7 @@ TARGET_DEVICES += asus_rt-ac54u
define Device/asus_rt-n12p
SOC := mt7620n
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N11P/RT-N12+/RT-N12Eb1
SUPPORTED_DEVICES += rt-n12p
endef
@ -131,7 +131,7 @@ TARGET_DEVICES += asus_rt-n12p
define Device/asus_rt-n14u
SOC := mt7620n
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N14u
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
SUPPORTED_DEVICES += rt-n14u

12
target/linux/ramips/image/mt76x8.mk
View file

@ -40,9 +40,9 @@ TARGET_DEVICES += alfa-network_awusfree1
define Device/asus_rt-ac1200
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC1200
DEVICE_ALT0_VENDOR := Asus
DEVICE_ALT0_VENDOR := ASUS
DEVICE_ALT0_MODEL := RT-N600
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci \
kmod-usb-ledtrig-usbport
@ -52,7 +52,7 @@ TARGET_DEVICES += asus_rt-ac1200
define Device/asus_rt-ac1200-v2
BLOCKSIZE := 64k
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC1200
DEVICE_VARIANT := V2
IMAGES += factory.bin
@ -64,7 +64,7 @@ TARGET_DEVICES += asus_rt-ac1200-v2
define Device/asus_rt-n10p-v3
IMAGE_SIZE := 7872k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N10P
DEVICE_VARIANT := V3
endef
@ -72,7 +72,7 @@ TARGET_DEVICES += asus_rt-n10p-v3
define Device/asus_rt-n11p-b1
IMAGE_SIZE := 7872k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N11P
DEVICE_VARIANT := B1
DEVICE_ALT0_VENDOR := ASUS
@ -86,7 +86,7 @@ TARGET_DEVICES += asus_rt-n11p-b1
define Device/asus_rt-n12-vp-b1
IMAGE_SIZE := 7872k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N12 VP
DEVICE_VARIANT := B1
endef

2
target/linux/ramips/image/rt288x.mk
View file

@ -40,7 +40,7 @@ TARGET_DEVICES += airlink101_ar725w
define Device/asus_rt-n15
BLOCKSIZE := 64k
IMAGE_SIZE := 3776k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N15
DEVICE_PACKAGES := kmod-switch-rtl8366s
SUPPORTED_DEVICES += rt-n15

10
target/linux/ramips/image/rt305x.mk
View file

@ -209,7 +209,7 @@ define Device/asus_rt-g32-b1
SOC := rt3050
BLOCKSIZE := 4k
IMAGE_SIZE := 3776k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-G32
DEVICE_VARIANT := B1
SUPPORTED_DEVICES += rt-g32-b1
@ -221,7 +221,7 @@ define Device/asus_rt-n10-plus
SOC := rt3050
BLOCKSIZE := 64k
IMAGE_SIZE := 3776k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N10+
SUPPORTED_DEVICES += rt-n10-plus
DEFAULT := n
@ -231,7 +231,7 @@ TARGET_DEVICES += asus_rt-n10-plus
define Device/asus_rt-n13u
SOC := rt3052
IMAGE_SIZE := 7872k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N13U
DEVICE_PACKAGES := kmod-leds-gpio kmod-rt2800-pci kmod-usb-dwc2
SUPPORTED_DEVICES += rt-n13u
@ -242,7 +242,7 @@ define Device/asus_wl-330n
SOC := rt3050
BLOCKSIZE := 4k
IMAGE_SIZE := 3776k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := WL-330N
SUPPORTED_DEVICES += wl-330n
DEFAULT := n
@ -253,7 +253,7 @@ define Device/asus_wl-330n3g
SOC := rt3050
BLOCKSIZE := 4k
IMAGE_SIZE := 3776k
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := WL-330N3G
DEVICE_PACKAGES :=
SUPPORTED_DEVICES += wl-330n3g

2
target/linux/ramips/image/rt3883.mk
View file

@ -10,7 +10,7 @@ define Device/asus_rt-n56u
BLOCKSIZE := 64k
IMAGE_SIZE := 7872k
IMAGE/sysupgrade.bin += | mkrtn56uimg -s
DEVICE_VENDOR := Asus
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-N56U
DEVICE_PACKAGES := kmod-usb-ohci kmod-usb2
SUPPORTED_DEVICES += rt-n56u

4
tools/xz/Makefile
View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xz
PKG_VERSION:=5.2.7
PKG_VERSION:=5.2.8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils \
http://tukaani.org/xz
PKG_HASH:=b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b
PKG_HASH:=1f8a43d9fcf325d049a31fe4514dc8c44a6d00ce8860d48c4212d1e349d2a3ed
PKG_CPE_ID:=cpe:/a:tukaani:xz
HOST_BUILD_PARALLEL:=1