From 79b07ad0c36e0bd23d0c73c9222f5c3b722effb2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 21 Dec 2019 02:55:40 +0000 Subject: [PATCH 1/2] scst: Remove three superfluous unlikely() annotations This was detected by checkpatch. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8689 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index fca89fd62..a0b69aa02 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -8294,7 +8294,7 @@ static struct request *__blk_map_kern_sg(struct request_queue *q, } rq = blk_make_request(q, hbio, gfp_mask); - if (unlikely(IS_ERR(rq))) + if (IS_ERR(rq)) goto out_free_bios; #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) @@ -8371,11 +8371,11 @@ static struct request *blk_map_kern_sg(struct request_queue *q, } rq = __blk_map_kern_sg(q, sgl, nents, NULL, gfp, reading); - if (unlikely(IS_ERR(rq))) { + if (IS_ERR(rq)) { struct blk_kern_sg_work *bw; bw = blk_copy_kern_sg(q, sgl, nents, gfp, reading); - if (unlikely(IS_ERR(bw))) { + if (IS_ERR(bw)) { rq = ERR_PTR(PTR_ERR(bw)); goto out; } From 73de09a7cb9172b2f699221422f87d2e8b10996d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 21 Dec 2019 17:00:39 +0000 Subject: [PATCH 2/2] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8690 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 3b22d48f4..590cb2975 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,28 +3,28 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -5.4.1 \ -5.3.14-nc \ +5.4.6 \ +5.3.18-nc \ 5.2.21-nc \ 5.1.21-nc \ 5.0.21-nc \ 4.20.17-nc \ -4.19.86-nc \ +4.19.91-nc \ 4.18.20-nc \ 4.17.19-nc \ 4.16.18-nc \ 4.15.18-nc \ -4.14.156-nc \ +4.14.160-nc \ 4.13.16-nc \ 4.12.14-nc \ 4.11.12-nc \ 4.10.17-nc \ -4.9.205-nc \ +4.9.207-nc \ 4.8.17-nc \ 4.7.10-nc \ 4.6.7-nc \ 4.5.7-nc \ -4.4.205-nc \ +4.4.207-nc \ 4.3.6-nc \ 4.2.8-nc \ 4.1.52-nc \ @@ -32,7 +32,7 @@ ABT_KERNELS=" \ 3.19.8-nc \ 3.18.140-nc \ 3.17.8-nc \ -3.16.78-nc \ +3.16.80-nc \ 3.15.10-nc \ 3.14.79-nc \ 3.13.11-nc \