kernel: bump 6.1 to 6.1.33
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
c3b1ef2dfd
commit
639434c4d4
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .32
|
LINUX_VERSION-6.1 = .33
|
||||||
LINUX_KERNEL_HASH-6.1.32 = 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c
|
LINUX_KERNEL_HASH-6.1.33 = b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd
|
@ -9,7 +9,7 @@ Subject: [PATCH] Added Device IDs for August DVB-T 205
|
|||||||
|
|
||||||
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||||
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||||
@@ -1944,6 +1944,10 @@ static const struct usb_device_id rtl28x
|
@@ -1964,6 +1964,10 @@ static const struct usb_device_id rtl28x
|
||||||
&rtl28xxu_props, "Compro VideoMate U650F", NULL) },
|
&rtl28xxu_props, "Compro VideoMate U650F", NULL) },
|
||||||
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
|
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
|
||||||
&rtl28xxu_props, "MaxMedia HU394-T", NULL) },
|
&rtl28xxu_props, "MaxMedia HU394-T", NULL) },
|
||||||
|
@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||||||
#define USB_VENDOR_ID_BELKIN 0x050d
|
#define USB_VENDOR_ID_BELKIN 0x050d
|
||||||
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
||||||
|
|
||||||
@@ -1366,6 +1369,9 @@
|
@@ -1367,6 +1370,9 @@
|
||||||
#define USB_VENDOR_ID_XIAOMI 0x2717
|
#define USB_VENDOR_ID_XIAOMI 0x2717
|
||||||
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
|
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/property.h>
|
#include <linux/property.h>
|
||||||
@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
|
@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
postcore_initcall(regmap_initcall);
|
postcore_initcall(regmap_initcall);
|
||||||
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
@@ -3372,6 +3374,7 @@ static int packet_create(struct net *net
|
@@ -3374,6 +3376,7 @@ static int packet_create(struct net *net
|
||||||
mutex_init(&po->pg_vec_lock);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->rollover = NULL;
|
po->rollover = NULL;
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
po->prot_hook.func = packet_rcv_spkt;
|
||||||
@@ -4007,6 +4010,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -4009,6 +4012,16 @@ packet_setsockopt(struct socket *sock, i
|
||||||
WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
|
WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
}
|
}
|
||||||
@@ -4063,6 +4076,13 @@ static int packet_getsockopt(struct sock
|
@@ -4065,6 +4078,13 @@ static int packet_getsockopt(struct sock
|
||||||
case PACKET_VNET_HDR:
|
case PACKET_VNET_HDR:
|
||||||
val = po->has_vnet_hdr;
|
val = po->has_vnet_hdr;
|
||||||
break;
|
break;
|
||||||
|
@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
struct rtnl_link {
|
struct rtnl_link {
|
||||||
rtnl_doit_func doit;
|
rtnl_doit_func doit;
|
||||||
@@ -4811,7 +4811,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
@@ -4817,7 +4817,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user