kernel: bump 5.4 to 5.4.234
Compile-tested: armvirt/64, lantiq/xrx200 Run-tested: armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
c874aa40c2
commit
122e0c7fed
|
@ -1,2 +1,2 @@
|
||||||
LINUX_VERSION-5.4 = .231
|
LINUX_VERSION-5.4 = .234
|
||||||
LINUX_KERNEL_HASH-5.4.231 = 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8
|
LINUX_KERNEL_HASH-5.4.234 = acc79cb33f2e31bbd8267d4caa7e90bcc9ef5f1fdd060cd34117ad4dae950991
|
||||||
|
|
|
@ -214,7 +214,7 @@
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
#include <linux/ipv6.h>
|
#include <linux/ipv6.h>
|
||||||
#include <linux/icmpv6.h>
|
#include <linux/icmpv6.h>
|
||||||
@@ -866,10 +867,10 @@ static void tcp_v6_send_response(const s
|
@@ -867,10 +868,10 @@ static void tcp_v6_send_response(const s
|
||||||
topt = (__be32 *)(t1 + 1);
|
topt = (__be32 *)(t1 + 1);
|
||||||
|
|
||||||
if (tsecr) {
|
if (tsecr) {
|
||||||
|
|
|
@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||||
}
|
}
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -5385,7 +5385,7 @@ static void port_event(struct usb_hub *h
|
@@ -5384,7 +5384,7 @@ static void port_event(struct usb_hub *h
|
||||||
port_dev->over_current_count++;
|
port_dev->over_current_count++;
|
||||||
port_over_current_notify(port_dev);
|
port_over_current_notify(port_dev);
|
||||||
|
|
||||||
|
|
|
@ -271,7 +271,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
|
||||||
u64 dma_direct_get_required_mask(struct device *dev);
|
u64 dma_direct_get_required_mask(struct device *dev);
|
||||||
--- a/include/linux/dma-mapping.h
|
--- a/include/linux/dma-mapping.h
|
||||||
+++ b/include/linux/dma-mapping.h
|
+++ b/include/linux/dma-mapping.h
|
||||||
@@ -697,7 +697,7 @@ static inline int dma_coerce_mask_and_co
|
@@ -777,7 +777,7 @@ static inline int dma_coerce_mask_and_co
|
||||||
*/
|
*/
|
||||||
static inline bool dma_addressing_limited(struct device *dev)
|
static inline bool dma_addressing_limited(struct device *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@ Signed-off-by: Li Jun <jun.li@freescale.com>
|
||||||
|
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -4783,7 +4783,8 @@ hub_port_init(struct usb_hub *hub, struc
|
@@ -4782,7 +4782,8 @@ hub_port_init(struct usb_hub *hub, struc
|
||||||
}
|
}
|
||||||
if (r) {
|
if (r) {
|
||||||
if (r != -ENODEV)
|
if (r != -ENODEV)
|
||||||
|
|
Loading…
Reference in New Issue