diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2024-04-13 17:48:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2024-04-14 18:03:37 +0200 |
| commit | 2909cce1b279df641d435d3cbbcc478f8330d2df (patch) | |
| tree | 2dbe3765b7ba6856850ae3d9dae434fc0e3db4d3 /target/linux/ipq40xx/patches-6.1 | |
| parent | 1a44a260fe2ed2f74f134c4bbc34883c2b1efdda (diff) | |
| download | openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.tar.gz openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.tar.bz2 openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.zip | |
kernel: bump 6.1 to 6.1.86
Removed upstreamed:
bcm27xx/patches-6.1/950-1235-drm-vc4-don-t-check-if-plane-state-fb-state-fb.patch [1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.86&id=48bfb4b03c5ff6e1fa1dc73fb915e150b0968c40
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ipq40xx/patches-6.1')
| -rw-r--r-- | target/linux/ipq40xx/patches-6.1/701-net-dsa-add-out-of-band-tagging-protocol.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ipq40xx/patches-6.1/701-net-dsa-add-out-of-band-tagging-protocol.patch b/target/linux/ipq40xx/patches-6.1/701-net-dsa-add-out-of-band-tagging-protocol.patch index 68d1a2e23b..1723f2c749 100644 --- a/target/linux/ipq40xx/patches-6.1/701-net-dsa-add-out-of-band-tagging-protocol.patch +++ b/target/linux/ipq40xx/patches-6.1/701-net-dsa-add-out-of-band-tagging-protocol.patch @@ -93,7 +93,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com> +#endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -4588,6 +4588,9 @@ enum skb_ext_id { +@@ -4594,6 +4594,9 @@ enum skb_ext_id { #if IS_ENABLED(CONFIG_MCTP_FLOWS) SKB_EXT_MCTP, #endif |