From df4af5107d68abd8f57a15dddcb32a65a21b93b2 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 1 Dec 2019 13:47:48 -0800 Subject: Updated to 5.4.1 --- ...-on-the-return-value-of-hidp_send_message.patch | 62 ----- PKGBUILD | 36 +-- config | 261 ++++++++++++++------- 3 files changed, 195 insertions(+), 164 deletions(-) delete mode 100644 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch diff --git a/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch b/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch deleted file mode 100644 index f2bceca..0000000 --- a/0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0bee55974a73eed4a9b9c9e87000df34117e7f69 Mon Sep 17 00:00:00 2001 -From: Dan Elkouby -Date: Fri, 6 Sep 2019 14:06:44 +0300 -Subject: Bluetooth: hidp: Fix assumptions on the return value of - hidp_send_message - -hidp_send_message was changed to return non-zero values on success, -which some other bits did not expect. This caused spurious errors to be -propagated through the stack, breaking some drivers, such as hid-sony -for the Dualshock 4 in Bluetooth mode. - -As pointed out by Dan Carpenter, hid-microsoft directly relied on that -assumption as well. - -Fixes: 48d9cc9d85dd ("Bluetooth: hidp: Let hidp_send_message return number of queued bytes") - -Signed-off-by: Dan Elkouby -Reviewed-by: Dan Carpenter -Reviewed-by: Jiri Kosina -Signed-off-by: Marcel Holtmann ---- - drivers/hid/hid-microsoft.c | 2 +- - net/bluetooth/hidp/core.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c -index 8b3a922bdad3..2cf83856f2e4 100644 ---- a/drivers/hid/hid-microsoft.c -+++ b/drivers/hid/hid-microsoft.c -@@ -303,7 +303,7 @@ static void ms_ff_worker(struct work_struct *work) - r->magnitude[MAGNITUDE_WEAK] = ms->weak; /* right actuator */ - - ret = hid_hw_output_report(hdev, (__u8 *)r, sizeof(*r)); -- if (ret) -+ if (ret < 0) - hid_warn(hdev, "failed to send FF report\n"); - } - -diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c -index 8d889969ae7e..bef84b95e2c4 100644 ---- a/net/bluetooth/hidp/core.c -+++ b/net/bluetooth/hidp/core.c -@@ -267,7 +267,7 @@ static int hidp_get_raw_report(struct hid_device *hid, - set_bit(HIDP_WAITING_FOR_RETURN, &session->flags); - data[0] = report_number; - ret = hidp_send_ctrl_message(session, report_type, data, 1); -- if (ret) -+ if (ret < 0) - goto err; - - /* Wait for the return of the report. The returned report -@@ -343,7 +343,7 @@ static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, - data[0] = reportnum; - set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags); - ret = hidp_send_ctrl_message(session, report_type, data, count); -- if (ret) -+ if (ret < 0) - goto err; - - /* Wait for the ACK from the device. */ --- -cgit v1.2.1-1-g437b diff --git a/PKGBUILD b/PKGBUILD index a586824..74735c2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,11 +8,12 @@ # Parabola version lacks ath9k regdom and raid6 algo patches # Parabola version is 300 Hz # Parabola version is not configured for openrc +# Parabola version does not disable eee pkgbase=linux-libre _supver=5 -_majver=3 -_minver=13 +_majver=4 +_minver=1 _gccpatchver='20190822' if [ "$_minver" == "0" ]; then pkgver=${_supver}.${_majver} @@ -25,8 +26,8 @@ url='https://linux-libre.fsfla.org/' arch=(x86_64) license=(GPL2) makedepends=( - xmlto kmod inetutils bc libelf - python-sphinx python-sphinx_rtd_theme graphviz imagemagick + bc kmod libelf + xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick ) conflicts=('linux') options=('!strip') @@ -37,7 +38,6 @@ source=( https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign} https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch - 0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch graysky_bdver2-hotfix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch @@ -47,17 +47,16 @@ source=( validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) -sha256sums=('c50879645e8f13a6a39a86748a8cd259b4ecd2191c88ef772b4432c993820c0a' +sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab' 'SKIP' - '6c242e731660e9055da3b959fdb90a6f902b01b4dd21a7a17dcd9d832ee9eaed' + 'aeb69ceb445e0584897f0afd2d0f1978825bd563e55c63d45dd7a56a76191f1e' 'SKIP' 'e862ecd2cb0b20e1859ec3e47616457a9a3acb111cd5a86094f9ed1dbd7f42ac' - '9b92add42581aeb427a0c2cffc584815f0e4223a1a6bc27802ccd77eaf6e4bec' 'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb' - 'b32ac15d40da22a10f341d9ef5166c385805698b6d36cafac7db97096647f782') + '94e7878ff4f8d2ac0afed1d771f38eb552e8ac7a8498a7ad03493b8ffd564f99') #export KBUILD_BUILD_HOST=arc4linux export KBUILD_BUILD_USER=$pkgbase @@ -76,7 +75,6 @@ prepare() { # Hotfixes msg2 "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch - patch -p1 -i ../0002-Bluetooth-hidp-Fix-assumptions-on-the-return-value-of-hidp_send_message.patch # graysky gcc hotfixes @@ -253,26 +251,18 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the $pkgdesc kernel" + pkgdesc="Documentation for the $pkgdesc kernel" cd $_srcname local builddir="$pkgdir/usr/lib/modules/$(