[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: rockchip: fix build issue with linux 5.15 bcm27xx: fix linux 6.1 compile issues
zesming · Sep 30, 2024 · d2d1135 · d2d1135
2 parents 0eacd4b + ad43ee0
commit d2d1135
Show file tree

Hide file tree

Showing 13 changed files with 9,344 additions and 4 deletions.
diff --git a/...x/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/...x/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
@@ -24,16 +24,16 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/net/bluetooth/smp.c
 +++ b/net/bluetooth/smp.c
-@@ -2214,7 +2214,7 @@ mackey_and_ltk:
+@@ -2208,7 +2208,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
  	if (err)
  		return SMP_UNSPECIFIED;
 
 -	if (smp->method == REQ_OOB) {
 +	if (smp->method == JUST_WORKS || smp->method == REQ_OOB) {
- 		if (hcon->out) {
+ 		if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) {
  			sc_dhkey_check(smp);
  			SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);
-@@ -2229,9 +2229,6 @@ mackey_and_ltk:
+@@ -2223,9 +2223,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
  	confirm_hint = 0;
 
  confirm:

diff --git a/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch b/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch
@@ -20,6 +20,6 @@ Signed-off-by: Phil Elwell <[email protected]>
 
  static const struct spi_device_id spidev_spi_ids[] = {
 +	{ .name = "spidev" },
+ 	{ .name = "bh2228fv" },
  	{ .name = "dh2228fv" },
  	{ .name = "ltc2488" },
- 	{ .name = "sx1301" },