Browse Source

kernel: bump 5.10 to 5.10.90

Add and enable a new kconfig knob to disable unprivileged eBPF by default.

Patches automatically rebased.

Signed-off-by: Rui Salvaterra <[email protected]>
Rui Salvaterra 3 years ago
parent
commit
536f051b97

+ 2 - 2
include/kernel-version.mk

@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 endif
 
 
 LINUX_VERSION-5.4 = .170
 LINUX_VERSION-5.4 = .170
-LINUX_VERSION-5.10 = .89
+LINUX_VERSION-5.10 = .90
 
 
 LINUX_KERNEL_HASH-5.4.170 = b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c
 LINUX_KERNEL_HASH-5.4.170 = b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c
-LINUX_KERNEL_HASH-5.10.89 = 92218b1a4a18f1cb9ec07d2b7fce41577452aa552c54c25b6d5fe9b4b543bb30
+LINUX_KERNEL_HASH-5.10.90 = 945e4264c014a3d9dfc0a4639309dd1ec2fb545416556421f931b95da78c2725
 
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

+ 1 - 1
target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

@@ -13,7 +13,7 @@ produce a noisy warning.
 
 
 --- a/drivers/usb/host/xhci-pci.c
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -276,6 +276,7 @@ static void xhci_pci_quirks(struct devic
+@@ -279,6 +279,7 @@ static void xhci_pci_quirks(struct devic
  	    pdev->device == 0x0015) {
  	    pdev->device == 0x0015) {
  		xhci->quirks |= XHCI_RESET_ON_RESUME;
  		xhci->quirks |= XHCI_RESET_ON_RESUME;
  		xhci->quirks |= XHCI_ZERO_64B_REGS;
  		xhci->quirks |= XHCI_ZERO_64B_REGS;

+ 1 - 1
target/linux/bcm27xx/patches-5.10/950-0355-xhci-quirks-add-link-TRB-quirk-for-VL805.patch

@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
 
 
 --- a/drivers/usb/host/xhci-pci.c
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -288,6 +288,7 @@ static void xhci_pci_quirks(struct devic
+@@ -291,6 +291,7 @@ static void xhci_pci_quirks(struct devic
  	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
  	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
  		xhci->quirks |= XHCI_LPM_SUPPORT;
  		xhci->quirks |= XHCI_LPM_SUPPORT;
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;

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

@@ -319,7 +319,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int tx_size, err, i;
  	int tx_size, err, i;
  	struct ag71xx *ag;
  	struct ag71xx *ag;
  
  
-@@ -1957,10 +1956,8 @@ static int ag71xx_probe(struct platform_
+@@ -1952,10 +1951,8 @@ static int ag71xx_probe(struct platform_
  	ag->stop_desc->ctrl = 0;
  	ag->stop_desc->ctrl = 0;
  	ag->stop_desc->next = (u32)ag->stop_desc_dma;
  	ag->stop_desc->next = (u32)ag->stop_desc_dma;
  
  

+ 1 - 0
target/linux/generic/config-5.10

@@ -705,6 +705,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_BPF_PRELOAD is not set
 # CONFIG_BPF_STREAM_PARSER is not set
 # CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPQETHER is not set
 # CONFIG_BPQETHER is not set
 CONFIG_BQL=y
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_BRANCH_PROFILE_NONE=y

+ 1 - 1
target/linux/generic/hack-5.10/204-module_strip.patch

@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  
 --- a/init/Kconfig
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +++ b/init/Kconfig
-@@ -2337,6 +2337,13 @@ config UNUSED_KSYMS_WHITELIST
+@@ -2347,6 +2347,13 @@ config UNUSED_KSYMS_WHITELIST
  	  one per line. The path can be absolute, or relative to the kernel
  	  one per line. The path can be absolute, or relative to the kernel
  	  source tree.
  	  source tree.
  
  

+ 1 - 1
target/linux/generic/pending-5.10/920-mangle_bootargs.patch

@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
 
 
 --- a/init/Kconfig
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +++ b/init/Kconfig
-@@ -1790,6 +1790,15 @@ config EMBEDDED
+@@ -1800,6 +1800,15 @@ config EMBEDDED
  	  an embedded system so certain expert options are available
  	  an embedded system so certain expert options are available
  	  for configuration.
  	  for configuration.
  
  

+ 3 - 8
target/linux/kirkwood/patches-5.10/800-power-reset-linkstation-poweroff-prepare-for-new-dev.patch

@@ -15,8 +15,6 @@ Signed-off-by: Pawel Dembicki <[email protected]>
  drivers/power/reset/linkstation-poweroff.c | 35 ++++++++++++++++++----
  drivers/power/reset/linkstation-poweroff.c | 35 ++++++++++++++++++----
  1 file changed, 29 insertions(+), 6 deletions(-)
  1 file changed, 29 insertions(+), 6 deletions(-)
 
 
-diff --git a/drivers/power/reset/linkstation-poweroff.c b/drivers/power/reset/linkstation-poweroff.c
-index f1e843df0e16..8691cf98600d 100644
 --- a/drivers/power/reset/linkstation-poweroff.c
 --- a/drivers/power/reset/linkstation-poweroff.c
 +++ b/drivers/power/reset/linkstation-poweroff.c
 +++ b/drivers/power/reset/linkstation-poweroff.c
 @@ -29,11 +29,21 @@
 @@ -29,11 +29,21 @@
@@ -42,7 +40,7 @@ index f1e843df0e16..8691cf98600d 100644
  
  
  	saved_page = phy_select_page(phydev, MII_MARVELL_LED_PAGE);
  	saved_page = phy_select_page(phydev, MII_MARVELL_LED_PAGE);
  	if (saved_page < 0)
  	if (saved_page < 0)
-@@ -66,11 +76,16 @@ static void mvphy_reg_intn(u16 data)
+@@ -66,11 +76,16 @@ err:
  		dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
  		dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
  }
  }
  
  
@@ -60,7 +58,7 @@ index f1e843df0e16..8691cf98600d 100644
  
  
  	return NOTIFY_DONE;
  	return NOTIFY_DONE;
  }
  }
-@@ -82,14 +97,18 @@ static struct notifier_block linkstation_reboot_nb = {
+@@ -82,14 +97,18 @@ static struct notifier_block linkstation
  static void linkstation_poweroff(void)
  static void linkstation_poweroff(void)
  {
  {
  	unregister_reboot_notifier(&linkstation_reboot_nb);
  	unregister_reboot_notifier(&linkstation_reboot_nb);
@@ -82,7 +80,7 @@ index f1e843df0e16..8691cf98600d 100644
  	{ },
  	{ },
  };
  };
  
  
-@@ -97,13 +116,17 @@ static int __init linkstation_poweroff_init(void)
+@@ -97,13 +116,17 @@ static int __init linkstation_poweroff_i
  {
  {
  	struct mii_bus *bus;
  	struct mii_bus *bus;
  	struct device_node *dn;
  	struct device_node *dn;
@@ -101,6 +99,3 @@ index f1e843df0e16..8691cf98600d 100644
  	if (!dn)
  	if (!dn)
  		return -ENODEV;
  		return -ENODEV;
  
  
--- 
-2.25.1
-

+ 2 - 7
target/linux/kirkwood/patches-5.10/801-power-reset-linkstation-poweroff-add-new-device.patch

@@ -17,8 +17,6 @@ Signed-off-by: Pawel Dembicki <[email protected]>
  drivers/power/reset/linkstation-poweroff.c | 43 ++++++++++++++++++++++
  drivers/power/reset/linkstation-poweroff.c | 43 ++++++++++++++++++++++
  1 file changed, 43 insertions(+)
  1 file changed, 43 insertions(+)
 
 
-diff --git a/drivers/power/reset/linkstation-poweroff.c b/drivers/power/reset/linkstation-poweroff.c
-index 8691cf98600d..2a92b6052cac 100644
 --- a/drivers/power/reset/linkstation-poweroff.c
 --- a/drivers/power/reset/linkstation-poweroff.c
 +++ b/drivers/power/reset/linkstation-poweroff.c
 +++ b/drivers/power/reset/linkstation-poweroff.c
 @@ -19,6 +19,7 @@
 @@ -19,6 +19,7 @@
@@ -38,7 +36,7 @@ index 8691cf98600d..2a92b6052cac 100644
  struct power_off_cfg {
  struct power_off_cfg {
  	char *mdio_node_name;
  	char *mdio_node_name;
  	void (*phy_set_reg)(bool restart);
  	void (*phy_set_reg)(bool restart);
-@@ -76,11 +79,48 @@ static void linkstation_mvphy_reg_intn(bool restart)
+@@ -76,11 +79,48 @@ err:
  		dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
  		dev_err(&phydev->mdio.dev, "Write register failed, %d\n", rc);
  }
  }
  
  
@@ -87,7 +85,7 @@ index 8691cf98600d..2a92b6052cac 100644
  static int linkstation_reboot_notifier(struct notifier_block *nb,
  static int linkstation_reboot_notifier(struct notifier_block *nb,
  				       unsigned long action, void *unused)
  				       unsigned long action, void *unused)
  {
  {
-@@ -109,6 +149,9 @@ static const struct of_device_id ls_poweroff_of_match[] = {
+@@ -109,6 +149,9 @@ static const struct of_device_id ls_powe
  	{ .compatible = "buffalo,ls421de",
  	{ .compatible = "buffalo,ls421de",
  	  .data = &linkstation_power_off_cfg,
  	  .data = &linkstation_power_off_cfg,
  	},
  	},
@@ -97,6 +95,3 @@ index 8691cf98600d..2a92b6052cac 100644
  	{ },
  	{ },
  };
  };
  
  
--- 
-2.25.1
-