diff --git a/configs/fedora/generic/CONFIG_SF_PDMA b/configs/fedora/generic/CONFIG_SF_PDMA new file mode 100644 index 000000000..87ab2c1f0 --- /dev/null +++ b/configs/fedora/generic/CONFIG_SF_PDMA @@ -0,0 +1 @@ +# CONFIG_SF_PDMA is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_QDMA b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_QDMA new file mode 100644 index 000000000..51b08ab8e --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_QDMA @@ -0,0 +1 @@ +CONFIG_FSL_DPAA2_QDMA=m diff --git a/gitrev b/gitrev index 21462bca7..b5b69252b 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -596cf45cbf6e4fa7bcb0df33e373a7d062b644b5 +76bb8b05960c3d1668e6bee7624ed886cbd135ba diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 19dc98ade..b9399957c 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1953,6 +1953,7 @@ CONFIG_FSI_SCOM=m CONFIG_FSL_DPAA2_ETH=m CONFIG_FSL_DPAA2_ETHSW=m CONFIG_FSL_DPAA2_PTP_CLOCK=m +CONFIG_FSL_DPAA2_QDMA=m CONFIG_FSL_DPAA2=y # CONFIG_FSL_DPAA_CHECKING is not set CONFIG_FSL_DPAA_ETH=m @@ -5715,6 +5716,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 86e5c7f6b..2ef5739c3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1937,6 +1937,7 @@ CONFIG_FSI_SCOM=m CONFIG_FSL_DPAA2_ETH=m CONFIG_FSL_DPAA2_ETHSW=m CONFIG_FSL_DPAA2_PTP_CLOCK=m +CONFIG_FSL_DPAA2_QDMA=m CONFIG_FSL_DPAA2=y # CONFIG_FSL_DPAA_CHECKING is not set CONFIG_FSL_DPAA_ETH=m @@ -5694,6 +5695,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index d5490240d..cd6471c53 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5844,6 +5844,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a59001baf..ebb7f3498 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5824,6 +5824,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index b69046abb..cd7f22e38 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5592,6 +5592,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 306d1622f..6e866f023 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5572,6 +5572,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 0acd3c5e0..080132700 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5156,6 +5156,7 @@ CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set CONFIG_SFI=y +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 29639c202..7aabd2cdb 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5136,6 +5136,7 @@ CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set CONFIG_SFI=y +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 285bb4265..03124715e 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4834,6 +4834,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 604c58a77..536490b7b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4812,6 +4812,7 @@ CONFIG_SERIO=y CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m CONFIG_SGI_PARTITION=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index b0c99ec63..9c40f93a6 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4777,6 +4777,7 @@ CONFIG_SERIO_SERPORT=m CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_PARTITION is not set CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 049561805..78547e457 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4755,6 +4755,7 @@ CONFIG_SERIO_SERPORT=m CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set +# CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_PARTITION is not set CONFIG_SHUFFLE_PAGE_ALLOCATOR=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 889e5db4f..c5b1dec15 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5204,6 +5204,7 @@ CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y CONFIG_SFI=y +# CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set CONFIG_SGI_GRU=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 9935f00b5..418c60cef 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5184,6 +5184,7 @@ CONFIG_SFC_MCDI_MON=y CONFIG_SFC_MTD=y CONFIG_SFC_SRIOV=y CONFIG_SFI=y +# CONFIG_SF_PDMA is not set CONFIG_SFP=m # CONFIG_SGI_GRU_DEBUG is not set CONFIG_SGI_GRU=m diff --git a/kernel.spec b/kernel.spec index 2dfa866e4..314048c74 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -804,9 +804,6 @@ Patch504: 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch # https://lkml.org/lkml/2019/8/29/1772 Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch -# CVE-2019-19066 rhbz 1774976 1774978 -Patch513: scsi-bfa-release-allocated-memory-in-case-of-error.patch - # CVE-2019-14895 rhbz 1774870 1776139 Patch525: mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch @@ -1381,6 +1378,7 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \ scripts/show_delta \ scripts/diffconfig \ scripts/bloat-o-meter \ + scripts/jobserver-exec \ tools/perf/tests/attr.py \ tools/perf/scripts/python/stat-cpi.py \ tools/perf/scripts/python/sched-migration.py \ @@ -2515,6 +2513,9 @@ fi # # %changelog +* Tue Dec 03 2019 Justin M. Forbes - 5.5.0-0.rc0.git4.1 +- Linux v5.4-11180-g76bb8b05960c + * Mon Dec 02 2019 Justin M. Forbes - 5.5.0-0.rc0.git3.1 - Linux v5.4-10271-g596cf45cbf6e diff --git a/scsi-bfa-release-allocated-memory-in-case-of-error.patch b/scsi-bfa-release-allocated-memory-in-case-of-error.patch deleted file mode 100644 index 6bbf61364..000000000 --- a/scsi-bfa-release-allocated-memory-in-case-of-error.patch +++ /dev/null @@ -1,105 +0,0 @@ -From mboxrd@z Thu Jan 1 00:00:00 1970 -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on - aws-us-west-2-korg-lkml-1.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, - DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, - HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, - SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable - autolearn_force=no version=3.4.0 -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 91A3BC49ED7 - for ; Tue, 10 Sep 2019 23:44:32 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 695AB216F4 - for ; Tue, 10 Sep 2019 23:44:32 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="agIEQzR/" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726192AbfIJXo2 (ORCPT ); - Tue, 10 Sep 2019 19:44:28 -0400 -Received: from mail-io1-f68.google.com ([209.85.166.68]:47033 "EHLO - mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1725876AbfIJXo2 (ORCPT - ); Tue, 10 Sep 2019 19:44:28 -0400 -Received: by mail-io1-f68.google.com with SMTP id d17so19749943ios.13; - Tue, 10 Sep 2019 16:44:28 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id; - bh=ZGP+PYUf116KpmFZWCQJ/+W1BpD8OneYbmbPw8KI1DY=; - b=agIEQzR/UIcZsX92ydKv9iYSTD0wKkF0DCdfCvbuRl+mJRlsmk4xv6oXdAgiahYN66 - Y4Q1c3uqGfdg1IWTY8T5VS2bzEO4YTifAiDII2S1ZWE4qCq8jQdhAiMYFsy8Ny7SDa1i - RXfYurzoCzrqs+1B+eQquaIosJ9qTs67bacbWDhEbp+bhuDtAJoSJ2fs0ADFREjunWBy - UiNXq4j/j6LSfUZc7/Al3xGpHnxht5yshuaAEMNrtlbZPVklWY2XcluBTm1eBpVv4pNu - 6n0+q3EwwYu6YMWPprH1JbHi2Uu9ZaR2Jluku1++jFb128U92+e23LofkhY5gkwB7hwY - Liug== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=ZGP+PYUf116KpmFZWCQJ/+W1BpD8OneYbmbPw8KI1DY=; - b=Vn2eF6QjqBqKG9rCWyHMzAcWxAyjzqoNnmTtmP1drV/AtPZojXG21vO6Yrnrd0w3PE - D6Ej3hyD9banePwuxeoxD9PJaOZhH6vDSisM4T6cdycmHACIq7Q4y0wNLMJHmBpfx92C - WnE4PkQBXz9XrBkbHT0/qI0csFhmBgKD4B+pbnRSAiIqSIt4WSSTwSpLo/TOL7Ub4fTj - pzgVYex3XzJEdoPo2wADo0RBjCbf+JqPDME58Yub8LpfLVerY/I/+jo838cdS9dbfHcN - cD1eu4BYssjD887++aPPqQnIKLOMNl4pra1065KqKPtIfrEB1T9nwAqxbcC8/weZWeAn - MbFA== -X-Gm-Message-State: APjAAAVbAnon8+4rQ6lpU3M2lHtSY87bZtAXd06oMDim1otUrO2FXd8d - LBElDhZf0bU+XXNO4CU1XdQ= -X-Google-Smtp-Source: APXvYqzpHFPcs8wqSh6UDjLhtAgV9r92A+H6PKQaASa8MTnRPf9hCZWEZ/wN9o/vH1jWAEJYkcaPtA== -X-Received: by 2002:a6b:b714:: with SMTP id h20mr37211941iof.302.1568159067609; - Tue, 10 Sep 2019 16:44:27 -0700 (PDT) -Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) - by smtp.googlemail.com with ESMTPSA id z20sm19383990iof.38.2019.09.10.16.44.26 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Tue, 10 Sep 2019 16:44:27 -0700 (PDT) -From: Navid Emamdoost -Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu, - Navid Emamdoost , - Anil Gurumurthy , - Sudarsana Kalluru , - "James E.J. Bottomley" , - "Martin K. Petersen" , - linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH] scsi: bfa: release allocated memory in case of error -Date: Tue, 10 Sep 2019 18:44:15 -0500 -Message-Id: <20190910234417.22151-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -To: unlisted-recipients:; (no To-header on input) -Sender: linux-scsi-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-scsi@vger.kernel.org -Archived-At: -List-Archive: -List-Post: - -In bfad_im_get_stats if bfa_port_get_stats fails, allocated memory -needs to be released. - -Signed-off-by: Navid Emamdoost ---- - drivers/scsi/bfa/bfad_attr.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c -index 29ab81df75c0..fbfce02e5b93 100644 ---- a/drivers/scsi/bfa/bfad_attr.c -+++ b/drivers/scsi/bfa/bfad_attr.c -@@ -275,8 +275,10 @@ bfad_im_get_stats(struct Scsi_Host *shost) - rc = bfa_port_get_stats(BFA_FCPORT(&bfad->bfa), - fcstats, bfad_hcb_comp, &fcomp); - spin_unlock_irqrestore(&bfad->bfad_lock, flags); -- if (rc != BFA_STATUS_OK) -+ if (rc != BFA_STATUS_OK) { -+ kfree(fcstats); - return NULL; -+ } - - wait_for_completion(&fcomp.comp); - --- -2.17.1 - - diff --git a/sources b/sources index 387acb72e..cdac6201c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.4-git3.xz) = 45550315f59760dfefc989682dbbec92a672b7ee8cc4bfda11f1ad5eb01a83f6401dd2dd172e3e13cac87d8a5b52e268b861ff0fcff8d0d89ed0a9fbafa4c600 +SHA512 (patch-5.4-git4.xz) = 1a2cc622f7b11a644df853b786c7a929030a47d941c06c5290b4478e05553a11a25dba3c783ee1c93b6f0a7c83f22972175cfd589d9e8e712eb75f729e0a5927