diff options
| author | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-07-17 06:56:32 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-07-17 06:56:32 +0000 |
| commit | f3c4550fbbf32895d8a71b1df500c98d71208673 (patch) | |
| tree | 051ed807cc08a33b25c63d0f4a44e36b9c60f70a /sys-kernel/debian-sources/files | |
| parent | ba872f10f8ac67e08d6c40c8ae1ae49c50ad72a9 (diff) | |
| download | baldeagleos-repo-f3c4550fbbf32895d8a71b1df500c98d71208673.tar.gz baldeagleos-repo-f3c4550fbbf32895d8a71b1df500c98d71208673.tar.xz baldeagleos-repo-f3c4550fbbf32895d8a71b1df500c98d71208673.zip | |
Updating liguros repo
Diffstat (limited to 'sys-kernel/debian-sources/files')
35 files changed, 29 insertions, 930 deletions
diff --git a/sys-kernel/debian-sources/files/4.19.118/amdgpu-picasso.patch b/sys-kernel/debian-sources/files/4.19.118/amdgpu-picasso.patch deleted file mode 100644 index 8f3180118b2c..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/amdgpu-picasso.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- linux-4.19.66-gentoo/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 2019-08-26 06:23:22.455074755 +0200 -+++ linux-4.19.66-gentoo/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 2019-09-09 13:11:52.879809819 +0200 -@@ -785,6 +785,7 @@ static const struct pci_device_id pciidl - {0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - /* Raven */ - {0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, -+ {0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_MOBILITY|AMD_IS_APU}, - - {0, 0, 0} - }; ---- linux-4.19.66-gentoo/drivers/gpu/drm/amd/amdkfd/kfd_device.c 2019-08-26 06:23:22.683079348 +0200 -+++ linux-4.19.66-gentoo/drivers/gpu/drm/amd/amdkfd/kfd_device.c 2019-09-09 13:31:18.563024146 +0200 -@@ -275,6 +275,7 @@ static const struct kfd_deviceid support - { 0x9876, &carrizo_device_info }, /* Carrizo */ - { 0x9877, &carrizo_device_info }, /* Carrizo */ - { 0x15DD, &raven_device_info }, /* Raven */ -+ { 0x15D8, &raven_device_info }, /* Raven */ - #endif - { 0x67A0, &hawaii_device_info }, /* Hawaii */ - { 0x67A1, &hawaii_device_info }, /* Hawaii */ diff --git a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-fix-bluetooth-polling.patch b/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-fix-bluetooth-polling.patch deleted file mode 100644 index b7e7ddb275e5..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-fix-bluetooth-polling.patch +++ /dev/null @@ -1,45 +0,0 @@ -Update the default BLE connection parameters. - -Commit c49a8682fc5d298d44e8d911f4fa14690ea9485e introduced a bounds -check on connection interval update requests, but the default min/max -values were left at 24-40 (30-50ms) which caused problems for devices -that want to negotiate connection intervals outside of those bounds. - -Setting the default min/max connection interval to the full allowable -range in the bluetooth specification restores the default Linux behavior -of allowing remote devices to negotiate their desired connection -interval, while still permitting the system administrator to later -narrow the range. - -The default supervision timeout must also be modified to accommodate -the max connection interval increase. The new default value meets the -requirements of the bluetooth specification and the conditions in -the hci_check_conn_params function. - -The downside to modifying the default supervision timeout is that -it will take longer (about 10 seconds) to detect a link loss condition. - -Fixes c49a8682fc5d: (validate BLE connection interval updates) - -Signed-off-by: Carey Sonsino <csonsino@xxxxxxxxx> - ---- - -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 04bc79359a17..895d17ec9291 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -3181,10 +3181,10 @@ struct hci_dev *hci_alloc_dev(void) - hdev->le_adv_max_interval = 0x0800; - hdev->le_scan_interval = 0x0060; - hdev->le_scan_window = 0x0030; -- hdev->le_conn_min_interval = 0x0018; -- hdev->le_conn_max_interval = 0x0028; -+ hdev->le_conn_min_interval = 0x0006; -+ hdev->le_conn_max_interval = 0x0c80; - hdev->le_conn_latency = 0x0000; -- hdev->le_supv_timeout = 0x002a; -+ hdev->le_supv_timeout = 0x03ea; - hdev->le_def_tx_len = 0x001b; - hdev->le_def_tx_time = 0x0148; - hdev->le_max_tx_len = 0x001b; diff --git a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-ikconfig.patch b/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-mcelog.patch b/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-nocerts.patch b/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-nocerts.patch deleted file mode 100644 index 4fae0b08eb93..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-05-05 10:59:14.000000000 -0400 -+++ debian.fixed/config/config 2019-05-06 13:03:53.445432253 -0400 -@@ -77,7 +77,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/debian-sources-4.19.118-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/4.19.118/usb-blacklist-endpoint-sound-devices-usbpre2.patch b/sys-kernel/debian-sources/files/4.19.118/usb-blacklist-endpoint-sound-devices-usbpre2.patch deleted file mode 100644 index b1b68515fb5c..000000000000 --- a/sys-kernel/debian-sources/files/4.19.118/usb-blacklist-endpoint-sound-devices-usbpre2.patch +++ /dev/null @@ -1,131 +0,0 @@ -See: https://lore.kernel.org/linux-usb/20200202134159.GM10381@localhost/ - -Add a new device quirk that can be used to blacklist endpoints. - -Since commit 3e4f8e21c4f2 ("USB: core: fix check for duplicate -endpoints") USB core ignores any duplicate endpoints found during -descriptor parsing. - -In order to handle devices where the first interfaces with duplicate -endpoints are the ones that should have their endpoints ignored, we need -to add a blacklist. - -Signed-off-by: Johan Hovold <johan@kernel.org> ---- - drivers/usb/core/config.c | 11 +++++++++++ - drivers/usb/core/quirks.c | 35 +++++++++++++++++++++++++++++++++++ - drivers/usb/core/usb.h | 3 +++ - include/linux/usb/quirks.h | 3 +++ - 4 files changed, 52 insertions(+) - -diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c -index 26bc05e48d8a..7df22bcefa9d 100644 ---- a/drivers/usb/core/config.c -+++ b/drivers/usb/core/config.c -@@ -256,6 +256,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, - struct usb_host_interface *ifp, int num_ep, - unsigned char *buffer, int size) - { -+ struct usb_device *udev = to_usb_device(ddev); - unsigned char *buffer0 = buffer; - struct usb_endpoint_descriptor *d; - struct usb_host_endpoint *endpoint; -@@ -297,6 +298,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, - goto skip_to_next_endpoint_or_interface_descriptor; - } - -+ /* Ignore blacklisted endpoints */ -+ if (udev->quirks & USB_QUIRK_ENDPOINT_BLACKLIST) { -+ if (usb_endpoint_is_blacklisted(udev, ifp, d)) { -+ dev_warn(ddev, "config %d interface %d altsetting %d has a blacklisted endpoint with address 0x%X, skipping\n", -+ cfgno, inum, asnum, -+ d->bEndpointAddress); -+ goto skip_to_next_endpoint_or_interface_descriptor; -+ } -+ } -+ - endpoint = &ifp->endpoint[ifp->desc.bNumEndpoints]; - ++ifp->desc.bNumEndpoints; - -diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 6b6413073584..9925b18e2154 100644 ---- a/drivers/usb/core/quirks.c -+++ b/drivers/usb/core/quirks.c -@@ -354,6 +354,9 @@ static const struct usb_device_id usb_quirk_list[] = { - { USB_DEVICE(0x0904, 0x6103), .driver_info = - USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL }, - -+ /* Sound Devices USBPre2 */ -+ { USB_DEVICE(0x0926, 0x0202), .driver_info = USB_QUIRK_ENDPOINT_BLACKLIST }, -+ - /* Keytouch QWERTY Panel keyboard */ - { USB_DEVICE(0x0926, 0x3333), .driver_info = - USB_QUIRK_CONFIG_INTF_STRINGS }, -@@ -472,6 +475,38 @@ static const struct usb_device_id usb_amd_resume_quirk_list[] = { - { } /* terminating entry must be last */ - }; - -+/* -+ * Entries for blacklisted endpoints. -+ * -+ * Matched for devices with USB_QUIRK_ENDPOINT_BLACKLIST. -+ */ -+static const struct usb_device_id usb_endpoint_blacklist_quirk_list[] = { -+ { USB_DEVICE_INTERFACE_NUMBER(0x0926, 0x0202, 1), .driver_info = 0x85 }, -+ { }, -+}; -+ -+bool usb_endpoint_is_blacklisted(struct usb_device *udev, -+ struct usb_host_interface *intf, -+ struct usb_endpoint_descriptor *epd) -+{ -+ const struct usb_device_id *id; -+ unsigned int address; -+ -+ for (id = usb_endpoint_blacklist_quirk_list; id->match_flags; ++id) { -+ if (!usb_match_device(udev, id)) -+ continue; -+ -+ if (!usb_match_one_id_intf(udev, intf, id)) -+ continue; -+ -+ address = id->driver_info; -+ if (address == epd->bEndpointAddress) -+ return true; -+ } -+ -+ return false; -+} -+ - static bool usb_match_any_interface(struct usb_device *udev, - const struct usb_device_id *id) - { -diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h -index cf4783cf661a..3ad0ee57e859 100644 ---- a/drivers/usb/core/usb.h -+++ b/drivers/usb/core/usb.h -@@ -37,6 +37,9 @@ extern void usb_authorize_interface(struct usb_interface *); - extern void usb_detect_quirks(struct usb_device *udev); - extern void usb_detect_interface_quirks(struct usb_device *udev); - extern void usb_release_quirk_list(void); -+extern bool usb_endpoint_is_blacklisted(struct usb_device *udev, -+ struct usb_host_interface *intf, -+ struct usb_endpoint_descriptor *epd); - extern int usb_remove_device(struct usb_device *udev); - - extern int usb_get_device_descriptor(struct usb_device *dev, -diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h -index a1be64c9940f..22c1f579afe3 100644 ---- a/include/linux/usb/quirks.h -+++ b/include/linux/usb/quirks.h -@@ -69,4 +69,7 @@ - /* Hub needs extra delay after resetting its port. */ - #define USB_QUIRK_HUB_SLOW_RESET BIT(14) - -+/* device has blacklisted endpoints */ -+#define USB_QUIRK_ENDPOINT_BLACKLIST BIT(15) -+ - #endif /* __LINUX_USB_QUIRKS_H */ --- -2.24.1 - diff --git a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-fix-bluetooth-polling.patch b/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-fix-bluetooth-polling.patch deleted file mode 100644 index b7e7ddb275e5..000000000000 --- a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-fix-bluetooth-polling.patch +++ /dev/null @@ -1,45 +0,0 @@ -Update the default BLE connection parameters. - -Commit c49a8682fc5d298d44e8d911f4fa14690ea9485e introduced a bounds -check on connection interval update requests, but the default min/max -values were left at 24-40 (30-50ms) which caused problems for devices -that want to negotiate connection intervals outside of those bounds. - -Setting the default min/max connection interval to the full allowable -range in the bluetooth specification restores the default Linux behavior -of allowing remote devices to negotiate their desired connection -interval, while still permitting the system administrator to later -narrow the range. - -The default supervision timeout must also be modified to accommodate -the max connection interval increase. The new default value meets the -requirements of the bluetooth specification and the conditions in -the hci_check_conn_params function. - -The downside to modifying the default supervision timeout is that -it will take longer (about 10 seconds) to detect a link loss condition. - -Fixes c49a8682fc5d: (validate BLE connection interval updates) - -Signed-off-by: Carey Sonsino <csonsino@xxxxxxxxx> - ---- - -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 04bc79359a17..895d17ec9291 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -3181,10 +3181,10 @@ struct hci_dev *hci_alloc_dev(void) - hdev->le_adv_max_interval = 0x0800; - hdev->le_scan_interval = 0x0060; - hdev->le_scan_window = 0x0030; -- hdev->le_conn_min_interval = 0x0018; -- hdev->le_conn_max_interval = 0x0028; -+ hdev->le_conn_min_interval = 0x0006; -+ hdev->le_conn_max_interval = 0x0c80; - hdev->le_conn_latency = 0x0000; -- hdev->le_supv_timeout = 0x002a; -+ hdev->le_supv_timeout = 0x03ea; - hdev->le_def_tx_len = 0x001b; - hdev->le_def_tx_time = 0x0148; - hdev->le_max_tx_len = 0x001b; diff --git a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-ikconfig.patch b/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-mcelog.patch b/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-nocerts.patch b/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-nocerts.patch deleted file mode 100644 index 4fae0b08eb93..000000000000 --- a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-05-05 10:59:14.000000000 -0400 -+++ debian.fixed/config/config 2019-05-06 13:03:53.445432253 -0400 -@@ -77,7 +77,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/4.19.98/debian-sources-lts-4.19.98-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-fix-bluetooth-polling.patch b/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-fix-bluetooth-polling.patch deleted file mode 100644 index b7e7ddb275e5..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-fix-bluetooth-polling.patch +++ /dev/null @@ -1,45 +0,0 @@ -Update the default BLE connection parameters. - -Commit c49a8682fc5d298d44e8d911f4fa14690ea9485e introduced a bounds -check on connection interval update requests, but the default min/max -values were left at 24-40 (30-50ms) which caused problems for devices -that want to negotiate connection intervals outside of those bounds. - -Setting the default min/max connection interval to the full allowable -range in the bluetooth specification restores the default Linux behavior -of allowing remote devices to negotiate their desired connection -interval, while still permitting the system administrator to later -narrow the range. - -The default supervision timeout must also be modified to accommodate -the max connection interval increase. The new default value meets the -requirements of the bluetooth specification and the conditions in -the hci_check_conn_params function. - -The downside to modifying the default supervision timeout is that -it will take longer (about 10 seconds) to detect a link loss condition. - -Fixes c49a8682fc5d: (validate BLE connection interval updates) - -Signed-off-by: Carey Sonsino <csonsino@xxxxxxxxx> - ---- - -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 04bc79359a17..895d17ec9291 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -3181,10 +3181,10 @@ struct hci_dev *hci_alloc_dev(void) - hdev->le_adv_max_interval = 0x0800; - hdev->le_scan_interval = 0x0060; - hdev->le_scan_window = 0x0030; -- hdev->le_conn_min_interval = 0x0018; -- hdev->le_conn_max_interval = 0x0028; -+ hdev->le_conn_min_interval = 0x0006; -+ hdev->le_conn_max_interval = 0x0c80; - hdev->le_conn_latency = 0x0000; -- hdev->le_supv_timeout = 0x002a; -+ hdev->le_supv_timeout = 0x03ea; - hdev->le_def_tx_len = 0x001b; - hdev->le_def_tx_time = 0x0148; - hdev->le_max_tx_len = 0x001b; diff --git a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-ikconfig.patch b/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-mcelog.patch b/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-nocerts.patch b/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-nocerts.patch deleted file mode 100644 index 7f5c79b0d802..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-10-19 18:35:10.000000000 -0400 -+++ debian.fixed/config/config 2019-10-22 01:13:53.262687881 -0400 -@@ -68,7 +68,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/debian-sources-5.4.19-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/5.4.19/export_kernel_fpu_functions_5_3.patch b/sys-kernel/debian-sources/files/5.4.19/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index af71d043e612..000000000000 --- a/sys-kernel/debian-sources/files/5.4.19/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - - diff --git a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-fix-bluetooth-polling.patch b/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-fix-bluetooth-polling.patch deleted file mode 100644 index b7e7ddb275e5..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-fix-bluetooth-polling.patch +++ /dev/null @@ -1,45 +0,0 @@ -Update the default BLE connection parameters. - -Commit c49a8682fc5d298d44e8d911f4fa14690ea9485e introduced a bounds -check on connection interval update requests, but the default min/max -values were left at 24-40 (30-50ms) which caused problems for devices -that want to negotiate connection intervals outside of those bounds. - -Setting the default min/max connection interval to the full allowable -range in the bluetooth specification restores the default Linux behavior -of allowing remote devices to negotiate their desired connection -interval, while still permitting the system administrator to later -narrow the range. - -The default supervision timeout must also be modified to accommodate -the max connection interval increase. The new default value meets the -requirements of the bluetooth specification and the conditions in -the hci_check_conn_params function. - -The downside to modifying the default supervision timeout is that -it will take longer (about 10 seconds) to detect a link loss condition. - -Fixes c49a8682fc5d: (validate BLE connection interval updates) - -Signed-off-by: Carey Sonsino <csonsino@xxxxxxxxx> - ---- - -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 04bc79359a17..895d17ec9291 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -3181,10 +3181,10 @@ struct hci_dev *hci_alloc_dev(void) - hdev->le_adv_max_interval = 0x0800; - hdev->le_scan_interval = 0x0060; - hdev->le_scan_window = 0x0030; -- hdev->le_conn_min_interval = 0x0018; -- hdev->le_conn_max_interval = 0x0028; -+ hdev->le_conn_min_interval = 0x0006; -+ hdev->le_conn_max_interval = 0x0c80; - hdev->le_conn_latency = 0x0000; -- hdev->le_supv_timeout = 0x002a; -+ hdev->le_supv_timeout = 0x03ea; - hdev->le_def_tx_len = 0x001b; - hdev->le_def_tx_time = 0x0148; - hdev->le_max_tx_len = 0x001b; diff --git a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-ikconfig.patch b/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-mcelog.patch b/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-nocerts.patch b/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-nocerts.patch deleted file mode 100644 index 7f5c79b0d802..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-10-19 18:35:10.000000000 -0400 -+++ debian.fixed/config/config 2019-10-22 01:13:53.262687881 -0400 -@@ -68,7 +68,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/debian-sources-5.5.17-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/5.5.17/export_kernel_fpu_functions_5_3.patch b/sys-kernel/debian-sources/files/5.5.17/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index af71d043e612..000000000000 --- a/sys-kernel/debian-sources/files/5.5.17/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - - diff --git a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-ikconfig.patch b/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-mcelog.patch b/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-nocerts.patch b/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-nocerts.patch deleted file mode 100644 index 7f5c79b0d802..000000000000 --- a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-10-19 18:35:10.000000000 -0400 -+++ debian.fixed/config/config 2019-10-22 01:13:53.262687881 -0400 -@@ -68,7 +68,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/5.6.14/debian-sources-5.6.14-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-fix-bluetooth-polling.patch b/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-fix-bluetooth-polling.patch deleted file mode 100644 index b7e7ddb275e5..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-fix-bluetooth-polling.patch +++ /dev/null @@ -1,45 +0,0 @@ -Update the default BLE connection parameters. - -Commit c49a8682fc5d298d44e8d911f4fa14690ea9485e introduced a bounds -check on connection interval update requests, but the default min/max -values were left at 24-40 (30-50ms) which caused problems for devices -that want to negotiate connection intervals outside of those bounds. - -Setting the default min/max connection interval to the full allowable -range in the bluetooth specification restores the default Linux behavior -of allowing remote devices to negotiate their desired connection -interval, while still permitting the system administrator to later -narrow the range. - -The default supervision timeout must also be modified to accommodate -the max connection interval increase. The new default value meets the -requirements of the bluetooth specification and the conditions in -the hci_check_conn_params function. - -The downside to modifying the default supervision timeout is that -it will take longer (about 10 seconds) to detect a link loss condition. - -Fixes c49a8682fc5d: (validate BLE connection interval updates) - -Signed-off-by: Carey Sonsino <csonsino@xxxxxxxxx> - ---- - -diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c -index 04bc79359a17..895d17ec9291 100644 ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -3181,10 +3181,10 @@ struct hci_dev *hci_alloc_dev(void) - hdev->le_adv_max_interval = 0x0800; - hdev->le_scan_interval = 0x0060; - hdev->le_scan_window = 0x0030; -- hdev->le_conn_min_interval = 0x0018; -- hdev->le_conn_max_interval = 0x0028; -+ hdev->le_conn_min_interval = 0x0006; -+ hdev->le_conn_max_interval = 0x0c80; - hdev->le_conn_latency = 0x0000; -- hdev->le_supv_timeout = 0x002a; -+ hdev->le_supv_timeout = 0x03ea; - hdev->le_def_tx_len = 0x001b; - hdev->le_def_tx_time = 0x0148; - hdev->le_max_tx_len = 0x001b; diff --git a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-ikconfig.patch b/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-ikconfig.patch deleted file mode 100644 index 7fd83ab8ddd4..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-ikconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2018-12-16 17:37:36.000000000 +0000 -+++ debian-fixed/config/config 2018-12-21 19:38:42.417410783 +0000 -@@ -5970,7 +5970,8 @@ - CONFIG_TASK_XACCT=y - CONFIG_TASK_IO_ACCOUNTING=y - CONFIG_CPU_ISOLATION=y --# CONFIG_IKCONFIG is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=17 - CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 - CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13 diff --git a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-mcelog.patch b/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-mcelog.patch deleted file mode 100644 index dd219db89ab4..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-mcelog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar debian/config/config debian-fixed/config/config ---- debian/config/config 2017-10-28 22:51:59.000000000 +0300 -+++ debian-fixed/config/config 2017-11-13 06:47:04.809885320 +0200 -@@ -14,6 +14,10 @@ - CONFIG_STRICT_KERNEL_RWX=y - - ## -+## file: arch/x86/Kconfig -+## -+CONFIG_X86_MCELOG_LEGACY=y -+ - ## file: block/Kconfig - ## - CONFIG_BLOCK=y diff --git a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-nocerts.patch b/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-nocerts.patch deleted file mode 100644 index 7f5c79b0d802..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-nocerts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN debian/config/config debian.fixed/config/config ---- debian/config/config 2019-10-19 18:35:10.000000000 -0400 -+++ debian.fixed/config/config 2019-10-22 01:13:53.262687881 -0400 -@@ -68,7 +68,7 @@ - #. Actually a file containing X.509 certificates, not keys. - #. Whenever the filename changes, this also needs to be updated in - #. debian/featureset-*/config --CONFIG_SYSTEM_TRUSTED_KEYS="debian/certs/debian-uefi-certs.pem" -+CONFIG_SYSTEM_TRUSTED_KEYS="" - #. Add secondary keyring with keys from UEFI db and MOK. - CONFIG_SECONDARY_TRUSTED_KEYRING=y - CONFIG_SYSTEM_BLACKLIST_KEYRING=y diff --git a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-xfs-libcrc32c-fix.patch b/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-xfs-libcrc32c-fix.patch deleted file mode 100644 index da144c5e9b74..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/debian-sources-5.6.7-xfs-libcrc32c-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nuar debian/config/config debian-fix/config/config ---- debian/config/config 2014-04-29 01:57:15.000000000 +0000 -+++ debian-fix/config/config 2014-05-16 15:02:38.622819509 +0000 -@@ -1,4 +1,4 @@ --## -+### - ## file: arch/Kconfig - ## - CONFIG_KPROBES=y -@@ -4710,7 +4710,7 @@ - ## - ## file: fs/xfs/Kconfig - ## --CONFIG_XFS_FS=m -+CONFIG_XFS_FS=y - CONFIG_XFS_QUOTA=y - CONFIG_XFS_POSIX_ACL=y - CONFIG_XFS_RT=y -@@ -4909,7 +4909,7 @@ - CONFIG_CRC32=y - # CONFIG_CRC32_SELFTEST is not set - CONFIG_CRC7=m --CONFIG_LIBCRC32C=m -+CONFIG_LIBCRC32C=y - # CONFIG_CRC8 is not set - # CONFIG_RANDOM32_SELFTEST is not set - CONFIG_CORDIC=m diff --git a/sys-kernel/debian-sources/files/5.6.7/export_kernel_fpu_functions_5_3.patch b/sys-kernel/debian-sources/files/5.6.7/export_kernel_fpu_functions_5_3.patch deleted file mode 100644 index af71d043e612..000000000000 --- a/sys-kernel/debian-sources/files/5.6.7/export_kernel_fpu_functions_5_3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1e010beda2896bdf3082fb37a3e49f8ce20e04d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 2 May 2019 05:28:08 +0100 -Subject: [PATCH] x86/fpu: Export kernel_fpu_{begin,end}() with - EXPORT_SYMBOL_GPL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need these symbols in zfs as the fpu implementation breaks userspace: - -https://github.com/zfsonlinux/zfs/issues/9346 -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - arch/x86/kernel/fpu/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 12c70840980e..352538b3bb5d 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -102,7 +102,7 @@ void kernel_fpu_begin(void) - } - __cpu_invalidate_fpregs_state(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_begin); -+EXPORT_SYMBOL(kernel_fpu_begin); - - void kernel_fpu_end(void) - { -@@ -111,7 +111,7 @@ void kernel_fpu_end(void) - this_cpu_write(in_kernel_fpu, false); - preempt_enable(); - } --EXPORT_SYMBOL_GPL(kernel_fpu_end); -+EXPORT_SYMBOL(kernel_fpu_end); - - /* - * Save the FPU state (mark it for reload if necessary): --- -2.23.0 - - diff --git a/sys-kernel/debian-sources/files/config-extract b/sys-kernel/debian-sources/files/config-extract index 4860a6459873..ddbafee3ecce 100755 --- a/sys-kernel/debian-sources/files/config-extract +++ b/sys-kernel/debian-sources/files/config-extract @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python import os,sys,re import getopt @@ -10,7 +10,7 @@ re_item = re.compile("[A-Z_]*='[^']*'") try: f=open("debian/rules.gen","r") except: - print "Unable to open debian/rules.gen; can't continue." + print("Unable to open debian/rules.gen; can't continue.") sys.exit(1) lines=f.readlines() f.close() @@ -27,7 +27,7 @@ while line < len(lines): if not head_match: line += 1 continue - config_name = head_match.group(1) + config_name = head_match.group(1) line += 1 if not re_flav.findall(lines[line]): continue @@ -57,7 +57,7 @@ for config in configlist: archdict[cs[0]][cs[1]] = [] archdict[cs[0]][cs[1]].append(cs[2]) -arches = archdict.keys() +arches = list(archdict.keys()) arches.sort() features = [ None ] @@ -68,7 +68,7 @@ for arch in arches: PROG="config-extract" def usage(): - print """This work is free software. + print("""This work is free software. Copyright 2011 Funtoo Technologies. You can redistribute and/or modify it under the terms of the GNU General Public License version 3 as published by the Free @@ -77,7 +77,7 @@ license that has been publicly approved for use with this program by Funtoo Technologies (or its successors, if any.) usage: %s [options] arch [featureset] [subarch] - + -h --help print this usage and exit -l --list list all available kernel configurations -o --outfile specify kernel config outfile -- @@ -101,13 +101,13 @@ pick one (and the program will remind you to do this.) The kernel configuration will be written to ".config" in the current directory, or the location you specified using the -o/--outfile option. -""" % PROG +""" % PROG) sys.exit(2) try: opts, args = getopt.getopt(sys.argv[1:], "o:hl", ["help", "list","outfile="]) -except getopt.GetoptError, err: - print str(err) +except getopt.GetoptError as err: + print(str(err)) usage() mode="run" @@ -124,10 +124,10 @@ for o,a in opts: if mode == "run": if len(args) < 1 or len(args) > 3: if len(args) == 0: - print "Please specify an arch - one of: "+", ".join(arches) + print("Please specify an arch - one of: "+", ".join(arches)) sys.exit(2) else: - print "Too many arguments." + print("Too many arguments.") usage() arch = args[0] if outfile == None: @@ -145,30 +145,30 @@ if mode == "run": # print out optimized list of available kernel configurations: if mode=="list": - print + print() for flav in features: label = flav if label == None: label = "standard" - print "====== %s featureset ======" % label - print + print("====== %s featureset ======" % label) + print() for arch in arches: if flav in archdict[arch]: if len(archdict[arch][flav]) == 1: - print arch.rjust(12) + print(arch.rjust(12)) else: flavlist = archdict[arch][flav] flavlist.sort() - variants = ", ".join(flavlist) - print arch.rjust(12) + ":", variants - print + variants = ", ".join(flavlist) + print(arch.rjust(12) + ":", variants) + print() sys.exit(0) # featureset defaults to None. if featureset not in archdict[arch]: - print "Error: There is no '%s' featureset kernel config for arch '%s'. Exiting." % ( featureset, arch ) - print archdict[arch] + print("Error: There is no '%s' featureset kernel config for arch '%s'. Exiting." % ( featureset, arch )) + print(archdict[arch]) sys.exit(2) # If a subarch is not specified (None), then we will auto-pick the subarch if only one is available. @@ -178,13 +178,13 @@ if subarch == None: if len(archdict[arch][featureset]) == 1: subarch = archdict[arch][featureset][0] else: - print "Error: there is more than one 'sub-architecture' for this arch." - print "Please specify [arch] [featureset] [subarch], with one of these subarches:" - print ", ".join(archdict[arch][featureset]) + print("Error: there is more than one 'sub-architecture' for this arch.") + print("Please specify [arch] [featureset] [subarch], with one of these subarches:") + print(", ".join(archdict[arch][featureset])) sys.exit(2) else: if subarch not in archdict[arch][featureset]: - print "Error: specified sub-architecture '%s' is not available for this arch. Exiting." % subarch + print("Error: specified sub-architecture '%s' is not available for this arch. Exiting." % subarch) sys.exit(2) # We've done all our arg processing, now let's construct the master_key that we will use to look up the @@ -200,20 +200,20 @@ if subarch == None: else: master_key += "_%s" % subarch if master_key not in configdict: - print "Master key lookup failed; can't continue. Please report this bug." + print("Master key lookup failed; can't continue. Please report this bug.") sys.exit(1) if "KCONFIG" not in configdict[master_key]: - print "Unable to find KCONFIG option; can't continue. Please report this bug." + print("Unable to find KCONFIG option; can't continue. Please report this bug.") sys.exit(1) -cmd = "python2 debian/bin/kconfig.py '%s' %s" % ( outfile, configdict[master_key]["KCONFIG"] ) +cmd = "python debian/bin/kconfig.py '%s' %s" % ( outfile, configdict[master_key]["KCONFIG"] ) if "KCONFIG_OPTIONS" in configdict[master_key]: cmd += " %s" % configdict[master_key]["KCONFIG_OPTIONS"] os.environ["PYTHONPATH"] = "debian/lib/python" retval = os.system(cmd) if retval == 0: - print "Wrote %s kernel configuration to %s." % ( master_key, outfile ) + print("Wrote %s kernel configuration to %s." % ( master_key, outfile )) sys.exit(0) else: - print "There was an error extracting the Debian kernel config." + print("There was an error extracting the Debian kernel config.") sys.exit(1) |
