Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.99
Browse files Browse the repository at this point in the history
Had to update generic defconfig (make kernel_menuconfig CONFIG_TARGET=generic)
for this bump, but since that only modifies the target defined in .config,
and since that target also needed to be updated for unrelated reasons, manually
propagated the newly added symbol to the generic config.

Removed upstreamed:
    pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch[1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.99&id=080f371d984e8039c66db87f3c54804b0d172329

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <graysky@archlinux.us>
  • Loading branch information
graysky2 authored and hauke committed Feb 11, 2022
1 parent e9c1c83 commit 5e43dd1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 58 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .98
LINUX_KERNEL_HASH-5.10.98 = 1b24c6c15f1011bcca54da7e58539c612c7c84f95b7902f62d34754aaf0f9443
LINUX_VERSION-5.10 = .99
LINUX_KERNEL_HASH-5.10.99 = 00a53558aad3d8638bbe3bb69ed82a2b5b58ed3af01596bc18686cd04a790449
Expand Up @@ -14,12 +14,12 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>

--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -1314,7 +1314,7 @@ static int bcm2835_pinctrl_probe(struct
@@ -1318,7 +1318,7 @@ static int bcm2835_pinctrl_probe(struct
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_level_irq;

- err = gpiochip_add_data(&pc->gpio_chip, pc);
+ err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
if (err) {
dev_err(dev, "could not add GPIO chip\n");
pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
goto out_remove;
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>

--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -1288,9 +1288,13 @@ static int bcm2835_pinctrl_probe(struct
@@ -1290,9 +1290,13 @@ static int bcm2835_pinctrl_probe(struct
char *name;

girq->parents[i] = irq_of_parse_and_map(np, i);
Expand Down
1 change: 1 addition & 0 deletions target/linux/generic/config-5.10
Expand Up @@ -1985,6 +1985,7 @@ CONFIG_FORTIFY_SOURCE=y
# CONFIG_FPGA is not set
# CONFIG_FRAMEBUFFER_CONSOLE is not set
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
# CONFIG_FRAME_POINTER is not set
CONFIG_FRAME_WARN=1024
# CONFIG_FREEZER is not set
Expand Down

This file was deleted.

@@ -1,6 +1,6 @@
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -67,6 +67,8 @@ config NET_DSA_QCA8K
@@ -68,6 +68,8 @@ config NET_DSA_QCA8K
This enables support for the Qualcomm Atheros QCA8K Ethernet
switch chips.

Expand Down

0 comments on commit 5e43dd1

Please sign in to comment.