diff --git a/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch b/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
index 00799e946796f6048f54fbe5a6e049d40b5ee3bc..d47252c860286ced566eaf35a92eec71eec969db 100644
--- a/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
+++ b/patches/backports/bindeb-pkg/0001-backports-bindeb-pkg-from-linux.git.patch
@@ -1,6 +1,6 @@
-From 0ac0b9f2a4d288d1206358e713b4beda3cb6dabb Mon Sep 17 00:00:00 2001
+From 731fa1a584de8eed7c8ad3b367e9ae65cb86d146 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:58:40 -0500
+Date: Fri, 12 May 2023 10:23:20 -0500
Subject: [PATCH] backports: bindeb-pkg: from: linux.git
Reference: v5.10.179
diff --git a/patches/backports/brcm80211/0001-backports-brcm80211-from-linux.git.patch b/patches/backports/brcm80211/0001-backports-brcm80211-from-linux.git.patch
index 14d9eb4bb9ea8142754f95993304e27d53ff9beb..67cb57407395e469330a8a696b01363a9e60b735 100644
--- a/patches/backports/brcm80211/0001-backports-brcm80211-from-linux.git.patch
+++ b/patches/backports/brcm80211/0001-backports-brcm80211-from-linux.git.patch
@@ -1,6 +1,6 @@
-From 3fdf7fa4cb12ab8bd19e957142ef31156555fed5 Mon Sep 17 00:00:00 2001
+From 5a78820503ba6989fade8f43807de8f074a387c5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:58:07 -0500
+Date: Fri, 12 May 2023 10:22:37 -0500
Subject: [PATCH] backports: brcm80211: from: linux.git
Reference: v5.4.18
@@ -8,15 +8,16 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
.../broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +-
.../broadcom/brcm80211/brcmfmac/bus.h | 19 +---
- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 52 ++++-------
- .../broadcom/brcm80211/brcmfmac/core.c | 47 +++++-----
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 69 ++++----------
+ .../broadcom/brcm80211/brcmfmac/common.c | 7 +-
+ .../broadcom/brcm80211/brcmfmac/core.c | 48 +++++-----
.../broadcom/brcm80211/brcmfmac/dmi.c | 42 ---------
.../broadcom/brcm80211/brcmfmac/feature.c | 3 +-
.../broadcom/brcm80211/brcmfmac/firmware.c | 7 --
.../broadcom/brcm80211/brcmfmac/fweh.c | 14 +--
.../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
.../broadcom/brcm80211/brcmfmac/fwsignal.c | 7 +-
- .../broadcom/brcm80211/brcmfmac/msgbuf.c | 2 -
+ .../broadcom/brcm80211/brcmfmac/msgbuf.c | 7 +-
.../broadcom/brcm80211/brcmfmac/p2p.c | 3 +-
.../broadcom/brcm80211/brcmfmac/pcie.c | 89 ++++++++++++-------
.../broadcom/brcm80211/brcmfmac/pcie.h | 5 ++
@@ -25,7 +26,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
.../broadcom/brcm80211/brcmfmac/usb.c | 9 +-
.../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +-
.../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 +-
- 19 files changed, 147 insertions(+), 211 deletions(-)
+ 20 files changed, 150 insertions(+), 238 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index c492d2d2db1d..fc12598b2dd3 100644
@@ -81,10 +82,10 @@ index 8b27494a5d3d..623c0168da79 100644
#endif /* BRCMFMAC_BUS_H */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index 6439adcd2f99..e3ebb7abbdae 100644
+index cd146bbca670..e3ebb7abbdae 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -82,8 +82,6 @@
+@@ -82,14 +82,9 @@
#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000)
@@ -93,7 +94,13 @@ index 6439adcd2f99..e3ebb7abbdae 100644
#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
-@@ -2612,9 +2610,8 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
+-#define BRCMF_MAX_CHANSPEC_LIST \
+- (BRCMF_DCMD_MEDLEN / sizeof(__le32) - 1)
+-
+ static bool check_vif_up(struct brcmf_cfg80211_vif *vif)
+ {
+ if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state)) {
+@@ -2615,9 +2610,8 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
struct brcmf_sta_info_le sta_info_le;
u32 sta_flags;
u32 is_tdls_peer;
@@ -105,7 +112,7 @@ index 6439adcd2f99..e3ebb7abbdae 100644
int rssi;
u32 i;
-@@ -2680,27 +2677,25 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
+@@ -2683,27 +2677,25 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);
sinfo->rx_bytes = le64_to_cpu(sta_info_le.rx_tot_bytes);
}
@@ -148,7 +155,7 @@ index 6439adcd2f99..e3ebb7abbdae 100644
} else if (test_bit(BRCMF_VIF_STATUS_CONNECTED,
&ifp->vif->sme_state)) {
memset(&scb_val, 0, sizeof(scb_val));
-@@ -2794,12 +2789,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
+@@ -2797,12 +2789,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
else
bphy_err(drvr, "error (%d)\n", err);
}
@@ -161,7 +168,7 @@ index 6439adcd2f99..e3ebb7abbdae 100644
done:
brcmf_dbg(TRACE, "Exit\n");
return err;
-@@ -5385,8 +5374,7 @@ static bool brcmf_is_linkup(struct brcmf_cfg80211_vif *vif,
+@@ -5388,8 +5374,7 @@ static bool brcmf_is_linkup(struct brcmf_cfg80211_vif *vif,
return false;
}
@@ -171,7 +178,7 @@ index 6439adcd2f99..e3ebb7abbdae 100644
{
u32 event = e->event_code;
u16 flags = e->flags;
-@@ -5395,8 +5383,6 @@ static bool brcmf_is_linkdown(struct brcmf_cfg80211_vif *vif,
+@@ -5398,8 +5383,6 @@ static bool brcmf_is_linkdown(struct brcmf_cfg80211_vif *vif,
(event == BRCMF_E_DISASSOC_IND) ||
((event == BRCMF_E_LINK) && (!(flags & BRCMF_EVENT_MSG_LINK)))) {
brcmf_dbg(CONN, "Processing link down\n");
@@ -180,7 +187,7 @@ index 6439adcd2f99..e3ebb7abbdae 100644
return true;
}
return false;
-@@ -5689,7 +5675,7 @@ brcmf_notify_connect_status(struct brcmf_if *ifp,
+@@ -5692,7 +5675,7 @@ brcmf_notify_connect_status(struct brcmf_if *ifp,
} else
brcmf_bss_connect_done(cfg, ndev, e, true);
brcmf_net_setcarrier(ifp, true);
@@ -189,8 +196,68 @@ index 6439adcd2f99..e3ebb7abbdae 100644
brcmf_dbg(CONN, "Linkdown\n");
if (!brcmf_is_ibssmode(ifp->vif)) {
brcmf_bss_connect_done(cfg, ndev, e, false);
+@@ -6070,13 +6053,6 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
+ band->channels[i].flags = IEEE80211_CHAN_DISABLED;
+
+ total = le32_to_cpu(list->count);
+- if (total > BRCMF_MAX_CHANSPEC_LIST) {
+- bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",
+- total);
+- err = -EINVAL;
+- goto fail_pbuf;
+- }
+-
+ for (i = 0; i < total; i++) {
+ ch.chspec = (u16)le32_to_cpu(list->element[i]);
+ cfg->d11inf.decchspec(&ch);
+@@ -6222,13 +6198,6 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
+ band = cfg_to_wiphy(cfg)->bands[NL80211_BAND_2GHZ];
+ list = (struct brcmf_chanspec_list *)pbuf;
+ num_chan = le32_to_cpu(list->count);
+- if (num_chan > BRCMF_MAX_CHANSPEC_LIST) {
+- bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",
+- num_chan);
+- kfree(pbuf);
+- return -EINVAL;
+- }
+-
+ for (i = 0; i < num_chan; i++) {
+ ch.chspec = (u16)le32_to_cpu(list->element[i]);
+ cfg->d11inf.decchspec(&ch);
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+index e7c97dfd6928..dec25e415619 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+@@ -264,7 +264,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
+ err);
+ goto done;
+ }
+- buf[sizeof(buf) - 1] = '\0';
+ ptr = (char *)buf;
+ strsep(&ptr, "\n");
+
+@@ -281,17 +280,15 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
+ if (err) {
+ brcmf_dbg(TRACE, "retrieving clmver failed, %d\n", err);
+ } else {
+- buf[sizeof(buf) - 1] = '\0';
+ clmver = (char *)buf;
++ /* store CLM version for adding it to revinfo debugfs file */
++ memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver));
+
+ /* Replace all newline/linefeed characters with space
+ * character
+ */
+ strreplace(clmver, '\n', ' ');
+
+- /* store CLM version for adding it to revinfo debugfs file */
+- memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver));
+-
+ brcmf_dbg(INFO, "CLM version = %s\n", clmver);
+ }
+
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-index 5b7c1b99273d..85cf96461dde 100644
+index 4907a667f963..85cf96461dde 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -290,7 +290,6 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
@@ -201,7 +268,15 @@ index 5b7c1b99273d..85cf96461dde 100644
brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
-@@ -362,7 +361,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
+@@ -333,7 +332,6 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
+ bphy_err(drvr, "%s: failed to expand headroom\n",
+ brcmf_ifname(ifp));
+ atomic_inc(&drvr->bus_if->stats.pktcow_failed);
+- dev_kfree_skb(skb);
+ goto done;
+ }
+ }
+@@ -363,7 +361,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
ndev->stats.tx_dropped++;
} else {
ndev->stats.tx_packets++;
@@ -210,7 +285,7 @@ index 5b7c1b99273d..85cf96461dde 100644
}
/* Return ok: we always eat the packet */
-@@ -484,7 +483,7 @@ static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb,
+@@ -485,7 +483,7 @@ static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb,
ret = brcmf_proto_hdrpull(drvr, true, skb, ifp);
if (ret || !(*ifp) || !(*ifp)->ndev) {
@@ -219,7 +294,7 @@ index 5b7c1b99273d..85cf96461dde 100644
(*ifp)->ndev->stats.rx_errors++;
brcmu_pkt_buf_free_skb(skb);
return -ENODATA;
-@@ -1439,34 +1438,40 @@ void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state)
+@@ -1440,34 +1438,40 @@ void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state)
}
}
@@ -468,10 +543,23 @@ index 3d36b6ee158b..2bd892df83cc 100644
}
brcmf_fws_unlock(fws);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
-index c2705d7a4247..e3dd8623be4e 100644
+index fd54acb85924..e3dd8623be4e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
-@@ -1619,8 +1619,6 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
+@@ -345,11 +345,8 @@ brcmf_msgbuf_alloc_pktid(struct device *dev,
+ count++;
+ } while (count < pktids->array_size);
+
+- if (count == pktids->array_size) {
+- dma_unmap_single(dev, *physaddr, skb->len - data_offset,
+- pktids->direction);
++ if (count == pktids->array_size)
+ return -ENOMEM;
+- }
+
+ array[*idx].data_offset = data_offset;
+ array[*idx].physaddr = *physaddr;
+@@ -1622,8 +1619,6 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
BRCMF_TX_IOCTL_MAX_MSG_SIZE,
msgbuf->ioctbuf,
msgbuf->ioctbuf_handle);
diff --git a/patches/backports/exfat/0001-backports-exfat-from-linux.git.patch b/patches/backports/exfat/0001-backports-exfat-from-linux.git.patch
index 73cde68e0cdfe781dffe7e20a5db0c40bd2390aa..18a46a56631e0cb367404d49d855c1688a4aa4ae 100644
--- a/patches/backports/exfat/0001-backports-exfat-from-linux.git.patch
+++ b/patches/backports/exfat/0001-backports-exfat-from-linux.git.patch
@@ -1,6 +1,6 @@
-From 25eaa211322c4d4d7554dadcc906aac3b0bc7df3 Mon Sep 17 00:00:00 2001
+From d8492c31871e2b4ef3bba7cde75d19dabb4e7255 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:57:32 -0500
+Date: Fri, 12 May 2023 10:22:00 -0500
Subject: [PATCH] backports: exfat: from: linux.git
Reference: 1657f11c7ca109b6f7e7bec4e241bf6cbbe2d4b0
diff --git a/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch b/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
index 4f740eedfdcf66006a444c7f02918d672ca363dd..6bed3352ef82cd8445176f2483b78c483d87f768 100644
--- a/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
+++ b/patches/backports/wlcore/0001-backports-wlcore-from-linux.git.patch
@@ -1,6 +1,6 @@
-From 05be05b4dcc95f571ec93246fdb7c2f155d74fc9 Mon Sep 17 00:00:00 2001
+From 16f454c45ca1c13ae39a14b0f80628e4973a5f2c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:56:56 -0500
+Date: Fri, 12 May 2023 10:20:46 -0500
Subject: [PATCH] backports: wlcore: from: linux.git
Reference: v5.13.19
diff --git a/patches/cypress/0001-cypress-fmac-patchset.patch b/patches/cypress/0001-cypress-fmac-patchset.patch
index 87f2cd03f5f6fcd72147b7cfb2745497cb246ab4..4518234afff62bbd5d4c4ad5aeb04d3704b3462f 100644
--- a/patches/cypress/0001-cypress-fmac-patchset.patch
+++ b/patches/cypress/0001-cypress-fmac-patchset.patch
@@ -1,6 +1,6 @@
-From b8bc2c65dd29d1b84e3fcad04435178ba0314b27 Mon Sep 17 00:00:00 2001
+From 0419e634d1d3e35b2868ba9a0b31b1d7c77fa25e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:58:07 -0500
+Date: Fri, 12 May 2023 10:22:37 -0500
Subject: [PATCH] cypress fmac patchset
v5.4.18-2021_0527
@@ -8850,10 +8850,10 @@ index 8459f5b6002e..1abbb9699b9d 100644
genlmsg_end(msg, hdr);
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
-index 63f89687a018..06fc1725a197 100644
+index a260cd60a7b9..baaf443a8fba 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
-@@ -887,6 +887,7 @@ void cfg80211_connect_done(struct net_device *dev,
+@@ -899,6 +899,7 @@ void cfg80211_connect_done(struct net_device *dev,
ev->cr.bss = params->bss;
ev->cr.status = params->status;
ev->cr.timeout_reason = params->timeout_reason;
@@ -8861,7 +8861,7 @@ index 63f89687a018..06fc1725a197 100644
spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list);
-@@ -1020,6 +1021,7 @@ void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
+@@ -1032,6 +1033,7 @@ void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
if (info->fils.update_erp_next_seq_num)
ev->rm.fils.erp_next_seq_num = info->fils.erp_next_seq_num;
ev->rm.bss = info->bss;
diff --git a/patches/defconfig b/patches/defconfig
index bf6386ed0408669073ff2e3df5d5b2cdaa1801e5..f46f7298275d5b2d08ad0349b7420f3d8b385ab6 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.230 Kernel Configuration
+# Linux/arm 5.4.242 Kernel Configuration
#
#
@@ -1461,7 +1461,6 @@ CONFIG_NET_SCH_PLUG=m
#
CONFIG_NET_CLS=y
CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
@@ -4461,7 +4460,6 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ETNAVIV is not set
# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
CONFIG_DRM_GM12U320=m
CONFIG_TINYDRM_HX8357D=m
CONFIG_TINYDRM_ILI9225=m
diff --git a/patches/external/aufs/0001-merge-aufs-kbuild.patch b/patches/external/aufs/0001-merge-aufs-kbuild.patch
index 059c53808c610d6af46eb0f18a4376ab7db2bc97..9c61fc90c384c51276ca88de52dd1c43e9d8bd57 100644
--- a/patches/external/aufs/0001-merge-aufs-kbuild.patch
+++ b/patches/external/aufs/0001-merge-aufs-kbuild.patch
@@ -1,6 +1,6 @@
-From c42f561de23ec967703abd1b55c7b920ad445c30 Mon Sep 17 00:00:00 2001
+From ceedc6ec1240e8a56a6b20464d7a7ff4f892acca Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:53:53 -0500
+Date: Fri, 12 May 2023 10:10:50 -0500
Subject: [PATCH 1/5] merge: aufs-kbuild
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/patches/external/aufs/0002-merge-aufs-base.patch b/patches/external/aufs/0002-merge-aufs-base.patch
index 50d912e78b556c82866d8022d29dd27b1b786675..3493436f26b3dcfe21bbe419d969b3a58c3f3b20 100644
--- a/patches/external/aufs/0002-merge-aufs-base.patch
+++ b/patches/external/aufs/0002-merge-aufs-base.patch
@@ -1,6 +1,6 @@
-From c0c252230e8b70fb98da00ddba2c04d597f9fc13 Mon Sep 17 00:00:00 2001
+From 848d8649cce64890211e7c71d9025c001d10bf2a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:53:54 -0500
+Date: Fri, 12 May 2023 10:10:50 -0500
Subject: [PATCH 2/5] merge: aufs-base
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -22,7 +22,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
14 files changed, 94 insertions(+), 10 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 973fcc9143d1..85ce99a96e50 100644
+index ea8f1c885089..d5c6a7b172bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2832,6 +2832,19 @@ F: include/linux/audit.h
diff --git a/patches/external/aufs/0003-merge-aufs-mmap.patch b/patches/external/aufs/0003-merge-aufs-mmap.patch
index 5f5e32b8630ccff29105edfcf02920c3c3adca37..959492bb1f25b9eebb5ab18c4ba5bd3cb6931bf0 100644
--- a/patches/external/aufs/0003-merge-aufs-mmap.patch
+++ b/patches/external/aufs/0003-merge-aufs-mmap.patch
@@ -1,6 +1,6 @@
-From bf5030aca7fd013e8546b797fb8bb9ecec40fcb6 Mon Sep 17 00:00:00 2001
+From a0c1a38c5735129e7d70e377de3f20e51287ac54 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:53:54 -0500
+Date: Fri, 12 May 2023 10:10:50 -0500
Subject: [PATCH 3/5] merge: aufs-mmap
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -50,7 +50,7 @@ index 14c2badb8fd9..65afe5287e43 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index d9633e5a5ddd..b95265f4d693 100644
+index 0bdfef023d34..865b4d30741e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -65,7 +65,7 @@ index d9633e5a5ddd..b95265f4d693 100644
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1823,7 +1826,7 @@ static int show_numa_map(struct seq_file *m, void *v)
+@@ -1821,7 +1824,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
diff --git a/patches/external/aufs/0004-merge-aufs-standalone.patch b/patches/external/aufs/0004-merge-aufs-standalone.patch
index 89b97251ccf03f755db7c5dfae20d8ca4657b861..f47acd255081a584496e3cd4b06f5b92f0285c70 100644
--- a/patches/external/aufs/0004-merge-aufs-standalone.patch
+++ b/patches/external/aufs/0004-merge-aufs-standalone.patch
@@ -1,6 +1,6 @@
-From 6a2cfc6ace6197c9b5cc96da457b4b879d0bc0fb Mon Sep 17 00:00:00 2001
+From 4efac697383d955e45d4e559b2e634b03474a63e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:53:54 -0500
+Date: Fri, 12 May 2023 10:10:51 -0500
Subject: [PATCH 4/5] merge: aufs-standalone
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -262,7 +262,7 @@ index 9bc8f4bed754..ad070cf71c36 100644
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c
-index f633717311a3..f0a287896100 100644
+index 460c3826f640..6650d1013dcc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1049,6 +1049,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
diff --git a/patches/external/aufs/0005-merge-aufs.patch b/patches/external/aufs/0005-merge-aufs.patch
index 84ddd5d259b3dba291922c3a10d50e4a577c13c4..b79dc36e3f457f420f02ec681117321b8fd5dabf 100644
--- a/patches/external/aufs/0005-merge-aufs.patch
+++ b/patches/external/aufs/0005-merge-aufs.patch
@@ -1,6 +1,6 @@
-From 27bcf41b6ff19eee4058a9acbfc55b0471bed401 Mon Sep 17 00:00:00 2001
+From 9638df856a3317d8db4b8b0854b0710139d1eeb4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:53:55 -0500
+Date: Fri, 12 May 2023 10:10:52 -0500
Subject: [PATCH 5/5] merge: aufs
https://github.com/sfjro/aufs5-standalone/commit/995f07ca91f8e03f4686a36d1abd433d764a57ab
diff --git a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
index 623eb7ccc60621e9eb43a430d20e9d2a3c25c607..5ea29019d9c6de2edddc32ea74b1e0f386d9ce61 100644
--- a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
+++ b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch
@@ -1,6 +1,6 @@
-From e7e341c2f6deb0cf221e998f1c3ed6b8af469c7e Mon Sep 17 00:00:00 2001
+From e02256a19a7863e25ec054d15c7b051e3cd61cc5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:55:00 -0500
+Date: Fri, 12 May 2023 10:17:16 -0500
Subject: [PATCH] merge: bcfserial:
https://git.beagleboard.org/beagleconnect/linux/bcfserial.git
diff --git a/patches/external/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch b/patches/external/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
index 029122195761615abc7c652cc560fd66d9e58614..3e2408339ebca43c85445a1c3fb41dd684a5f3e5 100644
--- a/patches/external/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
+++ b/patches/external/can_isotp/0001-merge-can-isotp-https-github.com-hartkopp-can-isotp.patch
@@ -1,6 +1,6 @@
-From cd5b593f2d45f6ba9442705589f7c16f2cfe84c8 Mon Sep 17 00:00:00 2001
+From 760b4e8e6e7970a817aefecab1bb3b206b74ebaf Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:54:19 -0500
+Date: Fri, 12 May 2023 10:11:17 -0500
Subject: [PATCH] merge: can-isotp: https://github.com/hartkopp/can-isotp
https://github.com/hartkopp/can-isotp/commit/7626d0a0707391970080d493ce69638719938da7
diff --git a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
index 0e95bb6b668efbd1e4dc89aca11194b1418f52f8..ee20088a04a57ba9c5382ddb530d83f35546d9c3 100644
--- a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
+++ b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
@@ -1,9 +1,9 @@
-From 00085cd158398a0c4d14c3897e7f6f25c9122396 Mon Sep 17 00:00:00 2001
+From 240f971532e224f7ea36813319b0b3522e9b1571 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:55:20 -0500
+Date: Fri, 12 May 2023 10:17:40 -0500
Subject: [PATCH] merge: CONFIG_PREEMPT_RT Patch Set
-patch-5.4.230-rt80.patch.xz
+patch-5.4.242-rt81.patch.xz
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
@@ -1359,7 +1359,7 @@ index 46e1be9e57a8..581caf6493a9 100644
default:
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index 207ef9a797bd..7817a8e14ded 100644
+index 03dfeb120843..2a9194b25e41 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -251,6 +251,8 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
@@ -1412,7 +1412,7 @@ index a0035c426ce6..1bc3a0a50753 100644
#endif
and r2, r1, #7 @ extract the length of the cache lines
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index bd0f4821f7e1..865fd8fbfe59 100644
+index d62393243720..092902140ce9 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -414,6 +414,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
@@ -1937,7 +1937,7 @@ index 987220ac4cfe..047f30094daa 100644
void __init smp_cpus_done(unsigned int max_cpus)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
-index 4e3e9d9c8151..05b68961a110 100644
+index a436a6972ced..ca293174d7ec 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -143,9 +143,12 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
@@ -2192,10 +2192,10 @@ index fa10d51f6217..46882f366998 100644
/* Boost up -- we can execute copied instructions directly */
ia64_psr(regs)->ri = p->ainsn.slot;
diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S
-index 52d312d5b4d4..d43a02795a4a 100644
+index fb3b06567745..f1d41a9328a2 100644
--- a/arch/m68k/coldfire/entry.S
+++ b/arch/m68k/coldfire/entry.S
-@@ -108,7 +108,7 @@ ret_from_exception:
+@@ -110,7 +110,7 @@ ret_from_exception:
btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */
jeq Luser_return /* if so, skip resched, signals */
@@ -2762,7 +2762,7 @@ index ff20c253f273..bba77ded0931 100644
_GLOBAL(call_do_irq)
mflr r0
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index ecfa460f66d1..7beeb37c9d40 100644
+index 70b99246dec4..72602ed58cf8 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -171,7 +171,6 @@ extern void panic_flush_kmsg_start(void)
@@ -2979,7 +2979,7 @@ index cfed272e4fd5..8e28e8176ec8 100644
int lock;
} __attribute__ ((aligned (4))) arch_spinlock_t;
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
-index 34bdc60c0b11..8e38447be465 100644
+index 2100833adfb6..e448ca0fafcf 100644
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
@@ -194,6 +194,8 @@ void die(struct pt_regs *regs, const char *str)
@@ -3097,7 +3097,7 @@ index 5717c7cbdd97..c4e46252377e 100644
static inline void handle_one_irq(unsigned int irq)
{
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
-index 349e27771cea..84a7fef54a7c 100644
+index 8cb5bb020b4b..f97622abcdc3 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -276,7 +276,7 @@ config US3_MC
@@ -3528,7 +3528,7 @@ index 3f8e22615812..26934d55c14a 100644
uprobe_notify_resume(regs);
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
-index 2d837fb54c31..bb0279da6a87 100644
+index 740df9cc2196..d68d3ee79e6e 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -1105,8 +1105,26 @@ restore_all:
@@ -3559,7 +3559,7 @@ index 2d837fb54c31..bb0279da6a87 100644
jz .Lno_preempt
call preempt_schedule_irq
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
-index c82136030d58..798c1654bf13 100644
+index bd7a4ad0937c..58f02e256efe 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -674,7 +674,23 @@ retint_kernel:
@@ -3915,7 +3915,7 @@ index a759ca97cd01..a74a7606806c 100644
void handle_irq(struct irq_desc *desc, struct pt_regs *regs)
{
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 352f876950ab..18bee4528d9c 100644
+index 8ef71fa91ff8..764aa37782d1 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -38,6 +38,7 @@
@@ -3972,10 +3972,10 @@ index 352f876950ab..18bee4528d9c 100644
* Leave lazy mode, flushing any hypercalls made here.
* This must be done before restoring TLS segments so
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 93727f8092ee..93e008f73ce8 100644
+index f5e9590a8f31..05687f43403a 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
-@@ -7317,6 +7317,14 @@ int kvm_arch_init(void *opaque)
+@@ -7318,6 +7318,14 @@ int kvm_arch_init(void *opaque)
goto out;
}
@@ -4116,7 +4116,7 @@ index 1f07876ea2ed..7728623713ac 100644
_bbci.l a4, TIF_NEED_RESCHED, 4f
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
-index 4a6c495ce9b6..2e7cf56412a0 100644
+index 16af8e514cb3..8178f6321390 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -524,12 +524,15 @@ DEFINE_SPINLOCK(die_lock);
@@ -4159,7 +4159,7 @@ index 9df50fb507ca..10244a1f8fee 100644
}
}
diff --git a/block/blk-mq.c b/block/blk-mq.c
-index 84798d09ca46..99764dd6d470 100644
+index 325a5944b4cb..da0bc4e2068d 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -611,9 +611,17 @@ static void __blk_mq_complete_request(struct request *rq)
@@ -4190,7 +4190,7 @@ index 84798d09ca46..99764dd6d470 100644
}
static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx)
-@@ -1487,14 +1495,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
+@@ -1491,14 +1499,14 @@ static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
return;
if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
@@ -4935,7 +4935,7 @@ index 242a9ec295cf..09c57db1241b 100644
}
}
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index eb98018ab420..6eefd36aa084 100644
+index ed31b08855f9..d5dea76343f0 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -68,7 +68,7 @@ struct mm_struct efi_mm = {
@@ -6584,10 +6584,10 @@ index 6420ae581a80..0f4f41ed9ffa 100644
static int __init
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
-index 5fd4fc49aef9..ee0b3d43fa20 100644
+index 5fe749036773..87dcff8ff0b0 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -1719,7 +1719,7 @@ static void ffs_data_put(struct ffs_data *ffs)
+@@ -1724,7 +1724,7 @@ static void ffs_data_put(struct ffs_data *ffs)
ffs_data_clear(ffs);
ffs_release_dev(ffs->private_data);
BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
@@ -6673,10 +6673,10 @@ index d94e2b7cddff..5197f7c3d31f 100644
_enter("%p{%pd},%llx", dentry, dentry, vnode->fid.vnode);
diff --git a/fs/aio.c b/fs/aio.c
-index fb92c32a6f1e..0bb9abf39065 100644
+index 1ec5a773d09c..2d3bb9cd8836 100644
--- a/fs/aio.c
+++ b/fs/aio.c
-@@ -1767,7 +1767,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
+@@ -1771,7 +1771,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync,
list_del_init(&req->wait.entry);
list_del(&iocb->ki_list);
iocb->ki_res.res = mangle_poll(mask);
@@ -6973,7 +6973,7 @@ index 877f9f61a4e8..ec94e6ce6ac1 100644
#else
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
-index b66b335a0ca6..263542a9fa7c 100644
+index 5858fb9b5cd5..0d1c6f36530b 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -87,11 +87,10 @@ static void ext4_finish_bio(struct bio *bio)
@@ -7887,10 +7887,10 @@ index ebd77a301057..28ed21bff818 100644
};
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index a76550d927e7..9d292e6b9aa8 100644
+index c54dd49c993c..f1ad62c7d945 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
-@@ -2990,7 +2990,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -2989,7 +2989,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
unsigned int seq;
int ret;
@@ -7899,7 +7899,7 @@ index a76550d927e7..9d292e6b9aa8 100644
dir_verifier = nfs_save_change_attribute(dir);
ret = _nfs4_proc_open(opendata, ctx);
-@@ -3044,7 +3044,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -3043,7 +3043,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
@@ -8191,10 +8191,10 @@ index 4f4a2abb225e..4e62963a87ca 100644
return EPOLLIN | EPOLLRDNORM;
return 0;
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index d80989b6c344..b5921f996e86 100644
+index f4264dd4ea31..f10d55e5a601 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
-@@ -702,7 +702,7 @@ static bool proc_sys_fill_cache(struct file *file,
+@@ -703,7 +703,7 @@ static bool proc_sys_fill_cache(struct file *file,
child = d_lookup(dir, &qname);
if (!child) {
@@ -8930,7 +8930,7 @@ index ac6e946b6767..839da8f2f6f1 100644
/**
* idr_for_each_entry() - Iterate over an IDR's elements of a given type.
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 89fc59dab57d..029042f474c6 100644
+index 30e92536c78c..7277a999a82b 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -546,7 +546,7 @@ struct softirq_action
@@ -8950,7 +8950,7 @@ index 89fc59dab57d..029042f474c6 100644
DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
-@@ -625,7 +626,10 @@ static inline void tasklet_unlock(struct tasklet_struct *t)
+@@ -630,7 +631,10 @@ static inline void tasklet_unlock(struct tasklet_struct *t)
static inline void tasklet_unlock_wait(struct tasklet_struct *t)
{
@@ -9171,7 +9171,7 @@ index 9fb870524314..75bc56109031 100644
struct journal_head *b_tnext, *b_tprev;
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 77c86a2236da..55c56beb00b0 100644
+index 1fdb251947ed..0919e0ea862c 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -227,6 +227,10 @@ extern void __cant_sleep(const char *file, int line, int preempt_offset);
@@ -9780,10 +9780,10 @@ index 000000000000..3fcb5edb1d2b
+
+#endif
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 73bc0f53303f..f5f4a355d3be 100644
+index 125542f305fa..03bf854520fc 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -3058,6 +3058,7 @@ struct softnet_data {
+@@ -3060,6 +3060,7 @@ struct softnet_data {
unsigned int dropped;
struct sk_buff_head input_pkt_queue;
struct napi_struct backlog;
@@ -11686,10 +11686,10 @@ index 1a5f88316b08..1870c233799e 100644
/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
static inline int valid_signal(unsigned long sig)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index eab3a4d02f32..690ed04aef34 100644
+index 302a2ad67980..31b880d5062e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -293,6 +293,7 @@ struct sk_buff_head {
+@@ -294,6 +294,7 @@ struct sk_buff_head {
__u32 qlen;
spinlock_t lock;
@@ -11697,7 +11697,7 @@ index eab3a4d02f32..690ed04aef34 100644
};
struct sk_buff;
-@@ -1865,6 +1866,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
+@@ -1866,6 +1867,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
__skb_queue_head_init(list);
}
@@ -12305,7 +12305,7 @@ index 30a8cdcfd4a4..10bbf986bc1d 100644
#define TRACE_EVENT_TYPE_MAX \
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index 38555435a64a..e2777169c539 100644
+index 70941f49d66e..b6cdf0efe424 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -182,6 +182,7 @@ static __always_inline void pagefault_disabled_dec(void)
@@ -12468,7 +12468,7 @@ index 000000000000..67710bace741
+
+#endif
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 1ee396ce0eda..a661f3c90fb3 100644
+index e8034756cbf8..49176f44b677 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -10,6 +10,7 @@
@@ -13192,10 +13192,10 @@ index de788761b708..f597b34d756b 100644
out:
kfree(key);
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 32b32ecad770..f6b1a5480904 100644
+index 5476f61bad23..6520606017f7 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
-@@ -8140,26 +8140,48 @@ static bool is_tracing_prog_type(enum bpf_prog_type type)
+@@ -8157,26 +8157,48 @@ static bool is_tracing_prog_type(enum bpf_prog_type type)
}
}
@@ -13305,7 +13305,7 @@ index d14575c0e464..f8c3cdd8f894 100644
queue_rcu_work(cgroup_destroy_wq, &css->destroy_rwork);
return ERR_PTR(err);
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
-index c7f4526ca64e..b58f9ce84c6a 100644
+index 5d50ac2f2652..99266c15b4c0 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -346,7 +346,7 @@ void cpuset_read_unlock(void)
@@ -13407,7 +13407,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
rebuild_sched_domains_locked();
-@@ -2444,7 +2444,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
+@@ -2448,7 +2448,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
cpuset_filetype_t type = seq_cft(sf)->private;
int ret = 0;
@@ -13416,7 +13416,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
switch (type) {
case FILE_CPULIST:
-@@ -2466,7 +2466,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
+@@ -2470,7 +2470,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
ret = -EINVAL;
}
@@ -13425,7 +13425,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
return ret;
}
-@@ -2779,14 +2779,14 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
+@@ -2783,14 +2783,14 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
cpuset_inc();
@@ -13442,7 +13442,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags))
goto out_unlock;
-@@ -2813,12 +2813,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
+@@ -2817,12 +2817,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
}
rcu_read_unlock();
@@ -13457,7 +13457,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
out_unlock:
percpu_up_write(&cpuset_rwsem);
put_online_cpus();
-@@ -2874,7 +2874,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
+@@ -2878,7 +2878,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
static void cpuset_bind(struct cgroup_subsys_state *root_css)
{
percpu_down_write(&cpuset_rwsem);
@@ -13466,7 +13466,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
if (is_in_v2_mode()) {
cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask);
-@@ -2885,7 +2885,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
+@@ -2889,7 +2889,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
top_cpuset.mems_allowed = top_cpuset.effective_mems;
}
@@ -13475,7 +13475,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
percpu_up_write(&cpuset_rwsem);
}
-@@ -2982,12 +2982,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
+@@ -2986,12 +2986,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
{
bool is_empty;
@@ -13490,7 +13490,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
/*
* Don't call update_tasks_cpumask() if the cpuset becomes empty,
-@@ -3024,10 +3024,10 @@ hotplug_update_tasks(struct cpuset *cs,
+@@ -3028,10 +3028,10 @@ hotplug_update_tasks(struct cpuset *cs,
if (nodes_empty(*new_mems))
*new_mems = parent_cs(cs)->effective_mems;
@@ -13503,7 +13503,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
if (cpus_updated)
update_tasks_cpumask(cs);
-@@ -3189,7 +3189,7 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
+@@ -3193,7 +3193,7 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
/* synchronize cpus_allowed to cpu_active_mask */
if (cpus_updated) {
@@ -13512,7 +13512,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
if (!on_dfl)
cpumask_copy(top_cpuset.cpus_allowed, &new_cpus);
/*
-@@ -3209,17 +3209,17 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
+@@ -3213,17 +3213,17 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
}
}
cpumask_copy(top_cpuset.effective_cpus, &new_cpus);
@@ -13533,7 +13533,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
update_tasks_nodemask(&top_cpuset);
}
-@@ -3323,11 +3323,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
+@@ -3327,11 +3327,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
{
unsigned long flags;
@@ -13547,7 +13547,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
}
/**
-@@ -3388,11 +3388,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
+@@ -3392,11 +3392,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
nodemask_t mask;
unsigned long flags;
@@ -13561,7 +13561,7 @@ index c7f4526ca64e..b58f9ce84c6a 100644
return mask;
}
-@@ -3484,14 +3484,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
+@@ -3488,14 +3488,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
return true;
/* Not hardwall and node outside mems_allowed: scan up cpusets */
@@ -13777,7 +13777,7 @@ index c08456af0c7f..cd0a0bfbd178 100644
irq_unlock_sparse();
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index a1c89b675b0b..1371f66d4c07 100644
+index 1ef924d6a385..9b3fed9d1b25 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -9000,7 +9000,6 @@ static void bpf_overflow_handler(struct perf_event *event,
@@ -13806,10 +13806,10 @@ index a1c89b675b0b..1371f66d4c07 100644
if (!ret)
goto unlock;
diff --git a/kernel/exit.c b/kernel/exit.c
-index ece64771a31f..2393f1db779d 100644
+index 563bdaa76694..a11adf07ad52 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -161,7 +161,7 @@ static void __exit_signal(struct task_struct *tsk)
+@@ -208,7 +208,7 @@ static void __exit_signal(struct task_struct *tsk)
* Do this under ->siglock, we can race with another thread
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
*/
@@ -13818,7 +13818,7 @@ index ece64771a31f..2393f1db779d 100644
tsk->sighand = NULL;
spin_unlock(&sighand->siglock);
-@@ -258,6 +258,7 @@ void rcuwait_wake_up(struct rcuwait *w)
+@@ -305,6 +305,7 @@ void rcuwait_wake_up(struct rcuwait *w)
wake_up_process(task);
rcu_read_unlock();
}
@@ -17198,10 +17198,10 @@ index 472dd462a40c..82915146c92c 100644
+
+#endif
diff --git a/kernel/panic.c b/kernel/panic.c
-index f470a038b05b..cf00fca83817 100644
+index cef79466f941..820da9858417 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -237,7 +237,6 @@ void panic(const char *fmt, ...)
+@@ -301,7 +301,6 @@ void panic(const char *fmt, ...)
* Bypass the panic_cpu check and call __crash_kexec directly.
*/
if (!_crash_kexec_post_notifiers) {
@@ -17209,7 +17209,7 @@ index f470a038b05b..cf00fca83817 100644
__crash_kexec(NULL);
/*
-@@ -261,8 +260,6 @@ void panic(const char *fmt, ...)
+@@ -325,8 +324,6 @@ void panic(const char *fmt, ...)
*/
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
@@ -17218,7 +17218,7 @@ index f470a038b05b..cf00fca83817 100644
kmsg_dump(KMSG_DUMP_PANIC);
/*
-@@ -524,9 +521,11 @@ static u64 oops_id;
+@@ -588,9 +585,11 @@ static u64 oops_id;
static int init_oops_id(void)
{
@@ -20676,10 +20676,10 @@ index 615283404d9d..edc571eab808 100644
* there is only one CPU online at any point time during execution of
* either synchronize_rcu() or synchronize_rcu_expedited(). It is OK to
diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h
-index 173e3ce60790..028a50eab42b 100644
+index eca3df7f041c..cd2e933bb57a 100644
--- a/kernel/rcu/tree_exp.h
+++ b/kernel/rcu/tree_exp.h
-@@ -669,7 +669,7 @@ static void rcu_exp_handler(void *unused)
+@@ -671,7 +671,7 @@ static void rcu_exp_handler(void *unused)
}
}
@@ -20841,7 +20841,7 @@ index a1ad5b7d5521..49c14137988e 100644
}
EXPORT_SYMBOL(completion_done);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 06b686ef36e6..a2db44f19caa 100644
+index 51ac62637e4e..4c165b1899bf 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -56,7 +56,11 @@ const_debug unsigned int sysctl_sched_features =
@@ -20983,7 +20983,7 @@ index 06b686ef36e6..a2db44f19caa 100644
void resched_cpu(int cpu)
{
struct rq *rq = cpu_rq(cpu);
-@@ -1555,7 +1624,7 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu)
+@@ -1558,7 +1627,7 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu)
if (!cpumask_test_cpu(cpu, p->cpus_ptr))
return false;
@@ -20992,7 +20992,7 @@ index 06b686ef36e6..a2db44f19caa 100644
return cpu_online(cpu);
return cpu_active(cpu);
-@@ -1604,6 +1673,7 @@ static struct rq *move_queued_task(struct rq *rq, struct rq_flags *rf,
+@@ -1607,6 +1676,7 @@ static struct rq *move_queued_task(struct rq *rq, struct rq_flags *rf,
struct migration_arg {
struct task_struct *task;
int dest_cpu;
@@ -21000,7 +21000,7 @@ index 06b686ef36e6..a2db44f19caa 100644
};
/*
-@@ -1639,6 +1709,11 @@ static int migration_cpu_stop(void *data)
+@@ -1642,6 +1712,11 @@ static int migration_cpu_stop(void *data)
struct task_struct *p = arg->task;
struct rq *rq = this_rq();
struct rq_flags rf;
@@ -21012,7 +21012,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* The original target CPU might have gone down and we might
-@@ -1661,9 +1736,9 @@ static int migration_cpu_stop(void *data)
+@@ -1664,9 +1739,9 @@ static int migration_cpu_stop(void *data)
*/
if (task_rq(p) == rq) {
if (task_on_rq_queued(p))
@@ -21024,7 +21024,7 @@ index 06b686ef36e6..a2db44f19caa 100644
}
rq_unlock(rq, &rf);
raw_spin_unlock(&p->pi_lock);
-@@ -1679,9 +1754,18 @@ static int migration_cpu_stop(void *data)
+@@ -1682,9 +1757,18 @@ static int migration_cpu_stop(void *data)
void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_mask)
{
cpumask_copy(&p->cpus_mask, new_mask);
@@ -21044,7 +21044,7 @@ index 06b686ef36e6..a2db44f19caa 100644
void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
{
struct rq *rq = task_rq(p);
-@@ -1770,7 +1854,8 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
+@@ -1773,7 +1857,8 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
}
/* Can the task run on the task's current CPU? If so, we're done */
@@ -21054,7 +21054,7 @@ index 06b686ef36e6..a2db44f19caa 100644
goto out;
if (task_running(rq, p) || p->state == TASK_WAKING) {
-@@ -1967,6 +2052,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p,
+@@ -1970,6 +2055,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p,
}
#endif /* CONFIG_NUMA_BALANCING */
@@ -21073,7 +21073,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* wait_task_inactive - wait for a thread to unschedule.
*
-@@ -2011,7 +2108,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -2014,7 +2111,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
* is actually now running somewhere else!
*/
while (task_running(rq, p)) {
@@ -21082,7 +21082,7 @@ index 06b686ef36e6..a2db44f19caa 100644
return 0;
cpu_relax();
}
-@@ -2026,7 +2123,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -2029,7 +2126,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
running = task_running(rq, p);
queued = task_on_rq_queued(p);
ncsw = 0;
@@ -21092,7 +21092,7 @@ index 06b686ef36e6..a2db44f19caa 100644
ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
task_rq_unlock(rq, p, &rf);
-@@ -2060,7 +2158,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -2063,7 +2161,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
ktime_t to = NSEC_PER_SEC / HZ;
set_current_state(TASK_UNINTERRUPTIBLE);
@@ -21101,7 +21101,7 @@ index 06b686ef36e6..a2db44f19caa 100644
continue;
}
-@@ -2617,6 +2715,8 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2620,6 +2718,8 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
int cpu, success = 0;
preempt_disable();
@@ -21110,7 +21110,7 @@ index 06b686ef36e6..a2db44f19caa 100644
if (p == current) {
/*
* We're waking current, this means 'p->on_rq' and 'task_cpu(p)
-@@ -2639,7 +2739,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2642,7 +2742,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
trace_sched_wakeup(p);
goto out;
}
@@ -21119,7 +21119,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* If we are going to wake up a thread waiting for CONDITION we
* need to ensure that CONDITION=1 done by the caller can not be
-@@ -2648,8 +2748,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2651,8 +2751,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
*/
raw_spin_lock_irqsave(&p->pi_lock, flags);
smp_mb__after_spinlock();
@@ -21149,7 +21149,7 @@ index 06b686ef36e6..a2db44f19caa 100644
trace_sched_waking(p);
-@@ -2741,9 +2860,12 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2744,9 +2863,12 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
ttwu_queue(p, cpu, wake_flags);
unlock:
raw_spin_unlock_irqrestore(&p->pi_lock, flags);
@@ -21162,7 +21162,7 @@ index 06b686ef36e6..a2db44f19caa 100644
preempt_enable();
return success;
-@@ -2766,6 +2888,18 @@ int wake_up_process(struct task_struct *p)
+@@ -2769,6 +2891,18 @@ int wake_up_process(struct task_struct *p)
}
EXPORT_SYMBOL(wake_up_process);
@@ -21181,7 +21181,7 @@ index 06b686ef36e6..a2db44f19caa 100644
int wake_up_state(struct task_struct *p, unsigned int state)
{
return try_to_wake_up(p, state, 0);
-@@ -3009,6 +3143,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
+@@ -3012,6 +3146,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
p->on_cpu = 0;
#endif
init_task_preempt_count(p);
@@ -21191,7 +21191,7 @@ index 06b686ef36e6..a2db44f19caa 100644
#ifdef CONFIG_SMP
plist_node_init(&p->pushable_tasks, MAX_PRIO);
RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -3337,23 +3474,18 @@ static struct rq *finish_task_switch(struct task_struct *prev)
+@@ -3340,23 +3477,18 @@ static struct rq *finish_task_switch(struct task_struct *prev)
* provided by mmdrop(),
* - a sync_core for SYNC_CORE.
*/
@@ -21220,7 +21220,7 @@ index 06b686ef36e6..a2db44f19caa 100644
put_task_struct_rcu_user(prev);
}
-@@ -4059,6 +4191,8 @@ pick_next_task(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
+@@ -4061,6 +4193,8 @@ pick_next_task(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
BUG();
}
@@ -21229,7 +21229,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* __schedule() is the main scheduler function.
*
-@@ -4129,6 +4263,9 @@ static void __sched notrace __schedule(bool preempt)
+@@ -4131,6 +4265,9 @@ static void __sched notrace __schedule(bool preempt)
rq_lock(rq, &rf);
smp_mb__after_spinlock();
@@ -21239,7 +21239,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/* Promote REQ to ACT */
rq->clock_update_flags <<= 1;
update_rq_clock(rq);
-@@ -4150,6 +4287,7 @@ static void __sched notrace __schedule(bool preempt)
+@@ -4152,6 +4289,7 @@ static void __sched notrace __schedule(bool preempt)
next = pick_next_task(rq, prev, &rf);
clear_tsk_need_resched(prev);
@@ -21247,7 +21247,7 @@ index 06b686ef36e6..a2db44f19caa 100644
clear_preempt_need_resched();
if (likely(prev != next)) {
-@@ -4338,6 +4476,30 @@ static void __sched notrace preempt_schedule_common(void)
+@@ -4340,6 +4478,30 @@ static void __sched notrace preempt_schedule_common(void)
} while (need_resched());
}
@@ -21278,7 +21278,7 @@ index 06b686ef36e6..a2db44f19caa 100644
#ifdef CONFIG_PREEMPTION
/*
* This is the entry point to schedule() from in-kernel preemption
-@@ -4351,7 +4513,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
+@@ -4353,7 +4515,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
*/
if (likely(!preemptible()))
return;
@@ -21288,7 +21288,7 @@ index 06b686ef36e6..a2db44f19caa 100644
preempt_schedule_common();
}
NOKPROBE_SYMBOL(preempt_schedule);
-@@ -4378,6 +4541,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
+@@ -4380,6 +4543,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
if (likely(!preemptible()))
return;
@@ -21298,7 +21298,7 @@ index 06b686ef36e6..a2db44f19caa 100644
do {
/*
* Because the function tracer can trace preempt_count_sub()
-@@ -6166,7 +6332,9 @@ void init_idle(struct task_struct *idle, int cpu)
+@@ -6168,7 +6334,9 @@ void init_idle(struct task_struct *idle, int cpu)
/* Set the preempt count _outside_ the spinlocks! */
init_idle_preempt_count(idle, cpu);
@@ -21309,7 +21309,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* The idle tasks have their own, simple scheduling class:
*/
-@@ -6271,6 +6439,8 @@ void sched_setnuma(struct task_struct *p, int nid)
+@@ -6273,6 +6441,8 @@ void sched_setnuma(struct task_struct *p, int nid)
#endif /* CONFIG_NUMA_BALANCING */
#ifdef CONFIG_HOTPLUG_CPU
@@ -21318,7 +21318,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* Ensure that the idle task is using init_mm right before its CPU goes
* offline.
-@@ -6365,6 +6535,7 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf)
+@@ -6367,6 +6537,7 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf)
break;
next = __pick_migrate_task(rq);
@@ -21326,7 +21326,7 @@ index 06b686ef36e6..a2db44f19caa 100644
/*
* Rules for changing task_struct::cpus_mask are holding
-@@ -6593,6 +6764,10 @@ int sched_cpu_dying(unsigned int cpu)
+@@ -6595,6 +6766,10 @@ int sched_cpu_dying(unsigned int cpu)
update_max_interval();
nohz_balance_exit_idle(rq);
hrtick_clear(rq);
@@ -21337,7 +21337,7 @@ index 06b686ef36e6..a2db44f19caa 100644
return 0;
}
#endif
-@@ -6824,7 +6999,7 @@ void __init sched_init(void)
+@@ -6826,7 +7001,7 @@ void __init sched_init(void)
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{
@@ -21346,7 +21346,7 @@ index 06b686ef36e6..a2db44f19caa 100644
return (nested == preempt_offset);
}
-@@ -8080,3 +8255,172 @@ const u32 sched_prio_to_wmult[40] = {
+@@ -8082,3 +8257,172 @@ const u32 sched_prio_to_wmult[40] = {
};
#undef CREATE_TRACE_POINTS
@@ -21535,10 +21535,10 @@ index d5f7fc7099bc..49d4222edc4c 100644
#undef PN
#undef __PN
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index d2a68ae7596e..c900e2976890 100644
+index 9fcba0d2ab19..7bb2b14cd503 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
-@@ -4134,7 +4134,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+@@ -4181,7 +4181,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
if (delta_exec > ideal_runtime) {
@@ -21547,7 +21547,7 @@ index d2a68ae7596e..c900e2976890 100644
/*
* The current task ran long enough, ensure it doesn't get
* re-elected due to buddy favours.
-@@ -4158,7 +4158,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+@@ -4205,7 +4205,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
return;
if (delta > ideal_runtime)
@@ -21556,7 +21556,7 @@ index d2a68ae7596e..c900e2976890 100644
}
static void
-@@ -4301,7 +4301,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
+@@ -4348,7 +4348,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
* validating it and just reschedule.
*/
if (queued) {
@@ -21565,7 +21565,7 @@ index d2a68ae7596e..c900e2976890 100644
return;
}
/*
-@@ -4438,7 +4438,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
+@@ -4485,7 +4485,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
* hierarchy can be throttled
*/
if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
@@ -21574,7 +21574,7 @@ index d2a68ae7596e..c900e2976890 100644
}
static __always_inline
-@@ -5185,7 +5185,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
+@@ -5232,7 +5232,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
if (delta < 0) {
if (rq->curr == p)
@@ -21583,7 +21583,7 @@ index d2a68ae7596e..c900e2976890 100644
return;
}
hrtick_start(rq, delta);
-@@ -6796,7 +6796,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
+@@ -6840,7 +6840,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
return;
preempt:
@@ -21592,7 +21592,7 @@ index d2a68ae7596e..c900e2976890 100644
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
-@@ -10080,7 +10080,7 @@ static void task_fork_fair(struct task_struct *p)
+@@ -10124,7 +10124,7 @@ static void task_fork_fair(struct task_struct *p)
* 'current' within the tree based on its new key value.
*/
swap(curr->vruntime, se->vruntime);
@@ -21601,7 +21601,7 @@ index d2a68ae7596e..c900e2976890 100644
}
se->vruntime -= cfs_rq->min_vruntime;
-@@ -10104,7 +10104,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
+@@ -10148,7 +10148,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
*/
if (rq->curr == p) {
if (p->prio > oldprio)
@@ -22526,10 +22526,10 @@ index decabf5714c0..87411d484786 100644
* proc_douintvec - read a vector of unsigned integers
* @table: the sysctl table
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index e1e8d5dab0c5..88db6256adb8 100644
+index 8e3c9228aec9..d6924b6eaf94 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
-@@ -2046,6 +2046,38 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,
+@@ -2048,6 +2048,38 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,
}
#endif
@@ -23108,7 +23108,7 @@ index 16a2b62f5f74..86bb218d1df5 100644
if (IS_ENABLED(CONFIG_NO_HZ_COMMON))
__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
-index 4d9f81802911..aad2c89c37a8 100644
+index 1e1345cd21b4..493231af3652 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -83,7 +83,7 @@ unsigned int trace_call_bpf(struct trace_event_call *call, void *ctx)
@@ -23132,7 +23132,7 @@ index 4d9f81802911..aad2c89c37a8 100644
#ifdef CONFIG_BPF_KPROBE_OVERRIDE
BPF_CALL_2(bpf_override_return, struct pt_regs *, regs, unsigned long, rc)
-@@ -1331,10 +1329,9 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)
+@@ -1334,10 +1332,9 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_map *btp)
static __always_inline
void __bpf_trace_run(struct bpf_prog *prog, u64 *args)
{
@@ -23145,7 +23145,7 @@ index 4d9f81802911..aad2c89c37a8 100644
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 1090b2404110..fb33ef389172 100644
+index d068124815bc..feeed1adda1a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2372,6 +2372,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned short type,
@@ -23211,7 +23211,7 @@ index 1090b2404110..fb33ef389172 100644
#else
"unknown",
#endif
-@@ -9008,7 +9017,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
+@@ -9006,7 +9015,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
tracing_off();
local_irq_save(flags);
@@ -23219,7 +23219,7 @@ index 1090b2404110..fb33ef389172 100644
/* Simulate the iterator */
trace_init_global_iter(&iter);
-@@ -9085,7 +9093,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
+@@ -9083,7 +9091,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
atomic_dec(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled);
}
atomic_dec(&dump_running);
@@ -23228,7 +23228,7 @@ index 1090b2404110..fb33ef389172 100644
}
EXPORT_SYMBOL_GPL(ftrace_dump);
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 1d514a1a3155..99ffd841002d 100644
+index f2ff39353e03..4408e69b5470 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -126,6 +126,7 @@ struct kretprobe_trace_entry_head {
@@ -23261,7 +23261,7 @@ index 8f2cbc9ebb6e..bfefd6a02e36 100644
return ret;
}
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index a0a45901dc02..8d357f519767 100644
+index b194dd1c8420..2670b7024bca 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -426,6 +426,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
@@ -25565,7 +25565,7 @@ index d8cde7292bf9..4ee0dde910fd 100644
rcu_read_unlock();
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 62861daf3589..6a93aaf2c08f 100644
+index 16beae167d8c..f4cf4d83c09a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -63,6 +63,7 @@
@@ -25619,7 +25619,7 @@ index 62861daf3589..6a93aaf2c08f 100644
mutex_unlock(&percpu_charge_mutex);
}
-@@ -5576,12 +5581,12 @@ static int mem_cgroup_move_account(struct page *page,
+@@ -5580,12 +5585,12 @@ static int mem_cgroup_move_account(struct page *page,
ret = 0;
@@ -25634,7 +25634,7 @@ index 62861daf3589..6a93aaf2c08f 100644
out_unlock:
unlock_page(page);
out:
-@@ -6637,10 +6642,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
+@@ -6641,10 +6646,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
commit_charge(page, memcg, lrucare);
@@ -25647,7 +25647,7 @@ index 62861daf3589..6a93aaf2c08f 100644
if (do_memsw_account() && PageSwapCache(page)) {
swp_entry_t entry = { .val = page_private(page) };
-@@ -6709,7 +6714,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
+@@ -6713,7 +6718,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
memcg_oom_recover(ug->memcg);
}
@@ -25656,7 +25656,7 @@ index 62861daf3589..6a93aaf2c08f 100644
__mod_memcg_state(ug->memcg, MEMCG_RSS, -ug->nr_anon);
__mod_memcg_state(ug->memcg, MEMCG_CACHE, -ug->nr_file);
__mod_memcg_state(ug->memcg, MEMCG_RSS_HUGE, -ug->nr_huge);
-@@ -6717,7 +6722,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
+@@ -6721,7 +6726,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
__count_memcg_events(ug->memcg, PGPGOUT, ug->pgpgout);
__this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, nr_pages);
memcg_check_events(ug->memcg, ug->dummy_page);
@@ -25665,7 +25665,7 @@ index 62861daf3589..6a93aaf2c08f 100644
if (!mem_cgroup_is_root(ug->memcg))
css_put_many(&ug->memcg->css, nr_pages);
-@@ -6880,10 +6885,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
+@@ -6884,10 +6889,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
commit_charge(newpage, memcg, false);
@@ -25678,7 +25678,7 @@ index 62861daf3589..6a93aaf2c08f 100644
}
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -7065,6 +7070,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -7069,6 +7074,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
struct mem_cgroup *memcg, *swap_memcg;
unsigned int nr_entries;
unsigned short oldid;
@@ -25686,7 +25686,7 @@ index 62861daf3589..6a93aaf2c08f 100644
VM_BUG_ON_PAGE(PageLRU(page), page);
VM_BUG_ON_PAGE(page_count(page), page);
-@@ -7110,10 +7116,14 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -7114,10 +7120,14 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
* important here to have the interrupts disabled because it is the
* only synchronisation we have for updating the per-CPU variables.
*/
@@ -27790,7 +27790,7 @@ index 591d146a5308..dbf8fdcebc53 100644
do_div(time_spent, repeat);
diff --git a/net/core/dev.c b/net/core/dev.c
-index 296bed9431f3..759929c815e2 100644
+index 1a4e20c4ba05..988fd4a97bca 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -218,14 +218,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
@@ -27826,7 +27826,7 @@ index 296bed9431f3..759929c815e2 100644
}
EXPORT_SYMBOL(__dev_kfree_skb_irq);
-@@ -3406,7 +3408,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+@@ -3408,7 +3410,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
* This permits qdisc->running owner to get the lock more
* often and dequeue packets faster.
*/
@@ -27838,7 +27838,7 @@ index 296bed9431f3..759929c815e2 100644
if (unlikely(contended))
spin_lock(&q->busylock);
-@@ -4207,6 +4213,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
+@@ -4209,6 +4215,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
rps_unlock(sd);
local_irq_restore(flags);
@@ -27846,7 +27846,7 @@ index 296bed9431f3..759929c815e2 100644
atomic_long_inc(&skb->dev->rx_dropped);
kfree_skb(skb);
-@@ -4421,7 +4428,7 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -4423,7 +4430,7 @@ static int netif_rx_internal(struct sk_buff *skb)
struct rps_dev_flow voidflow, *rflow = &voidflow;
int cpu;
@@ -27855,7 +27855,7 @@ index 296bed9431f3..759929c815e2 100644
rcu_read_lock();
cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -4431,14 +4438,14 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -4433,14 +4440,14 @@ static int netif_rx_internal(struct sk_buff *skb)
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
rcu_read_unlock();
@@ -27873,7 +27873,7 @@ index 296bed9431f3..759929c815e2 100644
}
return ret;
}
-@@ -4477,11 +4484,9 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -4479,11 +4486,9 @@ int netif_rx_ni(struct sk_buff *skb)
trace_netif_rx_ni_entry(skb);
@@ -27887,7 +27887,7 @@ index 296bed9431f3..759929c815e2 100644
trace_netif_rx_ni_exit(err);
return err;
-@@ -5862,12 +5867,14 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -5864,12 +5869,14 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
sd->rps_ipi_list = NULL;
local_irq_enable();
@@ -27902,7 +27902,7 @@ index 296bed9431f3..759929c815e2 100644
}
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -5897,7 +5904,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
+@@ -5899,7 +5906,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
while (again) {
struct sk_buff *skb;
@@ -27912,7 +27912,7 @@ index 296bed9431f3..759929c815e2 100644
rcu_read_lock();
__netif_receive_skb(skb);
rcu_read_unlock();
-@@ -5905,9 +5914,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
+@@ -5907,9 +5916,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
if (++work >= quota)
return work;
@@ -27923,7 +27923,7 @@ index 296bed9431f3..759929c815e2 100644
rps_lock(sd);
if (skb_queue_empty(&sd->input_pkt_queue)) {
/*
-@@ -5945,6 +5954,7 @@ void __napi_schedule(struct napi_struct *n)
+@@ -5947,6 +5956,7 @@ void __napi_schedule(struct napi_struct *n)
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
@@ -27931,7 +27931,7 @@ index 296bed9431f3..759929c815e2 100644
}
EXPORT_SYMBOL(__napi_schedule);
-@@ -6396,13 +6406,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
+@@ -6398,13 +6408,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
unsigned long time_limit = jiffies +
usecs_to_jiffies(READ_ONCE(netdev_budget_usecs));
int budget = READ_ONCE(netdev_budget);
@@ -27953,7 +27953,7 @@ index 296bed9431f3..759929c815e2 100644
for (;;) {
struct napi_struct *n;
-@@ -9953,6 +9971,7 @@ static int dev_cpu_dead(unsigned int oldcpu)
+@@ -9955,6 +9973,7 @@ static int dev_cpu_dead(unsigned int oldcpu)
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -27961,7 +27961,7 @@ index 296bed9431f3..759929c815e2 100644
#ifdef CONFIG_RPS
remsd = oldsd->rps_ipi_list;
-@@ -9966,10 +9985,13 @@ static int dev_cpu_dead(unsigned int oldcpu)
+@@ -9968,10 +9987,13 @@ static int dev_cpu_dead(unsigned int oldcpu)
netif_rx_ni(skb);
input_queue_head_incr(oldsd);
}
@@ -27976,7 +27976,7 @@ index 296bed9431f3..759929c815e2 100644
return 0;
}
-@@ -10280,8 +10302,9 @@ static int __init net_dev_init(void)
+@@ -10282,8 +10304,9 @@ static int __init net_dev_init(void)
INIT_WORK(flush, flush_backlog);
@@ -28170,10 +28170,10 @@ index 450dc0334772..27f1b8c8cef7 100644
}
prb_close_block(pkc, pbd, po, status);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
-index 154d62d8ac16..1556bbf3a824 100644
+index 67d6bc97e5fe..4c0929eadb19 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -1260,7 +1260,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
+@@ -1261,7 +1261,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
rcu_assign_pointer(sch->stab, stab);
}
if (tca[TCA_RATE]) {
@@ -28183,7 +28183,7 @@ index 154d62d8ac16..1556bbf3a824 100644
err = -EOPNOTSUPP;
if (sch->flags & TCQ_F_MQROOT) {
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
-index 81fcf6c5bde9..dd8f38e285cb 100644
+index 4250f3cf30e7..ee106ea694d0 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -583,7 +583,11 @@ struct Qdisc noop_qdisc = {
@@ -28223,7 +28223,7 @@ index 81fcf6c5bde9..dd8f38e285cb 100644
}
return sch;
-@@ -1282,7 +1295,7 @@ void dev_deactivate_many(struct list_head *head)
+@@ -1285,7 +1298,7 @@ void dev_deactivate_many(struct list_head *head)
/* Wait for outstanding qdisc_run calls. */
list_for_each_entry(dev, head, close_list) {
while (some_qdisc_is_busy(dev))
diff --git a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
index a9dad92c32a5b897aeff4bda95bc6df9a9f539e8..45d6e6e8aa51d145eb6d882f5b3e04d909138f34 100644
--- a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
+++ b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch
@@ -1,6 +1,6 @@
-From d6a47c59a4abe5718bc88eab1a58180aaf59c854 Mon Sep 17 00:00:00 2001
+From a0a10ccb313b22fd2557b29e7a87a7afe10f960c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:55:45 -0500
+Date: Fri, 12 May 2023 10:18:07 -0500
Subject: [PATCH] Add wireless-regdb regulatory database file
https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=43f81b4d0819ae1f9f6e31af7f563e9135aec9b6
diff --git a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
index 24c83a42d84bd8b02c835380759d2d95df939974..095b23fe8a7074faf77ea38fb550a0d72d6383b2 100644
--- a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
+++ b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch
@@ -1,6 +1,6 @@
-From 43e32e99e27c8877751714c497475c6b86d5c18d Mon Sep 17 00:00:00 2001
+From 70762f219df5d4858051a1adff1c643a54dfe6d8 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:54:39 -0500
+Date: Fri, 12 May 2023 10:11:40 -0500
Subject: [PATCH] merge: wpanusb:
https://git.beagleboard.org/beagleconnect/linux/wpanusb
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index a9ae80fb09793b9b8f84efb07410e3e5fd320382..3b6857bafd6d5f7decc44f49765c602cf10a2465 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.230 Kernel Configuration
+# Linux/arm 5.4.242 Kernel Configuration
#
#
@@ -3571,7 +3571,6 @@ CONFIG_DRM_TI_TFP410=m
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ETNAVIV is not set
# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
# CONFIG_DRM_GM12U320 is not set
# CONFIG_TINYDRM_HX8357D is not set
# CONFIG_TINYDRM_ILI9225 is not set
@@ -3583,7 +3582,6 @@ CONFIG_DRM_TI_TFP410=m
# CONFIG_DRM_PL111 is not set
# CONFIG_DRM_TVE200 is not set
# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
# CONFIG_DRM_MCDE is not set
# CONFIG_DRM_LEGACY is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
index 08f5d3669692831aa71e7e90c582698f49921fce..6082191c99dc21dd69af5b1e11fcaeae8d42821c 100644
--- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
+++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch
@@ -1,6 +1,6 @@
-From 4c78e151216d005d8921bbd6e9103e8f2b147152 Mon Sep 17 00:00:00 2001
+From 74db853af6427152ee5dc547518057e62fd2c938 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 May 2023 09:56:06 -0500
+Date: Fri, 12 May 2023 10:18:29 -0500
Subject: [PATCH] Add BeagleBoard.org Device Tree Changes
https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v5.4.x
diff --git a/version.sh b/version.sh
index ff3accdb9c09d582aca60d11a45710e838bbe449..4b17def6e36a85bb7b4ac07d9c6e4648e908c282 100644
--- a/version.sh
+++ b/version.sh
@@ -41,10 +41,10 @@ toolchain="gcc_8_arm"
#Kernel
KERNEL_REL=5.4
-KERNEL_TAG=${KERNEL_REL}.230
-kernel_rt=".230-rt80"
+KERNEL_TAG=${KERNEL_REL}.242
+kernel_rt=".242-rt81"
#Kernel Build
-BUILD=${build_prefix}65.4
+BUILD=${build_prefix}65.5
#v6.X-rcX + upto SHA
#prev_KERNEL_SHA=""