aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-11 20:03:08 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:26:24 +0200
commit2e324c0a2c927461ab74f688fd878dce8fa52af2 (patch)
treea9883129f400c91b59b292b9362b632f1774ddcd
parent9a0de5e1a1e58b331050f21ef59f9d1cd105aeda (diff)
downloadupstream-2e324c0a2c927461ab74f688fd878dce8fa52af2.tar.gz
upstream-2e324c0a2c927461ab74f688fd878dce8fa52af2.tar.bz2
upstream-2e324c0a2c927461ab74f688fd878dce8fa52af2.zip
kernel: bump 5.10 to 5.10.49
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 44f258965f..0af8d05fd1 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .132
-LINUX_VERSION-5.10 = .48
+LINUX_VERSION-5.10 = .49
LINUX_KERNEL_HASH-5.4.132 = 8466adbfb3579e751ede683496df7bb20f258b5f882250f3dd82be63736d00ef
-LINUX_KERNEL_HASH-5.10.48 = dbd1193480e1b85928d8dcdd7507365381aafe09810ce3d28677d6f4e722c25e
+LINUX_KERNEL_HASH-5.10.49 = b0d16de7e79c272b01996ad8ff8bdf3a6a011bc0c94049baccf69f05dde3025e
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
index e0703db1bc..204dc41b01 100644
--- a/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2972,6 +2972,18 @@ static const struct usb_device_id uvc_id
+@@ -3004,6 +3004,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },