mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Upstream patches and config adjustements
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.14.1 Kernel Configuration
|
||||
# Linux/arm 5.14.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -1654,7 +1654,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_BRIDGE_MRP=y
|
||||
# CONFIG_BRIDGE_CFM is not set
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_NET_DSA_TAG_8021Q=m
|
||||
CONFIG_NET_DSA_TAG_AR9331=m
|
||||
CONFIG_NET_DSA_TAG_BRCM_COMMON=m
|
||||
CONFIG_NET_DSA_TAG_BRCM=m
|
||||
@@ -2154,7 +2153,6 @@ CONFIG_HOTPLUG_PCI=y
|
||||
#
|
||||
CONFIG_PCI_MVEBU=y
|
||||
# CONFIG_PCI_FTPCI100 is not set
|
||||
# CONFIG_PCI_IXP4XX is not set
|
||||
CONFIG_PCI_TEGRA=y
|
||||
CONFIG_PCI_HOST_COMMON=y
|
||||
CONFIG_PCI_HOST_GENERIC=y
|
||||
@@ -8461,6 +8459,7 @@ CONFIG_DVB_SP8870=m
|
||||
# CONFIG_LTE_GDM724X is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.19.166 Kernel Configuration
|
||||
# Linux/arm 4.19.208 Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
@@ -847,6 +847,7 @@ CONFIG_NET_EGRESS=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_PACKET_DIAG=m
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_UNIX_SCM=y
|
||||
CONFIG_UNIX_DIAG=m
|
||||
# CONFIG_TLS is not set
|
||||
CONFIG_XFRM=y
|
||||
@@ -2864,7 +2865,7 @@ CONFIG_WLCORE=m
|
||||
CONFIG_WLCORE_SPI=m
|
||||
CONFIG_WLCORE_SDIO=m
|
||||
CONFIG_WILINK_PLATFORM_DATA=y
|
||||
CONFIG_RTL8822BU=m
|
||||
CONFIG_RTL8822BS=m
|
||||
CONFIG_RTL8188EU=m
|
||||
CONFIG_RTL8821CU=m
|
||||
CONFIG_88XXAU=m
|
||||
@@ -3442,6 +3443,7 @@ CONFIG_BATTERY_MAX17042=m
|
||||
# CONFIG_CHARGER_BQ25890 is not set
|
||||
# CONFIG_CHARGER_SMB347 is not set
|
||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
CONFIG_BATTERY_RT5033=m
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HWMON_VID=m
|
||||
@@ -5033,7 +5035,6 @@ CONFIG_USB_BDC_UDC=m
|
||||
#
|
||||
# Platform Support
|
||||
#
|
||||
CONFIG_USB_BDC_PCI=m
|
||||
# CONFIG_USB_AMD5536UDC is not set
|
||||
# CONFIG_USB_NET2272 is not set
|
||||
# CONFIG_USB_NET2280 is not set
|
||||
@@ -5463,7 +5464,6 @@ CONFIG_STAGING_BOARD=y
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_GREYBUS is not set
|
||||
# CONFIG_PI433 is not set
|
||||
# CONFIG_MTK_MMC is not set
|
||||
|
||||
#
|
||||
# Gasket devices
|
||||
@@ -6249,7 +6249,7 @@ CONFIG_NFS_V4_1=y
|
||||
CONFIG_NFS_V4_2=y
|
||||
CONFIG_PNFS_FILE_LAYOUT=y
|
||||
CONFIG_PNFS_BLOCK=m
|
||||
CONFIG_PNFS_FLEXFILE_LAYOUT=m
|
||||
CONFIG_PNFS_FLEXFILE_LAYOUT=y
|
||||
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
|
||||
CONFIG_NFS_V4_1_MIGRATION=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.4.144 Kernel Configuration
|
||||
# Linux/arm 5.4.149 Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.14.1 Kernel Configuration
|
||||
# Linux/arm 5.14.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -5597,6 +5597,7 @@ CONFIG_AD2S1210=m
|
||||
CONFIG_LTE_GDM724X=m
|
||||
CONFIG_GS_FPGABOOT=m
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.10.50 Kernel Configuration
|
||||
# Linux/arm64 5.10.69 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -2904,11 +2904,11 @@ CONFIG_MICREL_PHY=y
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
CONFIG_MICROCHIP_T1_PHY=m
|
||||
# CONFIG_MICROSEMI_PHY is not set
|
||||
CONFIG_MOTORCOMM_PHY=y
|
||||
CONFIG_NATIONAL_PHY=m
|
||||
# CONFIG_NXP_TJA11XX_PHY is not set
|
||||
CONFIG_AT803X_PHY=m
|
||||
CONFIG_QSEMI_PHY=m
|
||||
CONFIG_MOTORCOMM_PHY=y
|
||||
CONFIG_REALTEK_PHY=m
|
||||
# CONFIG_RENESAS_PHY is not set
|
||||
CONFIG_ROCKCHIP_PHY=y
|
||||
@@ -3242,6 +3242,7 @@ CONFIG_WILINK_PLATFORM_DATA=y
|
||||
CONFIG_RTL8822BS=m
|
||||
CONFIG_RTL8723DU=m
|
||||
CONFIG_RTL8723DS=m
|
||||
CONFIG_RTL8822CS=m
|
||||
CONFIG_RTL8822BU=m
|
||||
CONFIG_RTL8188EU=m
|
||||
CONFIG_RTL8821CU=m
|
||||
@@ -7067,6 +7068,7 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
|
||||
# CONFIG_LTE_GDM724X is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
@@ -7922,8 +7924,6 @@ CONFIG_MESON_IRQ_GPIO=y
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
# CONFIG_RESET_BRCMSTB_RESCAL is not set
|
||||
# CONFIG_RESET_INTEL_GW is not set
|
||||
CONFIG_RESET_MESON=y
|
||||
CONFIG_RESET_MESON_AUDIO_ARB=m
|
||||
CONFIG_RESET_SIMPLE=y
|
||||
@@ -7966,7 +7966,6 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
|
||||
CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
|
||||
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
||||
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
|
||||
CONFIG_PHY_ROCKCHIP_INNO_USB3=y
|
||||
CONFIG_PHY_ROCKCHIP_PCIE=y
|
||||
CONFIG_PHY_ROCKCHIP_TYPEC=y
|
||||
CONFIG_PHY_ROCKCHIP_USB=y
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.14.1 Kernel Configuration
|
||||
# Linux/arm64 5.14.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -1475,7 +1475,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
# CONFIG_BRIDGE_MRP is not set
|
||||
# CONFIG_BRIDGE_CFM is not set
|
||||
CONFIG_NET_DSA=m
|
||||
CONFIG_NET_DSA_TAG_8021Q=m
|
||||
CONFIG_NET_DSA_TAG_AR9331=m
|
||||
CONFIG_NET_DSA_TAG_BRCM_COMMON=m
|
||||
CONFIG_NET_DSA_TAG_BRCM=m
|
||||
@@ -7268,6 +7267,7 @@ CONFIG_DVB_SP8870=m
|
||||
# CONFIG_LTE_GDM724X is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.10.56 Kernel Configuration
|
||||
# Linux/arm 5.10.69 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -2650,6 +2650,7 @@ CONFIG_WLAN_VENDOR_TI=y
|
||||
CONFIG_RTL8822BS=m
|
||||
CONFIG_RTL8723DU=m
|
||||
CONFIG_RTL8723DS=m
|
||||
CONFIG_RTL8822CS=m
|
||||
CONFIG_RTL8822BU=m
|
||||
CONFIG_RTL8188EU=m
|
||||
CONFIG_RTL8821CU=m
|
||||
@@ -6019,6 +6020,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
|
||||
# CONFIG_LTE_GDM724X is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.14.6 Kernel Configuration
|
||||
# Linux/arm 5.14.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.10.56 Kernel Configuration
|
||||
# Linux/arm64 5.10.69 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
@@ -2621,6 +2621,7 @@ CONFIG_RTW88=m
|
||||
CONFIG_RTL8822BS=m
|
||||
CONFIG_RTL8723DU=m
|
||||
CONFIG_RTL8723DS=m
|
||||
CONFIG_RTL8822CS=m
|
||||
CONFIG_RTL8822BU=m
|
||||
CONFIG_RTL8188EU=m
|
||||
CONFIG_RTL8821CU=m
|
||||
@@ -5802,6 +5803,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
|
||||
# CONFIG_LTE_GDM724X is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
|
||||
CONFIG_FB_TFT=m
|
||||
CONFIG_FB_TFT_AGM1264K_FL=m
|
||||
CONFIG_FB_TFT_BD663474=m
|
||||
|
||||
1373
patch/kernel/archive/odroidxu4-5.4/patch-5.4.144-145.patch
Normal file
1373
patch/kernel/archive/odroidxu4-5.4/patch-5.4.144-145.patch
Normal file
File diff suppressed because it is too large
Load Diff
5068
patch/kernel/archive/odroidxu4-5.4/patch-5.4.145-146.patch
Normal file
5068
patch/kernel/archive/odroidxu4-5.4/patch-5.4.145-146.patch
Normal file
File diff suppressed because it is too large
Load Diff
97
patch/kernel/archive/odroidxu4-5.4/patch-5.4.146-147.patch
Normal file
97
patch/kernel/archive/odroidxu4-5.4/patch-5.4.146-147.patch
Normal file
@@ -0,0 +1,97 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 48d0c03acfc55..98227dae34947 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
-SUBLEVEL = 146
|
||||
+SUBLEVEL = 147
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
|
||||
index bc3ab98855cf0..25e81b1a59a54 100644
|
||||
--- a/drivers/block/nbd.c
|
||||
+++ b/drivers/block/nbd.c
|
||||
@@ -1744,17 +1744,7 @@ static int nbd_dev_add(int index)
|
||||
refcount_set(&nbd->refs, 1);
|
||||
INIT_LIST_HEAD(&nbd->list);
|
||||
disk->major = NBD_MAJOR;
|
||||
-
|
||||
- /* Too big first_minor can cause duplicate creation of
|
||||
- * sysfs files/links, since first_minor will be truncated to
|
||||
- * byte in __device_add_disk().
|
||||
- */
|
||||
disk->first_minor = index << part_shift;
|
||||
- if (disk->first_minor > 0xff) {
|
||||
- err = -EINVAL;
|
||||
- goto out_free_idr;
|
||||
- }
|
||||
-
|
||||
disk->fops = &nbd_fops;
|
||||
disk->private_data = nbd;
|
||||
sprintf(disk->disk_name, "nbd%d", index);
|
||||
diff --git a/include/linux/time64.h b/include/linux/time64.h
|
||||
index f6059c505986b..5eab3f2635186 100644
|
||||
--- a/include/linux/time64.h
|
||||
+++ b/include/linux/time64.h
|
||||
@@ -33,9 +33,7 @@ struct itimerspec64 {
|
||||
#define TIME64_MIN (-TIME64_MAX - 1)
|
||||
|
||||
#define KTIME_MAX ((s64)~((u64)1 << 63))
|
||||
-#define KTIME_MIN (-KTIME_MAX - 1)
|
||||
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
|
||||
-#define KTIME_SEC_MIN (KTIME_MIN / NSEC_PER_SEC)
|
||||
|
||||
/*
|
||||
* Limits for settimeofday():
|
||||
@@ -134,13 +132,10 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts)
|
||||
*/
|
||||
static inline s64 timespec64_to_ns(const struct timespec64 *ts)
|
||||
{
|
||||
- /* Prevent multiplication overflow / underflow */
|
||||
- if (ts->tv_sec >= KTIME_SEC_MAX)
|
||||
+ /* Prevent multiplication overflow */
|
||||
+ if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
|
||||
return KTIME_MAX;
|
||||
|
||||
- if (ts->tv_sec <= KTIME_SEC_MIN)
|
||||
- return KTIME_MIN;
|
||||
-
|
||||
return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
|
||||
}
|
||||
|
||||
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
|
||||
index 30e061b210b7c..eacb0ca301932 100644
|
||||
--- a/kernel/time/posix-cpu-timers.c
|
||||
+++ b/kernel/time/posix-cpu-timers.c
|
||||
@@ -1201,6 +1201,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
|
||||
}
|
||||
}
|
||||
|
||||
+ if (!*newval)
|
||||
+ return;
|
||||
*newval += now;
|
||||
}
|
||||
|
||||
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
|
||||
index bdd330527cfa2..c50e3e8afbd34 100644
|
||||
--- a/net/bluetooth/hci_core.c
|
||||
+++ b/net/bluetooth/hci_core.c
|
||||
@@ -1691,14 +1691,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
|
||||
hci_request_cancel_all(hdev);
|
||||
hci_req_sync_lock(hdev);
|
||||
|
||||
- if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
|
||||
- !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
|
||||
- test_bit(HCI_UP, &hdev->flags)) {
|
||||
- /* Execute vendor specific shutdown routine */
|
||||
- if (hdev->shutdown)
|
||||
- hdev->shutdown(hdev);
|
||||
- }
|
||||
-
|
||||
if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
|
||||
cancel_delayed_work_sync(&hdev->cmd_timer);
|
||||
hci_req_sync_unlock(hdev);
|
||||
8519
patch/kernel/archive/odroidxu4-5.4/patch-5.4.147-148.patch
Normal file
8519
patch/kernel/archive/odroidxu4-5.4/patch-5.4.147-148.patch
Normal file
File diff suppressed because it is too large
Load Diff
1792
patch/kernel/archive/odroidxu4-5.4/patch-5.4.148-149.patch
Normal file
1792
patch/kernel/archive/odroidxu4-5.4/patch-5.4.148-149.patch
Normal file
File diff suppressed because it is too large
Load Diff
3599
patch/kernel/archive/sunxi-5.10/patch-5.10.60-61.patch
Normal file
3599
patch/kernel/archive/sunxi-5.10/patch-5.10.60-61.patch
Normal file
File diff suppressed because it is too large
Load Diff
4421
patch/kernel/archive/sunxi-5.10/patch-5.10.61-62.patch
Normal file
4421
patch/kernel/archive/sunxi-5.10/patch-5.10.61-62.patch
Normal file
File diff suppressed because it is too large
Load Diff
1105
patch/kernel/archive/sunxi-5.10/patch-5.10.62-63.patch
Normal file
1105
patch/kernel/archive/sunxi-5.10/patch-5.10.62-63.patch
Normal file
File diff suppressed because it is too large
Load Diff
1262
patch/kernel/archive/sunxi-5.10/patch-5.10.63-64.patch
Normal file
1262
patch/kernel/archive/sunxi-5.10/patch-5.10.63-64.patch
Normal file
File diff suppressed because it is too large
Load Diff
9163
patch/kernel/archive/sunxi-5.10/patch-5.10.64-65.patch
Normal file
9163
patch/kernel/archive/sunxi-5.10/patch-5.10.64-65.patch
Normal file
File diff suppressed because it is too large
Load Diff
97
patch/kernel/archive/sunxi-5.10/patch-5.10.65-66.patch
Normal file
97
patch/kernel/archive/sunxi-5.10/patch-5.10.65-66.patch
Normal file
@@ -0,0 +1,97 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 91eb017f5296d..8b1f1e7517b94 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 10
|
||||
-SUBLEVEL = 65
|
||||
+SUBLEVEL = 66
|
||||
EXTRAVERSION =
|
||||
NAME = Dare mighty things
|
||||
|
||||
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
|
||||
index 98274ba0701d6..59c452fff8352 100644
|
||||
--- a/drivers/block/nbd.c
|
||||
+++ b/drivers/block/nbd.c
|
||||
@@ -1759,17 +1759,7 @@ static int nbd_dev_add(int index)
|
||||
refcount_set(&nbd->refs, 1);
|
||||
INIT_LIST_HEAD(&nbd->list);
|
||||
disk->major = NBD_MAJOR;
|
||||
-
|
||||
- /* Too big first_minor can cause duplicate creation of
|
||||
- * sysfs files/links, since first_minor will be truncated to
|
||||
- * byte in __device_add_disk().
|
||||
- */
|
||||
disk->first_minor = index << part_shift;
|
||||
- if (disk->first_minor > 0xff) {
|
||||
- err = -EINVAL;
|
||||
- goto out_free_idr;
|
||||
- }
|
||||
-
|
||||
disk->fops = &nbd_fops;
|
||||
disk->private_data = nbd;
|
||||
sprintf(disk->disk_name, "nbd%d", index);
|
||||
diff --git a/include/linux/time64.h b/include/linux/time64.h
|
||||
index 81b9686a20799..5117cb5b56561 100644
|
||||
--- a/include/linux/time64.h
|
||||
+++ b/include/linux/time64.h
|
||||
@@ -25,9 +25,7 @@ struct itimerspec64 {
|
||||
#define TIME64_MIN (-TIME64_MAX - 1)
|
||||
|
||||
#define KTIME_MAX ((s64)~((u64)1 << 63))
|
||||
-#define KTIME_MIN (-KTIME_MAX - 1)
|
||||
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
|
||||
-#define KTIME_SEC_MIN (KTIME_MIN / NSEC_PER_SEC)
|
||||
|
||||
/*
|
||||
* Limits for settimeofday():
|
||||
@@ -126,13 +124,10 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts)
|
||||
*/
|
||||
static inline s64 timespec64_to_ns(const struct timespec64 *ts)
|
||||
{
|
||||
- /* Prevent multiplication overflow / underflow */
|
||||
- if (ts->tv_sec >= KTIME_SEC_MAX)
|
||||
+ /* Prevent multiplication overflow */
|
||||
+ if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX)
|
||||
return KTIME_MAX;
|
||||
|
||||
- if (ts->tv_sec <= KTIME_SEC_MIN)
|
||||
- return KTIME_MIN;
|
||||
-
|
||||
return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec;
|
||||
}
|
||||
|
||||
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
|
||||
index d3d42b7637a19..08c033b802569 100644
|
||||
--- a/kernel/time/posix-cpu-timers.c
|
||||
+++ b/kernel/time/posix-cpu-timers.c
|
||||
@@ -1346,6 +1346,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
|
||||
}
|
||||
}
|
||||
|
||||
+ if (!*newval)
|
||||
+ return;
|
||||
*newval += now;
|
||||
}
|
||||
|
||||
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
|
||||
index a9097fb7eb825..2ad66f64879f1 100644
|
||||
--- a/net/bluetooth/hci_core.c
|
||||
+++ b/net/bluetooth/hci_core.c
|
||||
@@ -1732,14 +1732,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
|
||||
hci_request_cancel_all(hdev);
|
||||
hci_req_sync_lock(hdev);
|
||||
|
||||
- if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
|
||||
- !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
|
||||
- test_bit(HCI_UP, &hdev->flags)) {
|
||||
- /* Execute vendor specific shutdown routine */
|
||||
- if (hdev->shutdown)
|
||||
- hdev->shutdown(hdev);
|
||||
- }
|
||||
-
|
||||
if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
|
||||
cancel_delayed_work_sync(&hdev->cmd_timer);
|
||||
hci_req_sync_unlock(hdev);
|
||||
12089
patch/kernel/archive/sunxi-5.10/patch-5.10.66-67.patch
Normal file
12089
patch/kernel/archive/sunxi-5.10/patch-5.10.66-67.patch
Normal file
File diff suppressed because it is too large
Load Diff
3868
patch/kernel/archive/sunxi-5.10/patch-5.10.67-68.patch
Normal file
3868
patch/kernel/archive/sunxi-5.10/patch-5.10.67-68.patch
Normal file
File diff suppressed because it is too large
Load Diff
2394
patch/kernel/archive/sunxi-5.10/patch-5.10.68-69.patch
Normal file
2394
patch/kernel/archive/sunxi-5.10/patch-5.10.68-69.patch
Normal file
File diff suppressed because it is too large
Load Diff
6040
patch/kernel/archive/sunxi-5.14/patch-5.14.7-8.patch
Normal file
6040
patch/kernel/archive/sunxi-5.14/patch-5.14.7-8.patch
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user