From f43e36ba5393eb883ccab1a8364a6d97daa96016 Mon Sep 17 00:00:00 2001 From: Alek Du Date: Wed, 6 Feb 2019 03:30:09 +0000 Subject: [PATCH] update to PKT lts-v4.19.19-base-190205T045721Z Signed-off-by: Alek Du --- ...e-req-needs_extra_trb.v4.19.19.merge.patch | 30 +++++++++++++++++++ config-iot-lts2018-sos | 2 +- linux-iot-lts2018.spec | 16 +++++----- release | 2 +- upstream | 2 +- 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 0985-usb-dwc3-gadget-use-req-needs_extra_trb.v4.19.19.merge.patch diff --git a/0985-usb-dwc3-gadget-use-req-needs_extra_trb.v4.19.19.merge.patch b/0985-usb-dwc3-gadget-use-req-needs_extra_trb.v4.19.19.merge.patch new file mode 100644 index 00000000..4c63d8e0 --- /dev/null +++ b/0985-usb-dwc3-gadget-use-req-needs_extra_trb.v4.19.19.merge.patch @@ -0,0 +1,30 @@ +From 9b0f909516c2cee1d3a0c2acea5a2517f796f55a Mon Sep 17 00:00:00 2001 +From: "Nikunj A. Dadhania" +Date: Mon, 4 Feb 2019 01:53:09 -0800 +Subject: [PATCH] usb: dwc3: gadget: use req->needs_extra_trb flag + +backport commit 25ad17d692ad54c3c33b2a31e5ce2a82e38de14e had +replaced 'needs_extra_trb' with 'unaligned' and 'zero' members + +Restore it back to 'needs_extra_trb' and fix compile failure + +Change-Id: Ic5559f0908a4faa88b2e88371d5d8dc7f4c8dbb9 +Signed-off-by: Nikunj A. Dadhania +--- + drivers/usb/dwc3/gadget.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: kernel-coe-tracker/drivers/usb/dwc3/gadget.c +=================================================================== +--- kernel-coe-tracker.orig/drivers/usb/dwc3/gadget.c ++++ kernel-coe-tracker/drivers/usb/dwc3/gadget.c +@@ -178,8 +178,7 @@ static void dwc3_gadget_del_and_unmap_re + req->started = false; + list_del(&req->list); + req->remaining = 0; +- req->unaligned = false; +- req->zero = false; ++ req->needs_extra_trb = false; + + if (req->request.status == -EINPROGRESS) + req->request.status = status; diff --git a/config-iot-lts2018-sos b/config-iot-lts2018-sos index c131eace..85b0c033 100644 --- a/config-iot-lts2018-sos +++ b/config-iot-lts2018-sos @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.18 Kernel Configuration +# Linux/x86 4.19.19 Kernel Configuration # # diff --git a/linux-iot-lts2018.spec b/linux-iot-lts2018.spec index 18319ab2..bba051df 100644 --- a/linux-iot-lts2018.spec +++ b/linux-iot-lts2018.spec @@ -14,16 +14,16 @@ # Name: linux-iot-lts2018 -Version: 4.19.18 +Version: 4.19.19 # upstream number is the number from PKT it consist in # YYMMDDHHMM a 10 length number -%global upstreamnumber 1901301849 -Release: 7 +%global upstreamnumber 1902050457 +Release: 8 License: GPL-2.0 Summary: The Linux kernel Url: http://www.kernel.org/ Group: kernel -Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.18.tar.xz +Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.19.tar.xz Source1: config-iot-lts2018 Source2: config-iot-lts2018-sos Source3: cmdline-iot-lts2018 @@ -32,8 +32,8 @@ Source5: fragment-sos # quilt.url: https://github.com/intel/linux-intel-quilt # quilt.branch: 4.19/base -# quilt.tag: lts-v4.19.18-base-190130T184924Z -# config.tag: lts-v4.19.18-base-190130T184924Z +# quilt.tag: lts-v4.19.19-base-190205T045721Z +# config.tag: lts-v4.19.19-base-190205T045721Z %define ktarget0 iot-lts2018 %define kversion0 %{version}-%{release}.%{ktarget0} @@ -1034,6 +1034,7 @@ Patch0981: 0981-media-intel-ipu4-fix-TI960-i2c-adapter.patch Patch0982: 0982-media-intel-ipu4-enable-OV495-multiport.patch Patch0983: 0983-media-intel-ipu4-restore-back-ox03a-init-se.patch Patch0984: 0984-media-intel-ipu4-separated-init-seq-for-ox0.patch +Patch0985: 0985-usb-dwc3-gadget-use-req-needs_extra_trb.v4.19.19.merge.patch #END XXXX: PK Series # Clear Linux Series @@ -1060,7 +1061,7 @@ Group: kernel Linux kernel extra files %prep -%setup -q -n linux-4.19.18 +%setup -q -n linux-4.19.19 #patchXXXX PK Series %patch0001 -p1 @@ -2047,6 +2048,7 @@ Linux kernel extra files %patch0982 -p1 %patch0983 -p1 %patch0984 -p1 +%patch0985 -p1 # End XXXX PK Series # Clear Linux Series diff --git a/release b/release index 7f8f011e..45a4fb75 100644 --- a/release +++ b/release @@ -1 +1 @@ -7 +8 diff --git a/upstream b/upstream index 0fe43fe3..c96877a2 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -c20324f74d6b11381dcda4f89a3e7fb358c3ed15/linux-4.19.18.tar.xz +79cd471269139f2475e88e18d7ad8fcc67621659/linux-4.19.19.tar.xz