From 196f3d586f11d96ba4ab60068cfb12420bcd20fd Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 4 Mar 2021 13:37:13 -0700 Subject: kernel-5.4: bump to 5.4.102 and refresh patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia Cc: David Bauer Cc: Petr Štetiar Signed-off-by: Jason A. Donenfeld --- .../950-0798-media-pxa_camera-Use-the-new-set_mbus_config-op.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/bcm27xx') diff --git a/target/linux/bcm27xx/patches-5.4/950-0798-media-pxa_camera-Use-the-new-set_mbus_config-op.patch b/target/linux/bcm27xx/patches-5.4/950-0798-media-pxa_camera-Use-the-new-set_mbus_config-op.patch index d682cf842f..4e5c349072 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0798-media-pxa_camera-Use-the-new-set_mbus_config-op.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0798-media-pxa_camera-Use-the-new-set_mbus_config-op.patch @@ -118,7 +118,7 @@ Signed-off-by: Jacopo Mondi static void pxa_camera_setup_cicr(struct pxa_camera_dev *pcdev, unsigned long flags, __u32 pixfmt) { -@@ -1598,99 +1537,78 @@ static int pxa_camera_init_videobuf2(str +@@ -1601,99 +1540,78 @@ static int pxa_camera_init_videobuf2(str */ static int pxa_camera_set_bus_param(struct pxa_camera_dev *pcdev) { @@ -271,7 +271,7 @@ Signed-off-by: Jacopo Mondi } static const struct pxa_mbus_pixelfmt pxa_camera_formats[] = { -@@ -1738,11 +1656,6 @@ static int pxa_camera_get_formats(struct +@@ -1741,11 +1659,6 @@ static int pxa_camera_get_formats(struct return 0; } -- cgit v1.2.3