• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt


Commit MetaInfo

Revision6cf222540e4ba4eb7c4df53418fccc6057a9177e (tree)
Time2022-01-21 12:37:11
AuthorTianling Shen <i@cnsz...>
CommiterTianling Shen

Log Message

Merge Official Source

Signed-off-by: Tianling Shen <i@cnsztl.eu.org>

Change Summary

Incremental Difference

--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
66 KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
77 endif
88
9-LINUX_VERSION-5.4 = .168
9+LINUX_VERSION-5.4 = .171
1010
11-LINUX_KERNEL_HASH-5.4.168 = ecb79ac4d465623560a6da31e3b0a0cf3fbb7c09e9ba88f06567436757191181
11+LINUX_KERNEL_HASH-5.4.171 = afbcc8ed7d85485af299567f307b03057ffff3ec7bee02a21c33933d435b4958
1212
1313 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
1414 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,7 +1,7 @@
11 include $(TOPDIR)/rules.mk
22
33 PKG_NAME:=ustream-ssl
4-PKG_RELEASE:=1
4+PKG_RELEASE:=2
55
66 PKG_SOURCE_PROTO:=git
77 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
@@ -37,6 +37,7 @@ define Package/libustream-wolfssl
3737 $(Package/libustream/default)
3838 TITLE += (wolfssl)
3939 DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
40+ CONFLICTS := libustream-openssl
4041 VARIANT:=wolfssl
4142 endef
4243
@@ -44,6 +45,7 @@ define Package/libustream-mbedtls
4445 $(Package/libustream/default)
4546 TITLE += (mbedtls)
4647 DEPENDS += +libmbedtls
48+ CONFLICTS := libustream-openssl libustream-wolfssl
4749 VARIANT:=mbedtls
4850 DEFAULT_VARIANT:=1
4951 endef
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
1212
1313 PKG_SOURCE_PROTO:=git
1414 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
15-PKG_SOURCE_DATE:=2021-02-23
16-PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4
17-PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4
15+PKG_SOURCE_DATE:=2021-03-08
16+PKG_SOURCE_VERSION:=2cfc26f8456a4d5ba3836c914a742f3d00bad781
17+PKG_MIRROR_HASH:=4b514143949b6ea5799a7b0b2f2f4ad5f084f88929eb0ac5a01ffc7852a71d22
1818 CMAKE_INSTALL:=1
1919
2020 PKG_LICENSE:=GPL-2.0
--- a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
+++ b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
9393 static const char hcd_name[] = "xhci_hcd";
9494
9595 static struct hc_driver __read_mostly xhci_pci_hc_driver;
96-@@ -331,6 +371,873 @@ static void xhci_pme_acpi_rtd3_enable(st
96+@@ -334,6 +374,873 @@ static void xhci_pme_acpi_rtd3_enable(st
9797 static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
9898 #endif /* CONFIG_ACPI */
9999
@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
967967 /* called during probe() after chip reset completes */
968968 static int xhci_pci_setup(struct usb_hcd *hcd)
969969 {
970-@@ -372,6 +1279,27 @@ static int xhci_pci_probe(struct pci_dev
970+@@ -375,6 +1282,27 @@ static int xhci_pci_probe(struct pci_dev
971971 struct hc_driver *driver;
972972 struct usb_hcd *hcd;
973973
@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
995995 driver = (struct hc_driver *)id->driver_data;
996996
997997 /* Prevent runtime suspending between USB-2 and USB-3 initialization */
998-@@ -433,6 +1361,16 @@ static void xhci_pci_remove(struct pci_d
998+@@ -436,6 +1364,16 @@ static void xhci_pci_remove(struct pci_d
999999 {
10001000 struct xhci_hcd *xhci;
10011001
@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
10121012 xhci = hcd_to_xhci(pci_get_drvdata(dev));
10131013 xhci->xhc_state |= XHCI_STATE_REMOVING;
10141014
1015-@@ -572,6 +1510,11 @@ static int xhci_pci_resume(struct usb_hc
1015+@@ -575,6 +1513,11 @@ static int xhci_pci_resume(struct usb_hc
10161016 if (pdev->vendor == PCI_VENDOR_ID_INTEL)
10171017 usb_enable_intel_xhci_ports(pdev);
10181018
--- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
+++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
@@ -13,7 +13,7 @@ produce a noisy warning.
1313
1414 --- a/drivers/usb/host/xhci-pci.c
1515 +++ b/drivers/usb/host/xhci-pci.c
16-@@ -299,6 +299,7 @@ static void xhci_pci_quirks(struct devic
16+@@ -302,6 +302,7 @@ static void xhci_pci_quirks(struct devic
1717 pdev->device == 0x0015) {
1818 xhci->quirks |= XHCI_RESET_ON_RESUME;
1919 xhci->quirks |= XHCI_ZERO_64B_REGS;
--- a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts
+++ b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts
@@ -127,6 +127,10 @@
127127 };
128128 };
129129
130+&ref {
131+ clock-frequency = <25000000>;
132+};
133+
130134 &spi {
131135 status = "okay";
132136
--- a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1414
1515 --- a/drivers/net/usb/lan78xx.c
1616 +++ b/drivers/net/usb/lan78xx.c
17-@@ -2469,6 +2469,11 @@ static int lan78xx_reset(struct lan78xx_
17+@@ -2471,6 +2471,11 @@ static int lan78xx_reset(struct lan78xx_
1818 int ret = 0;
1919 unsigned long timeout;
2020 u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626
2727 ret = lan78xx_read_reg(dev, HW_CFG, &buf);
2828 buf |= HW_CFG_LRST_;
29-@@ -2522,6 +2527,9 @@ static int lan78xx_reset(struct lan78xx_
29+@@ -2524,6 +2529,9 @@ static int lan78xx_reset(struct lan78xx_
3030
3131 ret = lan78xx_read_reg(dev, HW_CFG, &buf);
3232 buf |= HW_CFG_MEF_;
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3636 ret = lan78xx_write_reg(dev, HW_CFG, buf);
3737
3838 ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
39-@@ -2577,6 +2585,9 @@ static int lan78xx_reset(struct lan78xx_
39+@@ -2579,6 +2587,9 @@ static int lan78xx_reset(struct lan78xx_
4040 buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
4141 }
4242 }
--- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
@@ -279,7 +279,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
279279 }
280280 --- a/drivers/mmc/core/host.c
281281 +++ b/drivers/mmc/core/host.c
282-@@ -434,15 +434,30 @@ struct mmc_host *mmc_alloc_host(int extr
282+@@ -443,15 +443,30 @@ struct mmc_host *mmc_alloc_host(int extr
283283 {
284284 int err;
285285 struct mmc_host *host;
--- a/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1515
1616 --- a/drivers/net/usb/lan78xx.c
1717 +++ b/drivers/net/usb/lan78xx.c
18-@@ -2651,6 +2651,22 @@ static int lan78xx_open(struct net_devic
18+@@ -2653,6 +2653,22 @@ static int lan78xx_open(struct net_devic
1919
2020 netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
2121
--- a/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
@@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
2121
2222 --- a/drivers/net/usb/lan78xx.c
2323 +++ b/drivers/net/usb/lan78xx.c
24-@@ -425,6 +425,15 @@ static int msg_level = -1;
24+@@ -427,6 +427,15 @@ static int msg_level = -1;
2525 module_param(msg_level, int, 0);
2626 MODULE_PARM_DESC(msg_level, "Override default message level");
2727
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
3737 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
3838 {
3939 u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
40-@@ -2933,8 +2942,14 @@ static int lan78xx_bind(struct lan78xx_n
40+@@ -2935,8 +2944,14 @@ static int lan78xx_bind(struct lan78xx_n
4141 if (DEFAULT_RX_CSUM_ENABLE)
4242 dev->net->features |= NETIF_F_RXCSUM;
4343
--- a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1616
1717 --- a/drivers/net/usb/lan78xx.c
1818 +++ b/drivers/net/usb/lan78xx.c
19-@@ -2183,6 +2183,22 @@ static int lan78xx_phy_init(struct lan78
19+@@ -2185,6 +2185,22 @@ static int lan78xx_phy_init(struct lan78
2020 mii_adv_to_linkmode_adv_t(fc, mii_adv);
2121 linkmode_or(phydev->advertising, fc, phydev->advertising);
2222
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3939 if (phydev->mdio.dev.of_node) {
4040 u32 reg;
4141 int len;
42-@@ -2660,22 +2676,6 @@ static int lan78xx_open(struct net_devic
42+@@ -2662,22 +2678,6 @@ static int lan78xx_open(struct net_devic
4343
4444 netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
4545
--- a/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch
@@ -108,7 +108,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
108108 +the fan to the user space through the hwmon sysfs interface.
109109 --- a/drivers/hwmon/Kconfig
110110 +++ b/drivers/hwmon/Kconfig
111-@@ -1356,6 +1356,17 @@ config SENSORS_RASPBERRYPI_HWMON
111+@@ -1357,6 +1357,17 @@ config SENSORS_RASPBERRYPI_HWMON
112112 This driver can also be built as a module. If so, the module
113113 will be called raspberrypi-hwmon.
114114
--- a/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch
@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1515
1616 --- a/drivers/net/usb/lan78xx.c
1717 +++ b/drivers/net/usb/lan78xx.c
18-@@ -2188,7 +2188,7 @@ static int lan78xx_phy_init(struct lan78
18+@@ -2190,7 +2190,7 @@ static int lan78xx_phy_init(struct lan78
1919 mii_adv_to_linkmode_adv_t(fc, mii_adv);
2020 linkmode_or(phydev->advertising, fc, phydev->advertising);
2121
--- a/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch
@@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing.
1212
1313 --- a/drivers/net/usb/lan78xx.c
1414 +++ b/drivers/net/usb/lan78xx.c
15-@@ -3177,7 +3177,7 @@ static int rx_submit(struct lan78xx_net
15+@@ -3179,7 +3179,7 @@ static int rx_submit(struct lan78xx_net
1616 size_t size = dev->rx_urb_size;
1717 int ret = 0;
1818
--- a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1010
1111 --- a/drivers/usb/host/xhci-pci.c
1212 +++ b/drivers/usb/host/xhci-pci.c
13-@@ -268,6 +268,10 @@ static void xhci_pci_quirks(struct devic
13+@@ -271,6 +271,10 @@ static void xhci_pci_quirks(struct devic
1414 pdev->device == 0x3432)
1515 xhci->quirks |= XHCI_BROKEN_STREAMS;
1616
--- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
2323
2424 --- a/drivers/usb/host/xhci-pci.c
2525 +++ b/drivers/usb/host/xhci-pci.c
26-@@ -269,8 +269,10 @@ static void xhci_pci_quirks(struct devic
26+@@ -272,8 +272,10 @@ static void xhci_pci_quirks(struct devic
2727 xhci->quirks |= XHCI_BROKEN_STREAMS;
2828
2929 if (pdev->vendor == PCI_VENDOR_ID_VIA &&
--- a/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
@@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2020
2121 --- a/drivers/net/usb/lan78xx.c
2222 +++ b/drivers/net/usb/lan78xx.c
23-@@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan
23+@@ -1183,6 +1183,9 @@ static int lan78xx_link_reset(struct lan
2424 if (unlikely(ret < 0))
2525 return -EIO;
2626
--- a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
185185 cfg->fc_flags |= RTF_REJECT;
186186
187187 if (rtm->rtm_type == RTN_LOCAL)
188-@@ -6056,6 +6087,8 @@ static int ip6_route_dev_notify(struct n
188+@@ -6084,6 +6115,8 @@ static int ip6_route_dev_notify(struct n
189189 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
190190 net->ipv6.ip6_prohibit_entry->dst.dev = dev;
191191 net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
194194 net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
195195 net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
196196 #endif
197-@@ -6067,6 +6100,7 @@ static int ip6_route_dev_notify(struct n
197+@@ -6095,6 +6128,7 @@ static int ip6_route_dev_notify(struct n
198198 in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
199199 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
200200 in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
202202 in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
203203 #endif
204204 }
205-@@ -6259,6 +6293,8 @@ static int __net_init ip6_route_net_init
205+@@ -6287,6 +6321,8 @@ static int __net_init ip6_route_net_init
206206
207207 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
208208 net->ipv6.fib6_has_custom_rules = false;
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
211211 net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
212212 sizeof(*net->ipv6.ip6_prohibit_entry),
213213 GFP_KERNEL);
214-@@ -6269,11 +6305,21 @@ static int __net_init ip6_route_net_init
214+@@ -6297,11 +6333,21 @@ static int __net_init ip6_route_net_init
215215 ip6_template_metrics, true);
216216 INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
217217
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
234234 net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
235235 dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
236236 ip6_template_metrics, true);
237-@@ -6297,6 +6343,8 @@ out:
237+@@ -6325,6 +6371,8 @@ out:
238238 return ret;
239239
240240 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
243243 out_ip6_prohibit_entry:
244244 kfree(net->ipv6.ip6_prohibit_entry);
245245 out_ip6_null_entry:
246-@@ -6316,6 +6364,7 @@ static void __net_exit ip6_route_net_exi
246+@@ -6344,6 +6392,7 @@ static void __net_exit ip6_route_net_exi
247247 kfree(net->ipv6.ip6_null_entry);
248248 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
249249 kfree(net->ipv6.ip6_prohibit_entry);
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
251251 kfree(net->ipv6.ip6_blk_hole_entry);
252252 #endif
253253 dst_entries_destroy(&net->ipv6.ip6_dst_ops);
254-@@ -6393,6 +6442,9 @@ void __init ip6_route_init_special_entri
254+@@ -6421,6 +6470,9 @@ void __init ip6_route_init_special_entri
255255 init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
256256 init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
257257 init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
@@ -33,13 +33,13 @@
3333
3434 dect {
3535 label = "dect";
36- gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
36+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
3737 linux,code = <KEY_PHONE>;
3838 };
3939
4040 wifi {
4141 label = "wifi";
42- gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
42+ gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
4343 linux,code = <KEY_RFKILL>;
4444 };
4545 };
Show on old repository browser