Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump to 5.4.227, 5.10.159, 5.15.83 #10619

Merged
merged 3 commits into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .158
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
LINUX_VERSION-5.10 = .159
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .82
LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
LINUX_VERSION-5.15 = .83
LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3
4 changes: 2 additions & 2 deletions include/kernel-5.4
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .226
LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
LINUX_VERSION-5.4 = .227
LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593
2 changes: 1 addition & 1 deletion include/kernel-6.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 =
LINUX_VERSION-6.1 =
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <[email protected]>

--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -2144,12 +2144,12 @@ static int __find_plane_by_offset(struct
@@ -2195,12 +2195,12 @@ static int __find_plane_by_offset(struct
return -EINVAL;
}

Expand All @@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
struct dma_buf *dbuf;

if (q->memory != VB2_MEMORY_MMAP) {
@@ -2201,6 +2201,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
@@ -2252,6 +2252,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
return -EINVAL;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201

@@ -1310,6 +1313,9 @@
@@ -1313,6 +1316,9 @@
#define USB_VENDOR_ID_XAT 0x2505
#define USB_DEVICE_ID_XAT_CSR 0x0220

Expand All @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
/* Device and char device-related information */
static DEFINE_IDA(gpio_ida);
static dev_t gpio_devt;
@@ -2361,8 +2363,8 @@ int gpiod_direction_output(struct gpio_d
@@ -2392,8 +2394,8 @@ int gpiod_direction_output(struct gpio_d
value = !!value;

/* GPIOs used for enabled IRQs shall not be set as output */
Expand All @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <[email protected]>
gpiod_err(desc,
"%s: tried to set a GPIO tied to an IRQ as output\n",
__func__);
@@ -3180,8 +3182,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
@@ -3211,8 +3213,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
}

/* To be valid for IRQ the line needs to be input or open drain */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <[email protected]>

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git
@@ -17521,6 +17521,14 @@ T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
F: drivers/media/i2c/imx412.c

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Signed-off-by: David Plowman <[email protected]>
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17540,6 +17540,7 @@ M: Raspberry Pi Kernel Maintenance <kern
@@ -17535,6 +17535,7 @@ M: Raspberry Pi Kernel Maintenance <kern
L: [email protected]
S: Maintained
T: git git://linuxtv.org/media_tree.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <[email protected]>
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17544,6 +17544,14 @@ F: Documentation/devicetree/bindings/med
@@ -17539,6 +17539,14 @@ F: Documentation/devicetree/bindings/med
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
F: drivers/media/i2c/imx477.c

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
rate = clk_get_rate(clk);
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -987,6 +987,17 @@ static inline void clk_bulk_disable_unpr
@@ -1096,6 +1096,17 @@ static inline void clk_bulk_disable_unpr
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
KUNIT_CASE(clk_test_orphan_transparent_multiple_parent_mux_set_parent_set_range_modified),
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -744,8 +744,9 @@ int clk_set_parent(struct clk *clk, stru
@@ -829,8 +829,9 @@ int clk_set_parent(struct clk *clk, stru
* clk_get_parent - get the parent clock source for this clock
* @clk: clock source
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
*
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -714,6 +714,17 @@ bool clk_has_parent(struct clk *clk, str
@@ -799,6 +799,17 @@ bool clk_has_parent(struct clk *clk, str
int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max);

/**
Expand All @@ -73,7 +73,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
* clk_set_min_rate - set a minimum clock rate for a clock source
* @clk: clock source
* @rate: desired minimum clock rate in Hz, inclusive
@@ -909,6 +920,16 @@ static inline int clk_set_rate_range(str
@@ -1018,6 +1029,16 @@ static inline int clk_set_rate_range(str
return 0;
}

Expand All @@ -90,7 +90,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
static inline int clk_set_min_rate(struct clk *clk, unsigned long rate)
{
return 0;
@@ -999,6 +1020,44 @@ static inline int clk_drop_range(struct
@@ -1108,6 +1129,44 @@ static inline int clk_drop_range(struct
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <[email protected]>
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/gpio.h>
@@ -2475,8 +2473,9 @@ int b53_switch_detect(struct b53_device
@@ -2476,8 +2474,9 @@ int b53_switch_detect(struct b53_device
dev->chip_id = id32;
break;
default:
Expand All @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <[email protected]>
return -ENODEV;
}
}
@@ -2506,7 +2505,8 @@ int b53_switch_register(struct b53_devic
@@ -2507,7 +2506,8 @@ int b53_switch_register(struct b53_devic
if (ret)
return ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -2271,6 +2271,22 @@ static const struct b53_chip_data b53_sw
@@ -2272,6 +2272,22 @@ static const struct b53_chip_data b53_sw
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <[email protected]>
mdio = of_find_node_by_phandle(*ph);
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1449,10 +1449,10 @@ static int greth_of_probe(struct platfor
@@ -1450,10 +1450,10 @@ static int greth_of_probe(struct platfor
break;
}
if (i == 6) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <[email protected]>
memmove(skb->data - ETH_HLEN,
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st

pskb_trim_rcsum(skb, skb->len - len);
@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
if (pskb_trim_rcsum(skb, skb->len - len))
return NULL;

- skb->offload_fwd_mark = true;
+ dsa_default_offload_fwd_mark(skb);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
}
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -432,6 +432,18 @@ static inline void cgroup_put(struct cgr
@@ -433,6 +433,18 @@ static inline void cgroup_put(struct cgr
css_put(&cgrp->self);
}

Expand All @@ -111,15 +111,15 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
/**
* task_css_set_check - obtain a task's css_set with extra access conditions
* @task: the task to obtain css_set for
@@ -446,7 +458,6 @@ static inline void cgroup_put(struct cgr
@@ -447,7 +459,6 @@ static inline void cgroup_put(struct cgr
* as locks used during the cgroup_subsys::attach() methods.
*/
#ifdef CONFIG_PROVE_RCU
-extern struct mutex cgroup_mutex;
extern spinlock_t css_set_lock;
#define task_css_set_check(task, __c) \
rcu_dereference_check((task)->cgroups, \
@@ -707,6 +718,8 @@ struct cgroup;
@@ -708,6 +719,8 @@ struct cgroup;
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
static inline void css_get(struct cgroup_subsys_state *css) {}
static inline void css_put(struct cgroup_subsys_state *css) {}
Expand Down Expand Up @@ -593,7 +593,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5226,6 +5226,7 @@ static struct mem_cgroup *mem_cgroup_all
@@ -5237,6 +5237,7 @@ static struct mem_cgroup *mem_cgroup_all
memcg->deferred_split_queue.split_queue_len = 0;
#endif
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
/* will mmdrop() in finish_task_switch(). */
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5163,6 +5163,7 @@ static void __mem_cgroup_free(struct mem
@@ -5174,6 +5174,7 @@ static void __mem_cgroup_free(struct mem

static void mem_cgroup_free(struct mem_cgroup *memcg)
{
+ lru_gen_free_memcg(memcg);
memcg_wb_domain_exit(memcg);
__mem_cgroup_free(memcg);
}
@@ -6195,6 +6196,29 @@ static void mem_cgroup_move_task(void)
@@ -6206,6 +6207,29 @@ static void mem_cgroup_move_task(void)
}
#endif

Expand Down Expand Up @@ -377,7 +377,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
{
if (value == PAGE_COUNTER_MAX)
@@ -6538,6 +6562,7 @@ struct cgroup_subsys memory_cgrp_subsys
@@ -6549,6 +6573,7 @@ struct cgroup_subsys memory_cgrp_subsys
.css_reset = mem_cgroup_css_reset,
.css_rstat_flush = mem_cgroup_css_rstat_flush,
.can_attach = mem_cgroup_can_attach,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>

--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2263,6 +2263,23 @@ struct btmtk_section_map {
@@ -2268,6 +2268,23 @@ struct btmtk_section_map {
};
} __packed;

Expand All @@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>
static void btusb_mtk_wmt_recv(struct urb *urb)
{
struct hci_dev *hdev = urb->context;
@@ -3914,6 +3931,7 @@ static int btusb_probe(struct usb_interf
@@ -3919,6 +3936,7 @@ static int btusb_probe(struct usb_interf
hdev->shutdown = btusb_mtk_shutdown;
hdev->manufacturer = 70;
hdev->cmd_timeout = btusb_mtk_cmd_timeout;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>

--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2268,7 +2268,7 @@ static int btusb_set_bdaddr_mtk(struct h
@@ -2273,7 +2273,7 @@ static int btusb_set_bdaddr_mtk(struct h
struct sk_buff *skb;
long ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <[email protected]>
mdio = of_find_node_by_phandle(*ph);
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1451,10 +1451,10 @@ static int greth_of_probe(struct platfor
@@ -1452,10 +1452,10 @@ static int greth_of_probe(struct platfor
break;
}
if (i == 6) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen <[email protected]>
int nf_ct_expect_register_notifier(struct net *net,
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -701,12 +701,19 @@ static size_t ctnetlink_nlmsg_size(const
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
}

static int
Expand All @@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen <[email protected]>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3756,9 +3763,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3757,9 +3764,15 @@ static int ctnetlink_stat_exp_cpu(struct
}

#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ Signed-off-by: Zhi Chen <[email protected]>
void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
@@ -711,12 +711,19 @@ static size_t ctnetlink_nlmsg_size(const
}

static int
Expand All @@ -306,7 +306,7 @@ Signed-off-by: Zhi Chen <[email protected]>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3765,11 +3772,17 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3766,11 +3773,17 @@ static int ctnetlink_stat_exp_cpu(struct
}

#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand All @@ -324,7 +324,7 @@ Signed-off-by: Zhi Chen <[email protected]>

static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
[IPCTNL_MSG_CT_NEW] = {
@@ -3868,8 +3881,12 @@ static int __net_init ctnetlink_net_init
@@ -3869,8 +3882,12 @@ static int __net_init ctnetlink_net_init
static void ctnetlink_net_pre_exit(struct net *net)
{
#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand Down

This file was deleted.

This file was deleted.

Loading