summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-07-12 15:15:41 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-07-12 15:15:41 +0200
commit31a291653a8222da7dd2f25077552b273c4d87f2 (patch)
treeaf0a8ad0839bbc579a6a9cdd5ed9a8112a717d74
parent3cdbb27722270953aa437a93cda98ea7099721dd (diff)
parent46f3e4dbcbf03aedad83694a45fc32a85ef4db17 (diff)
downloadkernel-31a291653a8222da7dd2f25077552b273c4d87f2.tar.gz
kernel-31a291653a8222da7dd2f25077552b273c4d87f2.tar.xz
kernel-31a291653a8222da7dd2f25077552b273c4d87f2.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch1002
-rw-r--r--arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch83
-rw-r--r--bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch185
-rw-r--r--bcm2835-vchiq-use-interruptible-waits.patch1133
-rw-r--r--configs/fedora/generic/CONFIG_ADF43711
-rw-r--r--configs/fedora/generic/CONFIG_ASIX_PHY1
-rw-r--r--configs/fedora/generic/CONFIG_BT_HCIBTUSB_MTK1
-rw-r--r--configs/fedora/generic/CONFIG_CROS_EC_ISHTP1
-rw-r--r--configs/fedora/generic/CONFIG_DPS3101
-rw-r--r--configs/fedora/generic/CONFIG_EXTCON_FSA94801
-rw-r--r--configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING1
-rw-r--r--configs/fedora/generic/CONFIG_GVE1
-rw-r--r--configs/fedora/generic/CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE1
-rw-r--r--configs/fedora/generic/CONFIG_NET_ACT_CT1
-rw-r--r--configs/fedora/generic/CONFIG_NET_ACT_CTINFO1
-rw-r--r--configs/fedora/generic/CONFIG_NET_ACT_MPLS1
-rw-r--r--configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM1
-rw-r--r--configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_SPI1
-rw-r--r--configs/fedora/generic/CONFIG_NET_VENDOR_GOOGLE1
-rw-r--r--configs/fedora/generic/CONFIG_NFT_BRIDGE_META1
-rw-r--r--configs/fedora/generic/CONFIG_NFT_SYNPROXY1
-rw-r--r--configs/fedora/generic/CONFIG_NF_CONNTRACK_BRIDGE1
-rw-r--r--configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU1
-rw-r--r--configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR1
-rw-r--r--configs/fedora/generic/CONFIG_NXP_TJA11XX_PHY1
-rw-r--r--configs/fedora/generic/CONFIG_PHY_MIXEL_MIPI_DPHY1
-rw-r--r--configs/fedora/generic/CONFIG_PHY_QCOM_PCIE21
-rw-r--r--configs/fedora/generic/CONFIG_SCSI_FDOMAIN_PCI1
-rw-r--r--configs/fedora/generic/CONFIG_SENSORS_IRPS54011
-rw-r--r--configs/fedora/generic/CONFIG_SENSORS_PXE16101
-rw-r--r--configs/fedora/generic/CONFIG_STMMAC_SELFTESTS1
-rw-r--r--configs/fedora/generic/CONFIG_TEST_BLACKHOLE_DEV1
-rw-r--r--configs/fedora/generic/CONFIG_XILINX_AXI_EMAC1
-rw-r--r--configs/fedora/generic/CONFIG_XILINX_SDFEC1
-rw-r--r--configs/fedora/generic/CONFIG_XILINX_XADC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_64BIT1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_XILINX (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX)0
-rw-r--r--configs/fedora/generic/s390x/CONFIG_64BIT1
-rw-r--r--configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_WILCO_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_WILCO_EC_DEBUGFS1
-rw-r--r--configs/fedora/generic/x86/CONFIG_WILCO_EC_EVENTS1
-rw-r--r--configs/fedora/generic/x86/CONFIG_WILCO_EC_TELEMETRY1
-rw-r--r--configs/fedora/generic/x86/i686/CONFIG_64BIT1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_64BIT1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config32
-rw-r--r--kernel-aarch64.config32
-rw-r--r--kernel-armv7hl-debug.config29
-rw-r--r--kernel-armv7hl-lpae-debug.config32
-rw-r--r--kernel-armv7hl-lpae.config32
-rw-r--r--kernel-armv7hl.config29
-rw-r--r--kernel-i686-debug.config37
-rw-r--r--kernel-i686.config37
-rw-r--r--kernel-ppc64le-debug.config31
-rw-r--r--kernel-ppc64le.config31
-rw-r--r--kernel-s390x-debug.config32
-rw-r--r--kernel-s390x.config32
-rw-r--r--kernel-x86_64-debug.config37
-rw-r--r--kernel-x86_64.config37
-rw-r--r--kernel.spec11
-rw-r--r--sources2
62 files changed, 479 insertions, 2439 deletions
diff --git a/arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch b/arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch
deleted file mode 100644
index ece8d7af4..000000000
--- a/arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-From patchwork Mon Jun 17 12:51:02 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Lee Jones <lee.jones@linaro.org>
-X-Patchwork-Id: 10999157
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7F1314BB
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:26 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8630286B3
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:26 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id A691B286B8; Mon, 17 Jun 2019 12:51:26 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0AC2128910
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:25 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
- List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
- In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
- Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
- :Resent-Message-ID:List-Owner;
- bh=hzd/ICcUtJ+qnY0TkQdQ/iqHchKimp0FpVwcGtPGgc4=; b=gs1Cboo2h8ZzR/erqYcUplo5Zl
- kriLADbQY4FHKFwsCNhA8pnzI2v6O+vkVQvT8LacdXPkoTeBZ+HbujdKRUkqmjKPMYtG0Q3onvHQc
- XcSThhrpJSJbDPR+e4SsBF5KOuTrXtDCUy4TIHAXVOQKow1tnieYvX17S9R5eZ96zdiG5mphR24fC
- IQRF58TLVlspAu6KbO4vGgvef7A+R7rld5MmyzefOvmg5X1OAmBHLaI0Ifg0fpc2ihfyeQgjQaF9H
- Sl4mE20tulm2qqwgB4o2Lu6EvLVO1OqwBZbV62O8lkUZQhB6YYo2tqAX6GaBkNEkADEhAxsYEiO7i
- +T+ewIAw==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6a-0004ri-Gm; Mon, 17 Jun 2019 12:51:24 +0000
-Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444])
- by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6N-0004gG-5m
- for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 12:51:12 +0000
-Received: by mail-wr1-x444.google.com with SMTP id f9so9772453wre.12
- for <linux-arm-kernel@lists.infradead.org>;
- Mon, 17 Jun 2019 05:51:10 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
- h=from:to:cc:subject:date:message-id:in-reply-to:references;
- bh=2zuxNNJ4iuFL5CUgXXBK/C8GK/Wfm+gcHDg2NkvAFB8=;
- b=q+s/96q0GvL81bpISKq1BYq2qgGMpiINLYY94rSfeJIBgtJ0JASEtiXtDPecNFmtZL
- IVM+FA8aky8PBmnMLL4+Kt0aJ3tCYdUb9UEdfNN6lMqZIm32xgDsGAGZEN75E5BGglZ5
- O0qHpPxDxjps+O6mgY7ewWjzgrArHawuVqm5pgALhFmzbvj/vTigwdNoWTRq+QYjzbQW
- X4PP0kzs+r42vn1y/uQP2HCx+p4e6qaylctjsm4b3GGzN1UOWC+lSwN5UNNB59hZ9phn
- mt8/uuVdLmFh2bLj3JPXGKXcTYEITepZw7iCLKx8El0VEXOnDiwDYGwUZY8bVg2fGUtk
- a2Ig==
-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:in-reply-to
- :references;
- bh=2zuxNNJ4iuFL5CUgXXBK/C8GK/Wfm+gcHDg2NkvAFB8=;
- b=oEWv7zocZKRfTgHf4lf/nnyVbj27HULH3eZBiAvukYZEy5p/04tKCn2xcjT0OupDq1
- JtpVjK45a/MT9EP3Q/pSczzpTAIukOZW8LSC0ZXb4h4JQBT/ujIaD6DvM2wwlDk1WJeh
- hkzOO9qchV2sFB+hwWHCmWYkYfZ8ho6MPHJTnBG50J4aG03XZf8/wecsAZ3u97yuREXb
- qgUDKvDB5WfS+Zu6k0IsITnMONtutyCaWI1xZ1I7tuVxYkROxaUG9L7ihFnaZL74UCuB
- C+Hc6U8HY+y/m86LFHP76m6tpOxuUfZARSlzOkmGi/4QPMReV54qtbTGEX2NeRxAPd1d
- OIDA==
-X-Gm-Message-State: APjAAAU8mxXZGAfxADTLzRLiH5CIXMt9t7Nr3DoYsZO8CGVoMOXu7BYs
- OGDCo19OAKar6a7vPcigSgL5yA==
-X-Google-Smtp-Source:
- APXvYqxQmsT3xz0CBZrCiSA472UgfglVRfGZm5u9OAQIPSBLxsX3r/VA44xZ+WxLMb03U8CAncn0Ag==
-X-Received: by 2002:a5d:6050:: with SMTP id j16mr6799737wrt.20.1560775869586;
- Mon, 17 Jun 2019 05:51:09 -0700 (PDT)
-Received: from dell.watershed.co.uk ([2.27.35.243])
- by smtp.gmail.com with ESMTPSA id o11sm10477852wmh.37.2019.06.17.05.51.08
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Mon, 17 Jun 2019 05:51:09 -0700 (PDT)
-From: Lee Jones <lee.jones@linaro.org>
-To: alokc@codeaurora.org, agross@kernel.org, david.brown@linaro.org,
- bjorn.andersson@linaro.org, balbi@kernel.org, gregkh@linuxfoundation.org,
- ard.biesheuvel@linaro.org, jlhugo@gmail.com, linux-arm-msm@vger.kernel.org,
- linux-usb@vger.kernel.org, felipe.balbi@linux.intel.com
-Subject: [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI
-Date: Mon, 17 Jun 2019 13:51:02 +0100
-Message-Id: <20190617125105.6186-2-lee.jones@linaro.org>
-X-Mailer: git-send-email 2.17.1
-In-Reply-To: <20190617125105.6186-1-lee.jones@linaro.org>
-References: <20190617125105.6186-1-lee.jones@linaro.org>
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190617_055111_214407_390679F0
-X-CRM114-Status: GOOD ( 13.52 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: Lee Jones <lee.jones@linaro.org>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-When booting with ACPI as the active set of configuration tables,
-all; clocks, regulators, pin functions ect are expected to be at
-their ideal values/levels/rates, thus the associated frameworks
-are unavailable. Ensure calls to these APIs are shielded when
-ACPI is enabled.
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
----
- drivers/soc/qcom/qcom-geni-se.c | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
-index 6b8ef01472e9..d5cf953b4337 100644
---- a/drivers/soc/qcom/qcom-geni-se.c
-+++ b/drivers/soc/qcom/qcom-geni-se.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0
- // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
-
-+#include <linux/acpi.h>
- #include <linux/clk.h>
- #include <linux/slab.h>
- #include <linux/dma-mapping.h>
-@@ -450,6 +451,9 @@ int geni_se_resources_off(struct geni_se *se)
- {
- int ret;
-
-+ if (has_acpi_companion(se->dev))
-+ return 0;
-+
- ret = pinctrl_pm_select_sleep_state(se->dev);
- if (ret)
- return ret;
-@@ -487,6 +491,9 @@ int geni_se_resources_on(struct geni_se *se)
- {
- int ret;
-
-+ if (has_acpi_companion(se->dev))
-+ return 0;
-+
- ret = geni_se_clks_on(se);
- if (ret)
- return ret;
-@@ -724,12 +731,14 @@ static int geni_se_probe(struct platform_device *pdev)
- if (IS_ERR(wrapper->base))
- return PTR_ERR(wrapper->base);
-
-- wrapper->ahb_clks[0].id = "m-ahb";
-- wrapper->ahb_clks[1].id = "s-ahb";
-- ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
-- if (ret) {
-- dev_err(dev, "Err getting AHB clks %d\n", ret);
-- return ret;
-+ if (!has_acpi_companion(&pdev->dev)) {
-+ wrapper->ahb_clks[0].id = "m-ahb";
-+ wrapper->ahb_clks[1].id = "s-ahb";
-+ ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
-+ if (ret) {
-+ dev_err(dev, "Err getting AHB clks %d\n", ret);
-+ return ret;
-+ }
- }
-
- dev_set_drvdata(dev, wrapper);
-
-From patchwork Mon Jun 17 12:51:03 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Lee Jones <lee.jones@linaro.org>
-X-Patchwork-Id: 10999167
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1A4214BB
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:48 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D06A5286E6
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:48 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id C4C772871F; Mon, 17 Jun 2019 12:51:48 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable
- version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3C9228606
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:51:47 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
- List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
- In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
- Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
- :Resent-Message-ID:List-Owner;
- bh=eqPeWeTSDW4tiMKnyJbFGfuUug/NP8BBhk/eXQMhuTs=; b=I7CwybOukEfOb8t13TjIrgAV4y
- 4tH7lG3nM0NXHmiucaIDp4bKD5ly5m7WWzGSIEkg7/U4+EQjpiVd+H3sSH5wmvTRJ/y5J8eRrbiIg
- DBauCWtmaNnCtHgysxinvyab3cb0ZdRkIKojvbFM9/rA7CNIN22US4++LPC5rDg2FcGknTRyIFaiG
- rdLXD9yxEYf7K9xhxwIegcc6Zn2ZUOrjzYBt6+fxj85Gx0TWgBdfAGZFl8r+AF8HCXWaNiZjUQlav
- eZlT6gbr5k/zdCU9/en4cY4fFIdULxg/C5EOMbqV+T9ce52uMt6YrMIeQ+3asgZROgxfua0gGWZ5V
- cQOaQgWQ==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6w-0005AV-Te; Mon, 17 Jun 2019 12:51:46 +0000
-Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441])
- by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6O-0004gf-45
- for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 12:51:13 +0000
-Received: by mail-wr1-x441.google.com with SMTP id f9so9772521wre.12
- for <linux-arm-kernel@lists.infradead.org>;
- Mon, 17 Jun 2019 05:51:11 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
- h=from:to:cc:subject:date:message-id:in-reply-to:references;
- bh=ZYares2Zb0CMG5aj1Aq17AxyznnInv9luLnQDrDhVlk=;
- b=r5dCfxbvH3U5b5C4s33cPxDL1vD/tiW6V96ulvZngp0n/hqT3oktaEclOpyvDC+R58
- SUfga9aWqbblZtMjr1jj22q46oZc0+qKFJJy1aIwr4ioiZXw8JKRWjnzTglMlhSmvRNj
- FVCMZY11tsUacCETtgDReiUPN8Om7954wN6SXEkjDtExGnUmuVdTekdpD4US9VRnT5QK
- i9DLIIfQpyKMQ7VZs5zCI/sBlpMqVBcEZB+9OtVbGIefAMiOnHCEX5mS3c7uu2R1dWb5
- ggotZKzJpFMA5Mmyzcjj0yPYPWAlMpFx7OZ+P1ZMGP9dwu1u4tj4YPT/IVry3dFV/Yv8
- YuZQ==
-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:in-reply-to
- :references;
- bh=ZYares2Zb0CMG5aj1Aq17AxyznnInv9luLnQDrDhVlk=;
- b=PNg7mntx38NTDxi7cw63EQergFuUJW0s/McRf3KqBgZn60Dr6RjLQ9Pr+hTVheXOj1
- Yx2COODJLvl0fBxu1/yBZkuPtXxp2p+ASg4+MbAMMcyrkvgpQ6BId0qMtAX6yTIx0Bll
- sggfQhYcHrGp8EfLBW2RQws5V9Emp2WzZtyjNXzOD4DpDKV3YAI+j4sHusXrwa5xEu2N
- eGDXG2Mt/icgywLN3k97OmLea06sFRlYf7KYZRxcfE2R6GP522NSHZzNYoJkqgZsBi3Z
- 2TdYKdw0o9cJHRI2OiapUQ08YLIv0BSmAJaVSPbxEjqa/tn57ty3h+ni5R4lbPEwaGAi
- pZog==
-X-Gm-Message-State: APjAAAVU7/rtL+UwLWfEM6vsQiiKLK8VD/zwoFn1P33esVlYh5EU2pqr
- reXEg1fc4ji+BKvEjq+M3I+eFA==
-X-Google-Smtp-Source:
- APXvYqw4tU4zKvNxRkTtQHBbmrMwW6oDHDoXraOjSJrJg7Vgc+uuvKDECbAHi2x2yB80DzNCJv6ODQ==
-X-Received: by 2002:a5d:5386:: with SMTP id d6mr24077969wrv.207.1560775870686;
- Mon, 17 Jun 2019 05:51:10 -0700 (PDT)
-Received: from dell.watershed.co.uk ([2.27.35.243])
- by smtp.gmail.com with ESMTPSA id o11sm10477852wmh.37.2019.06.17.05.51.09
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Mon, 17 Jun 2019 05:51:10 -0700 (PDT)
-From: Lee Jones <lee.jones@linaro.org>
-To: alokc@codeaurora.org, agross@kernel.org, david.brown@linaro.org,
- bjorn.andersson@linaro.org, balbi@kernel.org, gregkh@linuxfoundation.org,
- ard.biesheuvel@linaro.org, jlhugo@gmail.com, linux-arm-msm@vger.kernel.org,
- linux-usb@vger.kernel.org, felipe.balbi@linux.intel.com
-Subject: [RESEND v4 2/4] usb: dwc3: qcom: Add support for booting with ACPI
-Date: Mon, 17 Jun 2019 13:51:03 +0100
-Message-Id: <20190617125105.6186-3-lee.jones@linaro.org>
-X-Mailer: git-send-email 2.17.1
-In-Reply-To: <20190617125105.6186-1-lee.jones@linaro.org>
-References: <20190617125105.6186-1-lee.jones@linaro.org>
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190617_055112_164384_7E92DD4C
-X-CRM114-Status: GOOD ( 21.26 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: Lee Jones <lee.jones@linaro.org>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-In Linux, the DWC3 core exists as its own independent platform device.
-Thus when describing relationships in Device Tree, the current default
-boot configuration table option, the DWC3 core often resides as a child
-of the platform specific node. Both of which are given their own
-address space descriptions and the drivers can be mostly agnostic to
-each other.
-
-However, other Operating Systems have taken a more monolithic approach,
-which is evident in the configuration ACPI tables for the Qualcomm
-Snapdragon SDM850, where all DWC3 (core and platform) components are
-described under a single IO memory region.
-
-To ensure successful booting using the supplied ACPI tables, we need to
-devise a way to chop up the address regions provided and subsequently
-register the DWC3 core with the resultant information, which is
-precisely what this patch aims to achieve.
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
----
- drivers/usb/dwc3/Kconfig | 2 +-
- drivers/usb/dwc3/dwc3-qcom.c | 206 ++++++++++++++++++++++++++++++-----
- 2 files changed, 179 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
-index 4a62045cc812..89abc6078703 100644
---- a/drivers/usb/dwc3/Kconfig
-+++ b/drivers/usb/dwc3/Kconfig
-@@ -128,7 +128,7 @@ config USB_DWC3_QCOM
- tristate "Qualcomm Platform"
- depends on ARCH_QCOM || COMPILE_TEST
- depends on EXTCON || !EXTCON
-- depends on OF
-+ depends on (OF || ACPI)
- default USB_DWC3
- help
- Some Qualcomm SoCs use DesignWare Core IP for USB2/3
-diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
-index 184df4daa590..0cb63f6c92d9 100644
---- a/drivers/usb/dwc3/dwc3-qcom.c
-+++ b/drivers/usb/dwc3/dwc3-qcom.c
-@@ -4,6 +4,7 @@
- * Inspired by dwc3-of-simple.c
- */
-
-+#include <linux/acpi.h>
- #include <linux/io.h>
- #include <linux/of.h>
- #include <linux/clk.h>
-@@ -38,6 +39,20 @@
- #define PWR_EVNT_LPM_IN_L2_MASK BIT(4)
- #define PWR_EVNT_LPM_OUT_L2_MASK BIT(5)
-
-+#define SDM845_QSCRATCH_BASE_OFFSET 0xf8800
-+#define SDM845_QSCRATCH_SIZE 0x400
-+#define SDM845_DWC3_CORE_SIZE 0xcd00
-+
-+struct dwc3_acpi_pdata {
-+ u32 qscratch_base_offset;
-+ u32 qscratch_base_size;
-+ u32 dwc3_core_base_size;
-+ int hs_phy_irq_index;
-+ int dp_hs_phy_irq_index;
-+ int dm_hs_phy_irq_index;
-+ int ss_phy_irq_index;
-+};
-+
- struct dwc3_qcom {
- struct device *dev;
- void __iomem *qscratch_base;
-@@ -56,6 +71,8 @@ struct dwc3_qcom {
- struct notifier_block vbus_nb;
- struct notifier_block host_nb;
-
-+ const struct dwc3_acpi_pdata *acpi_pdata;
-+
- enum usb_dr_mode mode;
- bool is_suspended;
- bool pm_suspended;
-@@ -300,12 +317,27 @@ static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom)
- PIPE_UTMI_CLK_DIS);
- }
-
-+static int dwc3_qcom_get_irq(struct platform_device *pdev,
-+ const char *name, int num)
-+{
-+ struct device_node *np = pdev->dev.of_node;
-+ int ret;
-+
-+ if (np)
-+ ret = platform_get_irq_byname(pdev, name);
-+ else
-+ ret = platform_get_irq(pdev, num);
-+
-+ return ret;
-+}
-+
- static int dwc3_qcom_setup_irq(struct platform_device *pdev)
- {
- struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-+ const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata;
- int irq, ret;
--
-- irq = platform_get_irq_byname(pdev, "hs_phy_irq");
-+ irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq",
-+ pdata ? pdata->hs_phy_irq_index : -1);
- if (irq > 0) {
- /* Keep wakeup interrupts disabled until suspend */
- irq_set_status_flags(irq, IRQ_NOAUTOEN);
-@@ -320,7 +352,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
- qcom->hs_phy_irq = irq;
- }
-
-- irq = platform_get_irq_byname(pdev, "dp_hs_phy_irq");
-+ irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq",
-+ pdata ? pdata->dp_hs_phy_irq_index : -1);
- if (irq > 0) {
- irq_set_status_flags(irq, IRQ_NOAUTOEN);
- ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
-@@ -334,7 +367,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
- qcom->dp_hs_phy_irq = irq;
- }
-
-- irq = platform_get_irq_byname(pdev, "dm_hs_phy_irq");
-+ irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq",
-+ pdata ? pdata->dm_hs_phy_irq_index : -1);
- if (irq > 0) {
- irq_set_status_flags(irq, IRQ_NOAUTOEN);
- ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
-@@ -348,7 +382,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
- qcom->dm_hs_phy_irq = irq;
- }
-
-- irq = platform_get_irq_byname(pdev, "ss_phy_irq");
-+ irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq",
-+ pdata ? pdata->ss_phy_irq_index : -1);
- if (irq > 0) {
- irq_set_status_flags(irq, IRQ_NOAUTOEN);
- ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
-@@ -371,11 +406,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
- struct device_node *np = dev->of_node;
- int i;
-
-- qcom->num_clocks = count;
--
-- if (!count)
-+ if (!np || !count)
- return 0;
-
-+ qcom->num_clocks = count;
-+
- qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
- sizeof(struct clk *), GFP_KERNEL);
- if (!qcom->clks)
-@@ -409,12 +444,103 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
- return 0;
- }
-
--static int dwc3_qcom_probe(struct platform_device *pdev)
-+static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
- {
-+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-+ struct device *dev = &pdev->dev;
-+ struct resource *res, *child_res = NULL;
-+ int irq;
-+ int ret;
-+
-+ qcom->dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
-+ if (!qcom->dwc3)
-+ return -ENOMEM;
-+
-+ qcom->dwc3->dev.parent = dev;
-+ qcom->dwc3->dev.type = dev->type;
-+ qcom->dwc3->dev.dma_mask = dev->dma_mask;
-+ qcom->dwc3->dev.dma_parms = dev->dma_parms;
-+ qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
-+
-+ child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
-+ if (!child_res)
-+ return -ENOMEM;
-+
-+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+ if (!res) {
-+ dev_err(&pdev->dev, "failed to get memory resource\n");
-+ ret = -ENODEV;
-+ goto out;
-+ }
-+
-+ child_res[0].flags = res->flags;
-+ child_res[0].start = res->start;
-+ child_res[0].end = child_res[0].start +
-+ qcom->acpi_pdata->dwc3_core_base_size;
-+
-+ irq = platform_get_irq(pdev, 0);
-+ child_res[1].flags = IORESOURCE_IRQ;
-+ child_res[1].start = child_res[1].end = irq;
-+
-+ ret = platform_device_add_resources(qcom->dwc3, child_res, 2);
-+ if (ret) {
-+ dev_err(&pdev->dev, "failed to add resources\n");
-+ goto out;
-+ }
-+
-+ ret = platform_device_add(qcom->dwc3);
-+ if (ret)
-+ dev_err(&pdev->dev, "failed to add device\n");
-+
-+out:
-+ kfree(child_res);
-+ return ret;
-+}
-+
-+static int dwc3_qcom_of_register_core(struct platform_device *pdev)
-+{
-+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
- struct device_node *np = pdev->dev.of_node, *dwc3_np;
- struct device *dev = &pdev->dev;
-+ int ret;
-+
-+ dwc3_np = of_get_child_by_name(np, "dwc3");
-+ if (!dwc3_np) {
-+ dev_err(dev, "failed to find dwc3 core child\n");
-+ return -ENODEV;
-+ }
-+
-+ ret = of_platform_populate(np, NULL, NULL, dev);
-+ if (ret) {
-+ dev_err(dev, "failed to register dwc3 core - %d\n", ret);
-+ return ret;
-+ }
-+
-+ qcom->dwc3 = of_find_device_by_node(dwc3_np);
-+ if (!qcom->dwc3) {
-+ dev_err(dev, "failed to get dwc3 platform device\n");
-+ return -ENODEV;
-+ }
-+
-+ return 0;
-+}
-+
-+static const struct dwc3_acpi_pdata sdm845_acpi_pdata = {
-+ .qscratch_base_offset = SDM845_QSCRATCH_BASE_OFFSET,
-+ .qscratch_base_size = SDM845_QSCRATCH_SIZE,
-+ .dwc3_core_base_size = SDM845_DWC3_CORE_SIZE,
-+ .hs_phy_irq_index = 1,
-+ .dp_hs_phy_irq_index = 4,
-+ .dm_hs_phy_irq_index = 3,
-+ .ss_phy_irq_index = 2
-+};
-+
-+static int dwc3_qcom_probe(struct platform_device *pdev)
-+{
-+ struct device_node *np = pdev->dev.of_node;
-+ struct device *dev = &pdev->dev;
- struct dwc3_qcom *qcom;
-- struct resource *res;
-+ struct resource *res, *parent_res = NULL;
- int ret, i;
- bool ignore_pipe_clk;
-
-@@ -425,6 +551,14 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
- platform_set_drvdata(pdev, qcom);
- qcom->dev = &pdev->dev;
-
-+ if (has_acpi_companion(dev)) {
-+ qcom->acpi_pdata = acpi_device_get_match_data(dev);
-+ if (!qcom->acpi_pdata) {
-+ dev_err(&pdev->dev, "no supporting ACPI device data\n");
-+ return -EINVAL;
-+ }
-+ }
-+
- qcom->resets = devm_reset_control_array_get_optional_exclusive(dev);
- if (IS_ERR(qcom->resets)) {
- ret = PTR_ERR(qcom->resets);
-@@ -454,7 +588,21 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
- }
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- qcom->qscratch_base = devm_ioremap_resource(dev, res);
-+
-+ if (np) {
-+ parent_res = res;
-+ } else {
-+ parent_res = kmemdup(res, sizeof(struct resource), GFP_KERNEL);
-+ if (!parent_res)
-+ return -ENOMEM;
-+
-+ parent_res->start = res->start +
-+ qcom->acpi_pdata->qscratch_base_offset;
-+ parent_res->end = parent_res->start +
-+ qcom->acpi_pdata->qscratch_base_size;
-+ }
-+
-+ qcom->qscratch_base = devm_ioremap_resource(dev, parent_res);
- if (IS_ERR(qcom->qscratch_base)) {
- dev_err(dev, "failed to map qscratch, err=%d\n", ret);
- ret = PTR_ERR(qcom->qscratch_base);
-@@ -462,13 +610,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
- }
-
- ret = dwc3_qcom_setup_irq(pdev);
-- if (ret)
-- goto clk_disable;
--
-- dwc3_np = of_get_child_by_name(np, "dwc3");
-- if (!dwc3_np) {
-- dev_err(dev, "failed to find dwc3 core child\n");
-- ret = -ENODEV;
-+ if (ret) {
-+ dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
- goto clk_disable;
- }
-
-@@ -481,16 +624,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
- if (ignore_pipe_clk)
- dwc3_qcom_select_utmi_clk(qcom);
-
-- ret = of_platform_populate(np, NULL, NULL, dev);
-- if (ret) {
-- dev_err(dev, "failed to register dwc3 core - %d\n", ret);
-- goto clk_disable;
-- }
-+ if (np)
-+ ret = dwc3_qcom_of_register_core(pdev);
-+ else
-+ ret = dwc3_qcom_acpi_register_core(pdev);
-
-- qcom->dwc3 = of_find_device_by_node(dwc3_np);
-- if (!qcom->dwc3) {
-- dev_err(&pdev->dev, "failed to get dwc3 platform device\n");
-- ret = -ENODEV;
-+ if (ret) {
-+ dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
- goto depopulate;
- }
-
-@@ -514,7 +654,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
- return 0;
-
- depopulate:
-- of_platform_depopulate(&pdev->dev);
-+ if (np)
-+ of_platform_depopulate(&pdev->dev);
-+ else
-+ platform_device_put(pdev);
- clk_disable:
- for (i = qcom->num_clocks - 1; i >= 0; i--) {
- clk_disable_unprepare(qcom->clks[i]);
-@@ -601,6 +744,12 @@ static const struct of_device_id dwc3_qcom_of_match[] = {
- };
- MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
-
-+static const struct acpi_device_id dwc3_qcom_acpi_match[] = {
-+ { "QCOM2430", (unsigned long)&sdm845_acpi_pdata },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
-+
- static struct platform_driver dwc3_qcom_driver = {
- .probe = dwc3_qcom_probe,
- .remove = dwc3_qcom_remove,
-@@ -608,6 +757,7 @@ static struct platform_driver dwc3_qcom_driver = {
- .name = "dwc3-qcom",
- .pm = &dwc3_qcom_dev_pm_ops,
- .of_match_table = dwc3_qcom_of_match,
-+ .acpi_match_table = ACPI_PTR(dwc3_qcom_acpi_match),
- },
- };
-
-
-From patchwork Mon Jun 17 12:51:04 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Lee Jones <lee.jones@linaro.org>
-X-Patchwork-Id: 10999169
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59E436C5
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:08 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49F6328720
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:08 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id 484D828732; Mon, 17 Jun 2019 12:52:08 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable
- version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B78822890E
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:07 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
- List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
- In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
- Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
- :Resent-Message-ID:List-Owner;
- bh=1QkFuxjOpyjnOEy2zHsXiVzRtFfJL6FqwyIAZ/9Gut4=; b=YA60sPqjbq2iXlOMXN9dmLURcq
- Iz4na+d1NKhZtuP2CUDdAaStGbSSjVhK/os6IjlrZc7p41R8M579EqZ0HVEK4qz82WE/sZ1N8aCZx
- Ruo85uuR/oV66KjW9Hv4ZEVoyqvrAwW0icnAN0s120v2oKHZOp4ALV0ZmFH3qplK8XWT0lEYbYhht
- YKnq8wuLXiUk8EOTPK53ZAz9Ng8HO6EwyiWt+Et7LBSGHdJu0mTcXlCu2IZu8ojX8mDLaq+gbOdkV
- RSimIoT8eRaC2kw3zEucerZPiH2j1UuTnfkZ1FKC6k/Y8Z/Xsdudz2ZZiRzFIk1huxmS8WpD+W/Fk
- j6DSjSxQ==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr79-0005Pa-Na; Mon, 17 Jun 2019 12:51:59 +0000
-Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441])
- by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6O-0004gy-U8
- for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 12:51:14 +0000
-Received: by mail-wr1-x441.google.com with SMTP id x4so9820359wrt.6
- for <linux-arm-kernel@lists.infradead.org>;
- Mon, 17 Jun 2019 05:51:12 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
- h=from:to:cc:subject:date:message-id:in-reply-to:references;
- bh=2C6MxhIF9Gjdvx3J9DYd/48/Suqux1auzpg7O20+XA4=;
- b=MHuiL6Hd66D8KM0jn4ls2iBDOBivmXgGCkd0bRuw3BVISYThbeIBV65YPTVnC9S5pN
- 8kwD7l1LeRLhShtYuu/Ido0JQEJeak94CdUos+d7lXijbpc7lq70fcnle30NFz0tcJIj
- fAbhj9eIhnoDKlZtfNVWfkzOAx8xp0EuIZ9g38860fnnolOIibyFhNmFCQEOV3JsQtou
- UjFRWCn0iZbk4TdcLNFh4kMAKOur21h0NofVuZCw5wYBD3SEo5yr15DOn4ZrA5obTtoT
- wSTQGINMn3kmRWVRTFv5WxMKEdA0kEwajLFNzSkDL3ycCAfLXhvSJF2ZlVcb1F43lutn
- H4ew==
-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:in-reply-to
- :references;
- bh=2C6MxhIF9Gjdvx3J9DYd/48/Suqux1auzpg7O20+XA4=;
- b=g5oKdVRTACrVlNT9mDlepCqDm/U02p2CeTx7OdqMmBixU2mjAXvsMj+XahOxs5uFsO
- Pl3GHa55jW2odCnqU9VxRpCVhjxno2vhx6tg+PXPuTBqk+jUURXrCVXyC22whKZcpHJr
- yirYn9/pAYDqhMOEU0QXHLc2+hkADBRoIe6q0bwWkHAUhTTBNiXZXE/AmECsikfFweYY
- /gxI4NxJV+DoqZUCLvfnDQNyMPQ/8PjcV+APjFzTg+joSGYwXUlmkEoTIr7wmU4PRJEJ
- aqo/p8zPkt9WE7U5AouUleaAYafS7lL462sde12ORut0CLGLeMgOOc1Ts62W1sawCZnK
- cgJQ==
-X-Gm-Message-State: APjAAAUTdSRQtulqTKizpX2at2737W94BWN/oI7oAXlYMQGY5HDkwL/e
- JmNLsqSgS0jLCPiCNJxyAmQ1zQ==
-X-Google-Smtp-Source:
- APXvYqwC65DYERLdER2UmlNerHOaEQY3c4hwpSMWsWud6VpPKrL6rBW7xSk8iiKL0ioPg8v7UxK/qQ==
-X-Received: by 2002:adf:ebc6:: with SMTP id v6mr14844325wrn.222.1560775871713;
- Mon, 17 Jun 2019 05:51:11 -0700 (PDT)
-Received: from dell.watershed.co.uk ([2.27.35.243])
- by smtp.gmail.com with ESMTPSA id o11sm10477852wmh.37.2019.06.17.05.51.10
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Mon, 17 Jun 2019 05:51:11 -0700 (PDT)
-From: Lee Jones <lee.jones@linaro.org>
-To: alokc@codeaurora.org, agross@kernel.org, david.brown@linaro.org,
- bjorn.andersson@linaro.org, balbi@kernel.org, gregkh@linuxfoundation.org,
- ard.biesheuvel@linaro.org, jlhugo@gmail.com, linux-arm-msm@vger.kernel.org,
- linux-usb@vger.kernel.org, felipe.balbi@linux.intel.com
-Subject: [RESEND v4 3/4] usb: dwc3: qcom: Start USB in 'host mode' on the
- SDM845
-Date: Mon, 17 Jun 2019 13:51:04 +0100
-Message-Id: <20190617125105.6186-4-lee.jones@linaro.org>
-X-Mailer: git-send-email 2.17.1
-In-Reply-To: <20190617125105.6186-1-lee.jones@linaro.org>
-References: <20190617125105.6186-1-lee.jones@linaro.org>
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190617_055112_973743_71B28B61
-X-CRM114-Status: GOOD ( 15.72 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: Lee Jones <lee.jones@linaro.org>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-When booting with Device Tree, the current default boot configuration
-table option, the request to boot via 'host mode' comes from the
-'dr_mode' property. A property of the same name can be used inside
-ACPI tables too. However it is missing from the SDM845's ACPI tables
-so we have to supply this information using Platform Device Properties
-instead.
-
-This does not change the behaviour of any currently supported devices.
-The property is only set on ACPI enabled platforms, thus for H/W
-booting DT, unless a 'dr_mode' property is present, the default is
-still OTG (On-The-Go) as per [0]. Any new ACPI devices added will
-also be able to over-ride this implementation by providing a 'dr_mode'
-property in their ACPI tables. In cases where 'dr_mode' is omitted
-from the tables AND 'host mode' should not be the default (very
-unlikely), then we will have to add some way of choosing between them
-at run time - most likely by ACPI HID.
-
-[0] Documentation/devicetree/bindings/usb/generic.txt
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
----
- drivers/usb/dwc3/dwc3-qcom.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
-index 0cb63f6c92d9..2d050303d564 100644
---- a/drivers/usb/dwc3/dwc3-qcom.c
-+++ b/drivers/usb/dwc3/dwc3-qcom.c
-@@ -444,6 +444,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
- return 0;
- }
-
-+static const struct property_entry dwc3_qcom_acpi_properties[] = {
-+ PROPERTY_ENTRY_STRING("dr_mode", "host"),
-+ {}
-+};
-+
- static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
- {
- struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
-@@ -488,6 +493,13 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
- goto out;
- }
-
-+ ret = platform_device_add_properties(qcom->dwc3,
-+ dwc3_qcom_acpi_properties);
-+ if (ret < 0) {
-+ dev_err(&pdev->dev, "failed to add properties\n");
-+ goto out;
-+ }
-+
- ret = platform_device_add(qcom->dwc3);
- if (ret)
- dev_err(&pdev->dev, "failed to add device\n");
-
-From patchwork Mon Jun 17 12:51:05 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Lee Jones <lee.jones@linaro.org>
-X-Patchwork-Id: 10999171
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 056B014BB
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:24 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9F5D2623D
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:23 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id DE2D8286E6; Mon, 17 Jun 2019 12:52:23 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4FDCC28910
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 17 Jun 2019 12:52:23 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
- List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:
- In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:
- Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
- :Resent-Message-ID:List-Owner;
- bh=+jtZnHBNzgQH/9Px1oGZt5RysFzYApYYAuGUPTs83g0=; b=isuYAdGtnV2Gnn9HFaejXX5oNk
- FE+ANauzKQRQvIzRBcIKDx8ulhJQVhcGuK3T8Jch1Uboq+o3eWsxRoURfYBbGrflIOx21Yg8N25eY
- BI7vshLQoF/8yr4DjMCu38+euxufpLS3Iy1ccfgdSWsrN4xNGQM8EMH9AnNO4CcCRvTNhd66JToDv
- CeewDT5qNKNXJhX6uK7VSjjpqLLlL9xeDVHuVDlRBijmSlktSvXBSpx/foroGCL6PE/PHbTKY+84M
- d2iMxiHV7HFNk88oc+cA1XibLNSKlrQqBSh0cTPEy9/FNF/HIhS2nZuW699O25srjt9WD5kHYTkWz
- Uj9Onb5g==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr7Q-0005fB-VK; Mon, 17 Jun 2019 12:52:16 +0000
-Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342])
- by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hcr6Q-0004hQ-9x
- for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 12:51:15 +0000
-Received: by mail-wm1-x342.google.com with SMTP id c6so8984040wml.0
- for <linux-arm-kernel@lists.infradead.org>;
- Mon, 17 Jun 2019 05:51:13 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
- h=from:to:cc:subject:date:message-id:in-reply-to:references;
- bh=Yh8KWN22mWMhTl8rcvEzBYBWJNOHxR/ZVbPRRDE/D+g=;
- b=q/VQwMJ7CaCCS2TpiY40tB9SR/0BGYUD9cg5QmvyZlgN0oSe9DGo/a+8W3tFnih/es
- f/TGbxw2+NhrkghexAa4OElVuqj6adr3zChACFmOr55PBTOD/M1NIEdtp5/IEy9qU/kC
- fX2Qrs7PhDGqUidNClIWZ04Lwg4RW4iXSfsUN/mQ3Fz6ReP9i0AdV914a9optyVwxJ9W
- Xy6Y1mSeoVn1NeqGDQGLUT+gzK0PwP6QYlI5aEiS1G795pxPRN55vGKPX1Kr7l+p8xwx
- 9xxVx3Oo0mrnM/HpISh/Sd3kMq4WHV1BoTnn1nr+LgaU5NktIDT5p1PPAhig5lYx1wqZ
- dRuw==
-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:in-reply-to
- :references;
- bh=Yh8KWN22mWMhTl8rcvEzBYBWJNOHxR/ZVbPRRDE/D+g=;
- b=GDDwWmC9vgwB9dEThqnEfHcQ0p5geoDFCFkO7J5KNb9MMmOnioyHSEX/hc/ZVBKMJO
- FJ5WEaXuIM9CNXi8tJnFihBgZh+RrxIyQE0XKiThAbKywAG/0O7CzV8zIALI0gjDuHnc
- Z4EKuFVN6NOFCU4DwnkKs3ti0J1kjwTk4UXRwbCq/tdA25Jfe8s+dpgNFjsGKjJ9rhdb
- 0HOQglShCMAL4K98A3uZhiBpD3DEYw0PE5f7bE85ztRROxzeyLdmCpE/7P62Tf7i6rRL
- nLpK6Gkwh6BtejcNXq0oF8WDUhpCWFODaymkmLMZPTcUFsnvALORZa3xnahGffdxUoak
- xpqw==
-X-Gm-Message-State: APjAAAVe/oIFvOcyv+/Ca5uByLVj7kZtQ4Dw7Gzo/OG5v4XhjWwar3iK
- OZZ9XFRIxxeYmle7YYU8S4BGNkgSBSw=
-X-Google-Smtp-Source:
- APXvYqyQ7uC0yXE6+rCbtoO1nXI3vuubKGuLiHCQLeIEVsa7DW/HvoU6icIxjcUwUpeyeJFFHJ6L2g==
-X-Received: by 2002:a1c:63c4:: with SMTP id x187mr17953607wmb.4.1560775872645;
- Mon, 17 Jun 2019 05:51:12 -0700 (PDT)
-Received: from dell.watershed.co.uk ([2.27.35.243])
- by smtp.gmail.com with ESMTPSA id o11sm10477852wmh.37.2019.06.17.05.51.11
- (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
- Mon, 17 Jun 2019 05:51:12 -0700 (PDT)
-From: Lee Jones <lee.jones@linaro.org>
-To: alokc@codeaurora.org, agross@kernel.org, david.brown@linaro.org,
- bjorn.andersson@linaro.org, balbi@kernel.org, gregkh@linuxfoundation.org,
- ard.biesheuvel@linaro.org, jlhugo@gmail.com, linux-arm-msm@vger.kernel.org,
- linux-usb@vger.kernel.org, felipe.balbi@linux.intel.com
-Subject: [RESEND v4 4/4] usb: dwc3: qcom: Improve error handling
-Date: Mon, 17 Jun 2019 13:51:05 +0100
-Message-Id: <20190617125105.6186-5-lee.jones@linaro.org>
-X-Mailer: git-send-email 2.17.1
-In-Reply-To: <20190617125105.6186-1-lee.jones@linaro.org>
-References: <20190617125105.6186-1-lee.jones@linaro.org>
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190617_055114_400272_E30946CF
-X-CRM114-Status: GOOD ( 11.45 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: Lee Jones <lee.jones@linaro.org>, linux-kernel@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-dwc3_qcom_clk_init() is called with of_count_phandle_with_args() as an
-argument. If of_count_phandle_with_args() returns an error, the number
-of clocks will be a negative value and will lead to undefined behaviour.
-
-Ensure we check for an error before attempting to blindly use the value.
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
----
- drivers/usb/dwc3/dwc3-qcom.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
-index 2d050303d564..c59e9d8e8609 100644
---- a/drivers/usb/dwc3/dwc3-qcom.c
-+++ b/drivers/usb/dwc3/dwc3-qcom.c
-@@ -409,6 +409,9 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
- if (!np || !count)
- return 0;
-
-+ if (count < 0)
-+ return count;
-+
- qcom->num_clocks = count;
-
- qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
diff --git a/arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch b/arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch
deleted file mode 100644
index 318922766..000000000
--- a/arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9ceb22fbffbad710db2c91ed32e4e73503f13301 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 25 Jun 2019 19:12:10 +0100
-Subject: [PATCH] scsi: ufs-qcom: Add support for platforms booting ACPI
-
-New Qualcomm AArch64 based laptops are now available which use UFS
-as their primary data storage medium. These devices are supplied
-with ACPI support out of the box. This patch ensures the Qualcomm
-UFS driver will be bound when the "QCOM24A5" H/W device is
-advertised as present.
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- drivers/scsi/ufs/ufs-qcom.c | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
-index b4d1b5c22987..ee4b1da1e223 100644
---- a/drivers/scsi/ufs/ufs-qcom.c
-+++ b/drivers/scsi/ufs/ufs-qcom.c
-@@ -3,6 +3,7 @@
- * Copyright (c) 2013-2016, Linux Foundation. All rights reserved.
- */
-
-+#include <linux/acpi.h>
- #include <linux/time.h>
- #include <linux/of.h>
- #include <linux/platform_device.h>
-@@ -161,6 +162,9 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
- int err = 0;
- struct device *dev = host->hba->dev;
-
-+ if (has_acpi_companion(dev))
-+ return 0;
-+
- err = ufs_qcom_host_clk_get(dev, "rx_lane0_sync_clk",
- &host->rx_l0_sync_clk, false);
- if (err)
-@@ -1127,9 +1131,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
- __func__, err);
- goto out_variant_clear;
- } else if (IS_ERR(host->generic_phy)) {
-- err = PTR_ERR(host->generic_phy);
-- dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
-- goto out_variant_clear;
-+ if (has_acpi_companion(dev)) {
-+ host->generic_phy = NULL;
-+ } else {
-+ err = PTR_ERR(host->generic_phy);
-+ dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
-+ goto out_variant_clear;
-+ }
- }
-
- err = ufs_qcom_bus_register(host);
-@@ -1599,6 +1607,14 @@ static const struct of_device_id ufs_qcom_of_match[] = {
- };
- MODULE_DEVICE_TABLE(of, ufs_qcom_of_match);
-
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id ufs_qcom_acpi_match[] = {
-+ { "QCOM24A5" },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(acpi, ufs_qcom_acpi_match);
-+#endif
-+
- static const struct dev_pm_ops ufs_qcom_pm_ops = {
- .suspend = ufshcd_pltfrm_suspend,
- .resume = ufshcd_pltfrm_resume,
-@@ -1615,6 +1631,7 @@ static struct platform_driver ufs_qcom_pltform = {
- .name = "ufshcd-qcom",
- .pm = &ufs_qcom_pm_ops,
- .of_match_table = of_match_ptr(ufs_qcom_of_match),
-+ .acpi_match_table = ACPI_PTR(ufs_qcom_acpi_match),
- },
- };
- module_platform_driver(ufs_qcom_pltform);
---
-2.21.0
-
diff --git a/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch b/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
deleted file mode 100644
index e7ca70ab3..000000000
--- a/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From patchwork Wed Jun 26 15:48:11 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Stefan Wahren <wahrenst@gmx.net>
-X-Patchwork-Id: 11018115
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0546514BB
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Wed, 26 Jun 2019 15:49:02 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6FEC288DC
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id DADF9288E5; Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham
- version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73ADC288DC
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
- List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
- Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
- Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
- References:List-Owner; bh=qjzvJkBweFVGZWCHd7cHawZMDpcLTzSf2CjoVEIv+0Q=; b=eu5
- ABKzcpImxwkRcYCdHG/4eTgYM8nrpBaJqeKW2TNWEhNUjvnfU8TgkbD4nsIXkBXSb/riyKYzEcGJo
- 91zXHR6clQ6yf7eRtaHSX9IMfiwGPTC2YQvr6vQ+CrVJs+xDhlH/1V1+9myF4ySIX+mLOnm+w3pgi
- j1JeP7vd7fpr8iyG29kaFoDH7FdC5Sw66TINVyaE5igT9yKcrFoAITGfRZevp1dd3uq5EKxs/+oo3
- 9BvpwHZ3Bdb+bWzFc9kS4udjL8V4+u7aesLq8tOOPLZab+W8ZW1iq4PHENzdHblrJyrK/2pGEECPx
- bVAV7MIHqms4tvAAyXSlPai0wU/j12A==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
- id 1hgAAK-00030G-Ny; Wed, 26 Jun 2019 15:48:56 +0000
-Received: from mout.gmx.net ([212.227.17.20])
- by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hgAAH-0002yg-2E; Wed, 26 Jun 2019 15:48:54 +0000
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
- s=badeba3b8450; t=1561564113;
- bh=mWLTbdtxGfwZ13vnfxlQDfv6DzwTGycBEng3zNk/XaE=;
- h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
- b=KYHDR8XZmzxft+7qC8J8cyQ71BSi6JkTsAhWvd+vK2f+YjWqjT42uTfrjNGCcQfdV
- Z9gkAVPhUJWqXcu/GipMjVfx/QmxN65eJI1oHCOZ/vhkhzCqY9CuiJjHWnxF6jmydK
- 5QSqYnKAOWM3NXmd6pWkd6wlKwIFV9zX8+x8R0gE=
-X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
-Received: from localhost.localdomain ([37.4.249.111]) by mail.gmx.com
- (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id
- 0LyS5K-1ibrK32soI-015u60; Wed, 26 Jun 2019 17:48:33 +0200
-From: Stefan Wahren <wahrenst@gmx.net>
-To: Eric Anholt <eric@anholt.net>,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- Madhumitha Prabakaran <madhumithabiw@gmail.com>
-Subject: [PATCH V2] staging: bcm2835-camera: Restore return behavior of
- ctrl_set_bitrate()
-Date: Wed, 26 Jun 2019 17:48:11 +0200
-Message-Id: <1561564091-14248-1-git-send-email-wahrenst@gmx.net>
-X-Mailer: git-send-email 2.7.4
-X-Provags-ID: V03:K1:oGZaaF0VyX9aU1B2KlshIgSdbA6j0aZLN7PhhBatNb+3vHD/bim
- IAE1eOdpYqQunHD6Pg0lTq7WJELowblFluMBHzPg8LdD02e6QUAOnsxpP9+ZsegmN4310bJ
- qbWyOk73ZUf0L+ErExAilg9x9ygGjCdTujEDRrk0vloZc12lmdHMEA8VQs/4HDu6WGeOoac
- M59q+7daHAsSTIgJrRUuA==
-X-UI-Out-Filterresults: notjunk:1;V03:K0:+5QZJxEbxD4=:fxpwesVoxYf61efHxmcTKK
- BddiAtw8+v4csO9cTNV4qSFAebPmgWlPv8KyLXPbOQdcjOl72FUcevKvhsznxi/uv5leFw9uX
- Sr99W78EPj3EmJmQT1KZ8GMPWcB/hQa1h/t4bhjHByFu4VQ2xaIdpsJfZlFcR2poK1E6dEFT6
- jHlzWYjt2kP7anvsjMJvdSVILf9+ei6ysWz1aaMCKFLhxNUNmXH9onDdO8WOanGVr15zb+cVv
- N4ecxzj0SonMoADsz1UJqgwb8Pi5/me809KQd8pQ/GhKDeLPNwQPXJMMhRbyPgmg5bJVCRUgp
- MaMwDNiIn3qPl6t4jPx9uiSL5n47PAyt6vVlyufqp1lOr4EqgQFWp+2hknWJYJ8hzkBLgXrdZ
- gfNGAtlqG9MdHsJds/KNtpjNvF3iCuOWcIyBEGAYKZL78LQggOcIFSlHn+KZ9JU2t9jGJHKF7
- 0E7pkZuWJIQjaWnt7WTAiO/Pv3tNhKukGVQXG7OTxkwS3+BsXI+vBB+xtOP+syI1QFkP3h+5c
- 9HVQLB7CA73bkyul1AwmrHNV+OqITaTatTPFXsDojt54X59pz2G3SkQI5z8JZ2aq40Z3vwI6u
- lyMT+gPPFDx2aNm460FX8Gm+2BisA5xrkpjxb4KIDZvTRDCexntK3cadXRyX7GZQWc6poIcVf
- atWNWiKYv6KN6vA+lc2Ffl5FM8p7BFtkX4GA0GZ/XhMTvCqDtgxBdQ4sevKJ4riNMAvRuswrM
- BUrlhaRg3ElFPF3x+S73QaRmNmtv34L7puWW57WxrkKKSJS7Td0oZd1ktx6eAW1CA+I8RmOn3
- A+rcm/ZfBf00TXqxsq3/t9h4mL3cP4KhBAxtyYg4z4yjuWt8AmXR6GfvTwCxk+qioygsV6KyY
- 6yh532oUizARrL8gUwZBauRwgH5rk7e2BWINY86y8vr3nSBzocuIFAekTK42reIsJ+qq9OSD5
- IcQroenV1LixMtStvb6CiyHMHMqpxb+Buu+0bdl5qjKcUB4JxBA6KWMPC6Orj+Yf/GKaQlk+k
- VsgZBuZAUHsZFuULBdIsUg//MyQJ0q/13WL31BSqJX9SAMgHFgsGeDo4yAg4YSF2Mbh1EgZu7
- a3+bklRX7SG3Ts=
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190626_084853_443115_5EF1DFC7
-X-CRM114-Status: GOOD ( 11.55 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.29
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: devel@driverdev.osuosl.org, Stefan Wahren <wahrenst@gmx.net>,
- Dave Stevenson <dave.stevenson@raspberrypi.org>,
- Dan Carpenter <dan.carpenter@oracle.com>,
- linux-arm-kernel@lists.infradead.org,
- linux-rpi-kernel@lists.infradead.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The commit 52c4dfcead49 ("Staging: vc04_services: Cleanup in
-ctrl_set_bitrate()") changed the return behavior of ctrl_set_bitrate().
-We cannot do this because of a bug in the firmware, which breaks probing
-of bcm2835-camera:
-
- bcm2835-v4l2: mmal_init: failed to set all camera controls: -3
- Cleanup: Destroy video encoder
- Cleanup: Destroy image encoder
- Cleanup: Destroy video render
- Cleanup: Destroy camera
- bcm2835-v4l2: bcm2835_mmal_probe: mmal init failed: -3
- bcm2835-camera: probe of bcm2835-camera failed with error -3
-
-So restore the old behavior, add an explaining comment and a debug message
-to verify that the bug has been fixed in firmware.
-
-Fixes: 52c4dfcead49 ("Staging: vc04_services: Cleanup in ctrl_set_bitrate()")
-Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
-Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
----
- .../staging/vc04_services/bcm2835-camera/controls.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-Changes in V2:
-- add an explaining comment as suggest by Dan and Dave
-- add a debug message to verify the firmware behavior
-
---
-2.7.4
-
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index d60e378..c251164 100644
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -604,15 +604,28 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
- struct v4l2_ctrl *ctrl,
- const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
- {
-+ int ret;
- struct vchiq_mmal_port *encoder_out;
-
- dev->capture.encode_bitrate = ctrl->val;
-
- encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
-
-- return vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-- mmal_ctrl->mmal_id, &ctrl->val,
-- sizeof(ctrl->val));
-+ ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-+ mmal_ctrl->mmal_id, &ctrl->val,
-+ sizeof(ctrl->val));
-+
-+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
-+ "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
-+ __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
-+ (ret == 0 ? 0 : -EINVAL));
-+
-+ /*
-+ * Older firmware versions (pre July 2019) have a bug in handling
-+ * MMAL_PARAMETER_VIDEO_BIT_RATE that result in the call
-+ * returning -MMAL_MSG_STATUS_EINVAL. So ignore errors from this call.
-+ */
-+ return 0;
- }
-
- static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
diff --git a/bcm2835-vchiq-use-interruptible-waits.patch b/bcm2835-vchiq-use-interruptible-waits.patch
deleted file mode 100644
index 7f9e4f937..000000000
--- a/bcm2835-vchiq-use-interruptible-waits.patch
+++ /dev/null
@@ -1,1133 +0,0 @@
-From patchwork Thu May 9 14:31:33 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-X-Patchwork-Id: 10937231
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40C4F1390
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:04 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BBD428A62
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:04 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id 259A428AE0; Thu, 9 May 2019 14:32:04 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 415AA28B73
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:02 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
- List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
- Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
- Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
- List-Owner; bh=3uJvYwW6NsoePeXJ/5ZwETYJ0KPDLBZYP0UKnW2FJN4=; b=C5epWZQXitegMi
- If9WNmt+WIU1qZ5/Zf/K4VyHyLndbbGCz0fCiywJ6C2lL05k2rkyKPLD/5JD9WearPWtXUZKjfWel
- 4TaT/dbnBmWnFmxZh/HH6Esg+Nm+f0XTmfQX4CTfAa37AkyGpHcpGoR+JHCXe8tJXjKtdGG3S+9Jl
- l7TTzLJHyGUpJ6SOuB1s2T6hTBGi1fiJzUWjFZzONtMSbnu0gOhemwnL5paYqUdrs7KQq6BqZPU8Z
- 48BFzV3uTQ/ux271qzmUx1beTRSqKwtlzquZtS9PutYKyvIm9oyEglAsOkBBVUY+9b8B0HWoWkUvv
- w7rWaT6L1ZSjMthb9UtA==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5T-0005hY-5q; Thu, 09 May 2019 14:31:55 +0000
-Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de)
- by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5P-0005fv-Tq; Thu, 09 May 2019 14:31:53 +0000
-X-Virus-Scanned: by amavisd-new at test-mx.suse.de
-Received: from relay2.suse.de (unknown [195.135.220.254])
- by mx1.suse.de (Postfix) with ESMTP id 9E8A6AC7E;
- Thu, 9 May 2019 14:31:50 +0000 (UTC)
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-To: linux-kernel@vger.kernel.org
-Subject: [PATCH v3 1/4] staging: vchiq_2835_arm: revert "quit using custom
- down_interruptible()"
-Date: Thu, 9 May 2019 16:31:33 +0200
-Message-Id: <20190509143137.31254-2-nsaenzjulienne@suse.de>
-X-Mailer: git-send-email 2.21.0
-In-Reply-To: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-References: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190509_073152_105160_D40F2444
-X-CRM114-Status: GOOD ( 13.03 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.21
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: stefan.wahren@i2se.com, devel@driverdev.osuosl.org,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- Eric Anholt <eric@anholt.net>,
- linux-rpi-kernel@lists.infradead.org, dan.carpenter@oracle.com,
- Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
- linux-arm-kernel@lists.infradead.org
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The killable version of down() is meant to be used on situations where
-it should not fail at all costs, but still have the convenience of being
-able to kill it if really necessary. VCHIQ doesn't fit this criteria, as
-it's mainly used as an interface to V4L2 and ALSA devices.
-
-Fixes: ff5979ad8636 ("staging: vchiq_2835_arm: quit using custom down_interruptible()")
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
----
- .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index a9a22917ecdb..49d3b39b1059 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-@@ -514,7 +514,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
- (g_cache_line_size - 1)))) {
- char *fragments;
-
-- if (down_killable(&g_free_fragments_sema)) {
-+ if (down_interruptible(&g_free_fragments_sema) != 0) {
- cleanup_pagelistinfo(pagelistinfo);
- return NULL;
- }
-
-From patchwork Thu May 9 14:31:34 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-X-Patchwork-Id: 10937237
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94E28933
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:36 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80F8B28B78
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:36 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id 7D0F128B1B; Thu, 9 May 2019 14:32:36 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B03628BB9
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:35 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
- List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
- Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
- Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
- List-Owner; bh=WHM2WEnAejOnk0J6GjEHKXrK0nKxgdLNq48dTkgDLgo=; b=i5Mm8gffWR7Rwq
- 4+uMDe6lJY5SKE65Kz4KtVkygMKsGS6oguaK3wvgh6OGo77kqnFU+0r6HHBQr3xb/0KJq4yq6IV9y
- auU1WltykbzEJmRd+Tj3oJX6kaz+Tqagk88AQMUCSuyB95Elbvxqr7Q0ro4NGwveXvkM0CY8EkAcR
- IvfNzMbS6tp0ZVcMflUHecbTThrfVr2H65WipivLLqS7FQtyly6cx1EkEyt3TV+53CAT2uY5l5wDb
- BD2hOBPWrdwsgGFk4plnPlYV71/jQEL6zqb7ScYMQ8PXEC+SIifPvonzmTaGsXAss7CyNQefMsp6U
- RSJQYwd9gv1L/MOawrgg==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk61-0006Sg-ER; Thu, 09 May 2019 14:32:29 +0000
-Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de)
- by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5Q-0005fw-IZ; Thu, 09 May 2019 14:31:54 +0000
-X-Virus-Scanned: by amavisd-new at test-mx.suse.de
-Received: from relay2.suse.de (unknown [195.135.220.254])
- by mx1.suse.de (Postfix) with ESMTP id 4DE02ACB1;
- Thu, 9 May 2019 14:31:51 +0000 (UTC)
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-To: linux-kernel@vger.kernel.org
-Subject: [PATCH v3 2/4] staging: vchiq: revert "switch to
- wait_for_completion_killable"
-Date: Thu, 9 May 2019 16:31:34 +0200
-Message-Id: <20190509143137.31254-3-nsaenzjulienne@suse.de>
-X-Mailer: git-send-email 2.21.0
-In-Reply-To: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-References: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190509_073152_902395_DF67A86F
-X-CRM114-Status: GOOD ( 15.86 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.21
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: stefan.wahren@i2se.com, devel@driverdev.osuosl.org,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- Eric Anholt <eric@anholt.net>,
- linux-rpi-kernel@lists.infradead.org, dan.carpenter@oracle.com,
- Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
- linux-arm-kernel@lists.infradead.org
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The killable version of wait_for_completion() is meant to be used on
-situations where it should not fail at all costs, but still have the
-convenience of being able to kill it if really necessary. VCHIQ doesn't
-fit this criteria, as it's mainly used as an interface to V4L2 and ALSA
-devices.
-
-Fixes: a772f116702e ("staging: vchiq: switch to wait_for_completion_killable")
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
----
- .../interface/vchiq_arm/vchiq_arm.c | 21 ++++++++++---------
- .../interface/vchiq_arm/vchiq_core.c | 21 ++++++++++---------
- .../interface/vchiq_arm/vchiq_util.c | 6 +++---
- 3 files changed, 25 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index ab7d6a0ce94c..62d8f599e765 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -532,7 +532,8 @@ add_completion(VCHIQ_INSTANCE_T instance, VCHIQ_REASON_T reason,
- vchiq_log_trace(vchiq_arm_log_level,
- "%s - completion queue full", __func__);
- DEBUG_COUNT(COMPLETION_QUEUE_FULL_COUNT);
-- if (wait_for_completion_killable(&instance->remove_event)) {
-+ if (wait_for_completion_interruptible(
-+ &instance->remove_event)) {
- vchiq_log_info(vchiq_arm_log_level,
- "service_callback interrupted");
- return VCHIQ_RETRY;
-@@ -643,7 +644,7 @@ service_callback(VCHIQ_REASON_T reason, struct vchiq_header *header,
- }
-
- DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &user_service->remove_event)
- != 0) {
- vchiq_log_info(vchiq_arm_log_level,
-@@ -978,7 +979,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- has been closed until the client library calls the
- CLOSE_DELIVERED ioctl, signalling close_event. */
- if (user_service->close_pending &&
-- wait_for_completion_killable(
-+ wait_for_completion_interruptible(
- &user_service->close_event))
- status = VCHIQ_RETRY;
- break;
-@@ -1154,7 +1155,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-
- DEBUG_TRACE(AWAIT_COMPLETION_LINE);
- mutex_unlock(&instance->completion_mutex);
-- rc = wait_for_completion_killable(
-+ rc = wait_for_completion_interruptible(
- &instance->insert_event);
- mutex_lock(&instance->completion_mutex);
- if (rc != 0) {
-@@ -1324,7 +1325,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- do {
- spin_unlock(&msg_queue_spinlock);
- DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &user_service->insert_event)) {
- vchiq_log_info(vchiq_arm_log_level,
- "DEQUEUE_MESSAGE interrupted");
-@@ -2328,7 +2329,7 @@ vchiq_keepalive_thread_func(void *v)
- while (1) {
- long rc = 0, uc = 0;
-
-- if (wait_for_completion_killable(&arm_state->ka_evt)
-+ if (wait_for_completion_interruptible(&arm_state->ka_evt)
- != 0) {
- vchiq_log_error(vchiq_susp_log_level,
- "%s interrupted", __func__);
-@@ -2579,7 +2580,7 @@ block_resume(struct vchiq_arm_state *arm_state)
- write_unlock_bh(&arm_state->susp_res_lock);
- vchiq_log_info(vchiq_susp_log_level, "%s wait for previously "
- "blocked clients", __func__);
-- if (wait_for_completion_killable_timeout(
-+ if (wait_for_completion_interruptible_timeout(
- &arm_state->blocked_blocker, timeout_val)
- <= 0) {
- vchiq_log_error(vchiq_susp_log_level, "%s wait for "
-@@ -2605,7 +2606,7 @@ block_resume(struct vchiq_arm_state *arm_state)
- write_unlock_bh(&arm_state->susp_res_lock);
- vchiq_log_info(vchiq_susp_log_level, "%s wait for resume",
- __func__);
-- if (wait_for_completion_killable_timeout(
-+ if (wait_for_completion_interruptible_timeout(
- &arm_state->vc_resume_complete, timeout_val)
- <= 0) {
- vchiq_log_error(vchiq_susp_log_level, "%s wait for "
-@@ -2812,7 +2813,7 @@ vchiq_arm_force_suspend(struct vchiq_state *state)
- do {
- write_unlock_bh(&arm_state->susp_res_lock);
-
-- rc = wait_for_completion_killable_timeout(
-+ rc = wait_for_completion_interruptible_timeout(
- &arm_state->vc_suspend_complete,
- msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS));
-
-@@ -2908,7 +2909,7 @@ vchiq_arm_allow_resume(struct vchiq_state *state)
- write_unlock_bh(&arm_state->susp_res_lock);
-
- if (resume) {
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &arm_state->vc_resume_complete) < 0) {
- vchiq_log_error(vchiq_susp_log_level,
- "%s interrupted", __func__);
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-index 0c387b6473a5..c65cf1e6f910 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-@@ -560,7 +560,7 @@ reserve_space(struct vchiq_state *state, size_t space, int is_blocking)
- remote_event_signal(&state->remote->trigger);
-
- if (!is_blocking ||
-- (wait_for_completion_killable(
-+ (wait_for_completion_interruptible(
- &state->slot_available_event)))
- return NULL; /* No space available */
- }
-@@ -830,7 +830,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- spin_unlock(&quota_spinlock);
- mutex_unlock(&state->slot_mutex);
-
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &state->data_quota_event))
- return VCHIQ_RETRY;
-
-@@ -861,7 +861,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- service_quota->slot_use_count);
- VCHIQ_SERVICE_STATS_INC(service, quota_stalls);
- mutex_unlock(&state->slot_mutex);
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &service_quota->quota_event))
- return VCHIQ_RETRY;
- if (service->closing)
-@@ -1710,7 +1710,8 @@ parse_rx_slots(struct vchiq_state *state)
- &service->bulk_rx : &service->bulk_tx;
-
- DEBUG_TRACE(PARSE_LINE);
-- if (mutex_lock_killable(&service->bulk_mutex)) {
-+ if (mutex_lock_killable(
-+ &service->bulk_mutex) != 0) {
- DEBUG_TRACE(PARSE_LINE);
- goto bail_not_ready;
- }
-@@ -2428,7 +2429,7 @@ vchiq_open_service_internal(struct vchiq_service *service, int client_id)
- QMFLAGS_IS_BLOCKING);
- if (status == VCHIQ_SUCCESS) {
- /* Wait for the ACK/NAK */
-- if (wait_for_completion_killable(&service->remove_event)) {
-+ if (wait_for_completion_interruptible(&service->remove_event)) {
- status = VCHIQ_RETRY;
- vchiq_release_service_internal(service);
- } else if ((service->srvstate != VCHIQ_SRVSTATE_OPEN) &&
-@@ -2795,7 +2796,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
- }
-
- if (state->conn_state == VCHIQ_CONNSTATE_CONNECTING) {
-- if (wait_for_completion_killable(&state->connect))
-+ if (wait_for_completion_interruptible(&state->connect))
- return VCHIQ_RETRY;
-
- vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
-@@ -2894,7 +2895,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
- }
-
- while (1) {
-- if (wait_for_completion_killable(&service->remove_event)) {
-+ if (wait_for_completion_interruptible(&service->remove_event)) {
- status = VCHIQ_RETRY;
- break;
- }
-@@ -2955,7 +2956,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
- request_poll(service->state, service, VCHIQ_POLL_REMOVE);
- }
- while (1) {
-- if (wait_for_completion_killable(&service->remove_event)) {
-+ if (wait_for_completion_interruptible(&service->remove_event)) {
- status = VCHIQ_RETRY;
- break;
- }
-@@ -3038,7 +3039,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
- VCHIQ_SERVICE_STATS_INC(service, bulk_stalls);
- do {
- mutex_unlock(&service->bulk_mutex);
-- if (wait_for_completion_killable(
-+ if (wait_for_completion_interruptible(
- &service->bulk_remove_event)) {
- status = VCHIQ_RETRY;
- goto error_exit;
-@@ -3115,7 +3116,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
-
- if (bulk_waiter) {
- bulk_waiter->bulk = bulk;
-- if (wait_for_completion_killable(&bulk_waiter->event))
-+ if (wait_for_completion_interruptible(&bulk_waiter->event))
- status = VCHIQ_RETRY;
- else if (bulk_waiter->actual == VCHIQ_BULK_ACTUAL_ABORTED)
- status = VCHIQ_ERROR;
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
-index 6c519d8e48cb..8ee85c5e6f77 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
-@@ -50,7 +50,7 @@ void vchiu_queue_push(struct vchiu_queue *queue, struct vchiq_header *header)
- return;
-
- while (queue->write == queue->read + queue->size) {
-- if (wait_for_completion_killable(&queue->pop))
-+ if (wait_for_completion_interruptible(&queue->pop))
- flush_signals(current);
- }
-
-@@ -63,7 +63,7 @@ void vchiu_queue_push(struct vchiu_queue *queue, struct vchiq_header *header)
- struct vchiq_header *vchiu_queue_peek(struct vchiu_queue *queue)
- {
- while (queue->write == queue->read) {
-- if (wait_for_completion_killable(&queue->push))
-+ if (wait_for_completion_interruptible(&queue->push))
- flush_signals(current);
- }
-
-@@ -77,7 +77,7 @@ struct vchiq_header *vchiu_queue_pop(struct vchiu_queue *queue)
- struct vchiq_header *header;
-
- while (queue->write == queue->read) {
-- if (wait_for_completion_killable(&queue->push))
-+ if (wait_for_completion_interruptible(&queue->push))
- flush_signals(current);
- }
-
-
-From patchwork Thu May 9 14:31:35 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-X-Patchwork-Id: 10937235
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC5351390
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:19 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99D2728B65
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:19 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id 97D1428BB1; Thu, 9 May 2019 14:32:19 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 33B1628B65
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:19 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
- List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
- Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
- Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
- List-Owner; bh=MppKCYBfq+FT3jZK/ObU3v+sP2fM91OxPw5GM5vFK98=; b=uphpQaXY93kD4n
- qgHpU2dYayllgFMmHqHFKy8338sx7Rh7Whh12IOevJXT84Q43VFK/WoIk4//t7jh/pJYQfoRlmCnH
- KJHT2uWjj2un8BkoTRQSR/fEO+EvLPI5n280twRaGYJQq1A5XprnriWSETDsTkgMcbt8Cj71kph8s
- qqNkS1hkZGFOgh8B8EYP9MUwadwoYKkvovcJziv4ODUl/xaXoz9ST9ipqUpxRNyDnhj3gS0xGP4mU
- eN4swml2LB//9oH9D3bt9GgKJhvURUm/vIKuBhCWQdYrfUPZNfPvIHwTyJStjhkiSuyN+i/yh/u0d
- aVqlnEW/g+94vRfkoSfw==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5p-0006Ao-3W; Thu, 09 May 2019 14:32:17 +0000
-Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de)
- by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5R-0005gN-Bk; Thu, 09 May 2019 14:31:54 +0000
-X-Virus-Scanned: by amavisd-new at test-mx.suse.de
-Received: from relay2.suse.de (unknown [195.135.220.254])
- by mx1.suse.de (Postfix) with ESMTP id 1944EACBA;
- Thu, 9 May 2019 14:31:52 +0000 (UTC)
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-To: linux-kernel@vger.kernel.org
-Subject: [PATCH v3 3/4] staging: vchiq: make wait events interruptible
-Date: Thu, 9 May 2019 16:31:35 +0200
-Message-Id: <20190509143137.31254-4-nsaenzjulienne@suse.de>
-X-Mailer: git-send-email 2.21.0
-In-Reply-To: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-References: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190509_073153_546153_CF6CDC2C
-X-CRM114-Status: GOOD ( 12.69 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.21
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: stefan.wahren@i2se.com, devel@driverdev.osuosl.org,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- Eric Anholt <eric@anholt.net>,
- linux-rpi-kernel@lists.infradead.org, dan.carpenter@oracle.com,
- Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
- linux-arm-kernel@lists.infradead.org
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The killable version of wait_event() is meant to be used on situations
-where it should not fail at all costs, but still have the convenience of
-being able to kill it if really necessary. Wait events in VCHIQ doesn't
-fit this criteria, as it's mainly used as an interface to V4L2 and ALSA
-devices.
-
-Fixes: 852b2876a8a8 ("staging: vchiq: rework remove_event handling")
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
----
- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-index c65cf1e6f910..44bfa890e0e5 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-@@ -395,13 +395,21 @@ remote_event_create(wait_queue_head_t *wq, struct remote_event *event)
- init_waitqueue_head(wq);
- }
-
-+/*
-+ * All the event waiting routines in VCHIQ used a custom semaphore
-+ * implementation that filtered most signals. This achieved a behaviour similar
-+ * to the "killable" family of functions. While cleaning up this code all the
-+ * routines where switched to the "interruptible" family of functions, as the
-+ * former was deemed unjustified and the use "killable" set all VCHIQ's
-+ * threads in D state.
-+ */
- static inline int
- remote_event_wait(wait_queue_head_t *wq, struct remote_event *event)
- {
- if (!event->fired) {
- event->armed = 1;
- dsb(sy);
-- if (wait_event_killable(*wq, event->fired)) {
-+ if (wait_event_interruptible(*wq, event->fired)) {
- event->armed = 0;
- return 0;
- }
-
-From patchwork Thu May 9 14:31:36 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-X-Patchwork-Id: 10937239
-Return-Path:
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 662BC1390
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:50 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
- by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 532DC289F8
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:50 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
- id 5123C28A77; Thu, 9 May 2019 14:32:50 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
- pdx-wl-mail.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
- DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
- (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
- (No client certificate requested)
- by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 171A028AE6
- for <patchwork-linux-arm@patchwork.kernel.org>;
- Thu, 9 May 2019 14:32:49 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
- d=lists.infradead.org; s=bombadil.20170209; h=Sender:
- Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
- List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
- Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
- Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
- List-Owner; bh=hbC4fga5OSh0T15ei+AWcZjFFpeyd4eloz75PA9+ZSQ=; b=hjJnppgChnF+da
- gJbdcmOJUMpkaSPdRWwyDVndPiJqHfiacAhGzKZsMAPsymWXz2DiL4/KVE0ULmkTm5MwapaxCUliU
- gdQQ7xNOT1yyCrlMWcXYZJaeDl06ngVfgu6QoNWN02uPS55159ez5rPNpCYtA0+5npkWsREnjEF6q
- 4lo12R4nB6W62VLSy5Y1/37KoyYfIaaZOJoK3i15rKYrXoKn12hjF/2DwmVuhTA+NaadTByQyDE86
- 0A91ewtqOH/KTMHTJDQrG29q03l5LAI2l6Zr5tfz23o2jLCy+3F5vZCnXTYcGxYNNJUATVmobezZj
- sxUS8TZjBOuPCowBB22g==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
- by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk6E-0006kx-RW; Thu, 09 May 2019 14:32:42 +0000
-Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de)
- by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
- id 1hOk5T-0005hX-0e; Thu, 09 May 2019 14:32:02 +0000
-X-Virus-Scanned: by amavisd-new at test-mx.suse.de
-Received: from relay2.suse.de (unknown [195.135.220.254])
- by mx1.suse.de (Postfix) with ESMTP id AC869ACBC;
- Thu, 9 May 2019 14:31:53 +0000 (UTC)
-From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
-To: Eric Anholt <eric@anholt.net>, Stefan Wahren <stefan.wahren@i2se.com>,
- Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>,
- Scott Branden <sbranden@broadcom.com>,
- bcm-kernel-feedback-list@broadcom.com
-Subject: [PATCH v3 4/4] staging: vchiq: stop explicitly comparing with zero to
- catch errors
-Date: Thu, 9 May 2019 16:31:36 +0200
-Message-Id: <20190509143137.31254-5-nsaenzjulienne@suse.de>
-X-Mailer: git-send-email 2.21.0
-In-Reply-To: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-References: <20190509143137.31254-1-nsaenzjulienne@suse.de>
-MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20190509_073155_533318_B386BD76
-X-CRM114-Status: GOOD ( 17.98 )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.21
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe:
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe:
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: devel@driverdev.osuosl.org,
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
- linux-kernel@vger.kernel.org,
- Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
- dan.carpenter@oracle.com, linux-arm-kernel@lists.infradead.org,
- linux-rpi-kernel@lists.infradead.org
-Content-Type: text/plain; charset="us-ascii"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To:
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The vchiq code tends to follow a coding pattern that's not accepted as
-per the Linux kernel coding style
-
-We have this:
- if (expression != 0)
-
-We want this:
- if (expression)
-
-We make an exception if the expression refers to a size, in which case
-it's accepted for the sake of clarity.
-
-Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
----
- .../bcm2835-camera/bcm2835-camera.c | 11 ++--
- .../interface/vchiq_arm/vchiq_2835_arm.c | 2 +-
- .../interface/vchiq_arm/vchiq_arm.c | 66 ++++++++-----------
- .../interface/vchiq_arm/vchiq_connected.c | 4 +-
- .../interface/vchiq_arm/vchiq_core.c | 28 ++++----
- .../interface/vchiq_arm/vchiq_debugfs.c | 4 +-
- 6 files changed, 52 insertions(+), 63 deletions(-)
-
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index 68f08dc18da9..57f79c153277 100644
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -327,7 +327,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
- "%s: status:%d, buf:%p, length:%lu, flags %u, pts %lld\n",
- __func__, status, buf, length, mmal_flags, pts);
-
-- if (status != 0) {
-+ if (status) {
- /* error in transfer */
- if (buf) {
- /* there was a buffer with the error so return it */
-@@ -359,8 +359,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
- }
- } else {
- if (dev->capture.frame_count) {
-- if (dev->capture.vc_start_timestamp != -1 &&
-- pts != 0) {
-+ if (dev->capture.vc_start_timestamp != -1 && pts) {
- ktime_t timestamp;
- s64 runtime_us = pts -
- dev->capture.vc_start_timestamp;
-@@ -826,7 +825,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
- struct v4l2_input *inp)
- {
- /* only a single camera input */
-- if (inp->index != 0)
-+ if (inp->index)
- return -EINVAL;
-
- inp->type = V4L2_INPUT_TYPE_CAMERA;
-@@ -842,7 +841,7 @@ static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
-
- static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
- {
-- if (i != 0)
-+ if (i)
- return -EINVAL;
-
- return 0;
-@@ -1281,7 +1280,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
- }
-
- ret = mmal_setup_components(dev, f);
-- if (ret != 0) {
-+ if (ret) {
- v4l2_err(&dev->v4l2_dev,
- "%s: failed to setup mmal components: %d\n",
- __func__, ret);
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 49d3b39b1059..cb588c0b9364 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-@@ -514,7 +514,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type)
- (g_cache_line_size - 1)))) {
- char *fragments;
-
-- if (down_interruptible(&g_free_fragments_sema) != 0) {
-+ if (down_interruptible(&g_free_fragments_sema)) {
- cleanup_pagelistinfo(pagelistinfo);
- return NULL;
- }
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 62d8f599e765..9264a07cf160 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -238,7 +238,7 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
- vchiq_log_trace(vchiq_core_log_level,
- "%s(%p) called", __func__, instance);
-
-- if (mutex_lock_killable(&state->mutex) != 0)
-+ if (mutex_lock_killable(&state->mutex))
- return VCHIQ_RETRY;
-
- /* Remove all services */
-@@ -280,7 +280,7 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
- vchiq_log_trace(vchiq_core_log_level,
- "%s(%p) called", __func__, instance);
-
-- if (mutex_lock_killable(&state->mutex) != 0) {
-+ if (mutex_lock_killable(&state->mutex)) {
- vchiq_log_trace(vchiq_core_log_level,
- "%s: call to mutex_lock failed", __func__);
- status = VCHIQ_RETRY;
-@@ -645,8 +645,7 @@ service_callback(VCHIQ_REASON_T reason, struct vchiq_header *header,
-
- DEBUG_TRACE(SERVICE_CALLBACK_LINE);
- if (wait_for_completion_interruptible(
-- &user_service->remove_event)
-- != 0) {
-+ &user_service->remove_event)) {
- vchiq_log_info(vchiq_arm_log_level,
- "%s interrupted", __func__);
- DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-@@ -850,7 +849,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- break;
- }
- rc = mutex_lock_killable(&instance->state->mutex);
-- if (rc != 0) {
-+ if (rc) {
- vchiq_log_error(vchiq_arm_log_level,
- "vchiq: connect: could not lock mutex for "
- "state %d: %d",
-@@ -874,9 +873,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- void *userdata;
- int srvstate;
-
-- if (copy_from_user
-- (&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ if (copy_from_user(&args, (const void __user *)arg,
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -940,7 +938,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- &(((struct vchiq_create_service __user *)
- arg)->handle),
- (const void *)&service->handle,
-- sizeof(service->handle)) != 0) {
-+ sizeof(service->handle))) {
- ret = -EFAULT;
- vchiq_remove_service(service->handle);
- }
-@@ -1015,9 +1013,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- case VCHIQ_IOC_QUEUE_MESSAGE: {
- struct vchiq_queue_message args;
-
-- if (copy_from_user
-- (&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ if (copy_from_user(&args, (const void __user *)arg,
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -1049,9 +1046,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
- VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
-
-- if (copy_from_user
-- (&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ if (copy_from_user(&args, (const void __user *)arg,
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -1125,7 +1121,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- &(((struct vchiq_queue_bulk_transfer __user *)
- arg)->mode),
- (const void *)&mode_waiting,
-- sizeof(mode_waiting)) != 0)
-+ sizeof(mode_waiting)))
- ret = -EFAULT;
- }
- } break;
-@@ -1140,7 +1136,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- }
-
- if (copy_from_user(&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -1158,7 +1154,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- rc = wait_for_completion_interruptible(
- &instance->insert_event);
- mutex_lock(&instance->completion_mutex);
-- if (rc != 0) {
-+ if (rc) {
- DEBUG_TRACE(AWAIT_COMPLETION_LINE);
- vchiq_log_info(vchiq_arm_log_level,
- "AWAIT_COMPLETION interrupted");
-@@ -1224,7 +1220,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- if (copy_from_user(&msgbuf,
- (const void __user *)
- &args.msgbufs[msgbufcount],
-- sizeof(msgbuf)) != 0) {
-+ sizeof(msgbuf))) {
- if (ret == 0)
- ret = -EFAULT;
- break;
-@@ -1232,7 +1228,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-
- /* Copy the message to user space */
- if (copy_to_user(msgbuf, header,
-- msglen) != 0) {
-+ msglen)) {
- if (ret == 0)
- ret = -EFAULT;
- break;
-@@ -1257,8 +1253,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- (size_t)args.buf + ret *
- sizeof(struct vchiq_completion_data)),
- completion,
-- sizeof(struct vchiq_completion_data))
-- != 0) {
-+ sizeof(struct vchiq_completion_data))) {
- if (ret == 0)
- ret = -EFAULT;
- break;
-@@ -1278,13 +1273,13 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- &((struct vchiq_await_completion *)arg)
- ->msgbufcount,
- &msgbufcount,
-- sizeof(msgbufcount)) != 0) {
-+ sizeof(msgbufcount))) {
- ret = -EFAULT;
- }
- }
- }
-
-- if (ret != 0)
-+ if (ret)
- complete(&instance->remove_event);
- mutex_unlock(&instance->completion_mutex);
- DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-@@ -1296,9 +1291,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- struct vchiq_header *header;
-
- DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-- if (copy_from_user
-- (&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ if (copy_from_user(&args, (const void __user *)arg,
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -1384,7 +1378,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- struct vchiq_config config;
-
- if (copy_from_user(&args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -1403,9 +1397,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- case VCHIQ_IOC_SET_SERVICE_OPTION: {
- struct vchiq_set_service_option args;
-
-- if (copy_from_user(
-- &args, (const void __user *)arg,
-- sizeof(args)) != 0) {
-+ if (copy_from_user(&args, (const void __user *)arg,
-+ sizeof(args))) {
- ret = -EFAULT;
- break;
- }
-@@ -2329,8 +2322,7 @@ vchiq_keepalive_thread_func(void *v)
- while (1) {
- long rc = 0, uc = 0;
-
-- if (wait_for_completion_interruptible(&arm_state->ka_evt)
-- != 0) {
-+ if (wait_for_completion_interruptible(&arm_state->ka_evt)) {
- vchiq_log_error(vchiq_susp_log_level,
- "%s interrupted", __func__);
- flush_signals(current);
-@@ -3011,7 +3003,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
- vchiq_log_info(vchiq_susp_log_level, "%s %s resume "
- "blocked - waiting...", __func__, entity);
- if (wait_for_completion_killable(
-- &arm_state->resume_blocker) != 0) {
-+ &arm_state->resume_blocker)) {
- vchiq_log_error(vchiq_susp_log_level, "%s %s "
- "wait for resume blocker interrupted",
- __func__, entity);
-@@ -3060,7 +3052,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
- vchiq_log_info(vchiq_susp_log_level, "%s %s wait for resume",
- __func__, entity);
- if (wait_for_completion_killable(
-- &arm_state->vc_resume_complete) != 0) {
-+ &arm_state->vc_resume_complete)) {
- vchiq_log_error(vchiq_susp_log_level, "%s %s wait for "
- "resume interrupted", __func__, entity);
- ret = VCHIQ_ERROR;
-@@ -3505,13 +3497,13 @@ static int vchiq_probe(struct platform_device *pdev)
- platform_set_drvdata(pdev, drvdata);
-
- err = vchiq_platform_init(pdev, &g_state);
-- if (err != 0)
-+ if (err)
- goto failed_platform_init;
-
- cdev_init(&vchiq_cdev, &vchiq_fops);
- vchiq_cdev.owner = THIS_MODULE;
- err = cdev_add(&vchiq_cdev, vchiq_devid, 1);
-- if (err != 0) {
-+ if (err) {
- vchiq_log_error(vchiq_arm_log_level,
- "Unable to register device");
- goto failed_platform_init;
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
-index e87e6619695e..1640906e3929 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
-@@ -41,7 +41,7 @@ void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback)
- {
- connected_init();
-
-- if (mutex_lock_killable(&g_connected_mutex) != 0)
-+ if (mutex_lock_killable(&g_connected_mutex))
- return;
-
- if (g_connected)
-@@ -76,7 +76,7 @@ void vchiq_call_connected_callbacks(void)
-
- connected_init();
-
-- if (mutex_lock_killable(&g_connected_mutex) != 0)
-+ if (mutex_lock_killable(&g_connected_mutex))
- return;
-
- for (i = 0; i < g_num_deferred_callbacks; i++)
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-index 44bfa890e0e5..44f0eb64952a 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-@@ -800,7 +800,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- WARN_ON(!(stride <= VCHIQ_SLOT_SIZE));
-
- if (!(flags & QMFLAGS_NO_MUTEX_LOCK) &&
-- (mutex_lock_killable(&state->slot_mutex) != 0))
-+ mutex_lock_killable(&state->slot_mutex))
- return VCHIQ_RETRY;
-
- if (type == VCHIQ_MSG_DATA) {
-@@ -812,8 +812,8 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- return VCHIQ_ERROR;
- }
-
-- WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK |
-- QMFLAGS_NO_MUTEX_UNLOCK)) != 0);
-+ WARN_ON(flags & (QMFLAGS_NO_MUTEX_LOCK |
-+ QMFLAGS_NO_MUTEX_UNLOCK));
-
- if (service->closing) {
- /* The service has been closed */
-@@ -874,7 +874,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- return VCHIQ_RETRY;
- if (service->closing)
- return VCHIQ_ERROR;
-- if (mutex_lock_killable(&state->slot_mutex) != 0)
-+ if (mutex_lock_killable(&state->slot_mutex))
- return VCHIQ_RETRY;
- if (service->srvstate != VCHIQ_SRVSTATE_OPEN) {
- /* The service has been closed */
-@@ -912,8 +912,8 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
- header, size, VCHIQ_MSG_SRCPORT(msgid),
- VCHIQ_MSG_DSTPORT(msgid));
-
-- WARN_ON((flags & (QMFLAGS_NO_MUTEX_LOCK |
-- QMFLAGS_NO_MUTEX_UNLOCK)) != 0);
-+ WARN_ON(flags & (QMFLAGS_NO_MUTEX_LOCK |
-+ QMFLAGS_NO_MUTEX_UNLOCK));
-
- callback_result =
- copy_message_data(copy_callback, context,
-@@ -1040,8 +1040,8 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service,
-
- local = state->local;
-
-- if ((VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_RESUME) &&
-- (mutex_lock_killable(&state->sync_mutex) != 0))
-+ if (VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_RESUME &&
-+ mutex_lock_killable(&state->sync_mutex))
- return VCHIQ_RETRY;
-
- remote_event_wait(&state->sync_release_event, &local->sync_release);
-@@ -1718,8 +1718,7 @@ parse_rx_slots(struct vchiq_state *state)
- &service->bulk_rx : &service->bulk_tx;
-
- DEBUG_TRACE(PARSE_LINE);
-- if (mutex_lock_killable(
-- &service->bulk_mutex) != 0) {
-+ if (mutex_lock_killable(&service->bulk_mutex)) {
- DEBUG_TRACE(PARSE_LINE);
- goto bail_not_ready;
- }
-@@ -2523,7 +2522,7 @@ do_abort_bulks(struct vchiq_service *service)
- VCHIQ_STATUS_T status;
-
- /* Abort any outstanding bulk transfers */
-- if (mutex_lock_killable(&service->bulk_mutex) != 0)
-+ if (mutex_lock_killable(&service->bulk_mutex))
- return 0;
- abort_outstanding_bulks(service, &service->bulk_tx);
- abort_outstanding_bulks(service, &service->bulk_rx);
-@@ -3038,7 +3037,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
- queue = (dir == VCHIQ_BULK_TRANSMIT) ?
- &service->bulk_tx : &service->bulk_rx;
-
-- if (mutex_lock_killable(&service->bulk_mutex) != 0) {
-+ if (mutex_lock_killable(&service->bulk_mutex)) {
- status = VCHIQ_RETRY;
- goto error_exit;
- }
-@@ -3052,8 +3051,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
- status = VCHIQ_RETRY;
- goto error_exit;
- }
-- if (mutex_lock_killable(&service->bulk_mutex)
-- != 0) {
-+ if (mutex_lock_killable(&service->bulk_mutex)) {
- status = VCHIQ_RETRY;
- goto error_exit;
- }
-@@ -3081,7 +3079,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
-
- /* The slot mutex must be held when the service is being closed, so
- claim it here to ensure that isn't happening */
-- if (mutex_lock_killable(&state->slot_mutex) != 0) {
-+ if (mutex_lock_killable(&state->slot_mutex)) {
- status = VCHIQ_RETRY;
- goto cancel_bulk_error_exit;
- }
-diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
-index 2bb9120883fd..f217b78d95a0 100644
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
-@@ -86,7 +86,7 @@ static ssize_t debugfs_log_write(struct file *file,
- if (count >= DEBUGFS_WRITE_BUF_SIZE)
- count = DEBUGFS_WRITE_BUF_SIZE;
-
-- if (copy_from_user(kbuf, buffer, count) != 0)
-+ if (copy_from_user(kbuf, buffer, count))
- return -EFAULT;
- kbuf[count - 1] = 0;
-
-@@ -151,7 +151,7 @@ static ssize_t debugfs_trace_write(struct file *file,
- VCHIQ_INSTANCE_T instance = f->private;
- char firstchar;
-
-- if (copy_from_user(&firstchar, buffer, 1) != 0)
-+ if (copy_from_user(&firstchar, buffer, 1))
- return -EFAULT;
-
- switch (firstchar) {
diff --git a/configs/fedora/generic/CONFIG_ADF4371 b/configs/fedora/generic/CONFIG_ADF4371
new file mode 100644
index 000000000..0d7d09dd1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ADF4371
@@ -0,0 +1 @@
+# CONFIG_ADF4371 is not set
diff --git a/configs/fedora/generic/CONFIG_ASIX_PHY b/configs/fedora/generic/CONFIG_ASIX_PHY
deleted file mode 100644
index 37bb545c7..000000000
--- a/configs/fedora/generic/CONFIG_ASIX_PHY
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ASIX_PHY is not set
diff --git a/configs/fedora/generic/CONFIG_BT_HCIBTUSB_MTK b/configs/fedora/generic/CONFIG_BT_HCIBTUSB_MTK
new file mode 100644
index 000000000..a01298616
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_BT_HCIBTUSB_MTK
@@ -0,0 +1 @@
+# CONFIG_BT_HCIBTUSB_MTK is not set
diff --git a/configs/fedora/generic/CONFIG_CROS_EC_ISHTP b/configs/fedora/generic/CONFIG_CROS_EC_ISHTP
new file mode 100644
index 000000000..6859fde66
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_CROS_EC_ISHTP
@@ -0,0 +1 @@
+CONFIG_CROS_EC_ISHTP=m
diff --git a/configs/fedora/generic/CONFIG_DPS310 b/configs/fedora/generic/CONFIG_DPS310
new file mode 100644
index 000000000..1a46ce6c0
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DPS310
@@ -0,0 +1 @@
+# CONFIG_DPS310 is not set
diff --git a/configs/fedora/generic/CONFIG_EXTCON_FSA9480 b/configs/fedora/generic/CONFIG_EXTCON_FSA9480
new file mode 100644
index 000000000..d1cee17ac
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EXTCON_FSA9480
@@ -0,0 +1 @@
+# CONFIG_EXTCON_FSA9480 is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING
new file mode 100644
index 000000000..21018ddd5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING
@@ -0,0 +1 @@
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
diff --git a/configs/fedora/generic/CONFIG_GVE b/configs/fedora/generic/CONFIG_GVE
new file mode 100644
index 000000000..26aadc46d
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_GVE
@@ -0,0 +1 @@
+CONFIG_GVE=m
diff --git a/configs/fedora/generic/CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE b/configs/fedora/generic/CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE
new file mode 100644
index 000000000..0dc07c886
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE
@@ -0,0 +1 @@
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
diff --git a/configs/fedora/generic/CONFIG_NET_ACT_CT b/configs/fedora/generic/CONFIG_NET_ACT_CT
new file mode 100644
index 000000000..93f4c486e
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_ACT_CT
@@ -0,0 +1 @@
+CONFIG_NET_ACT_CT=m
diff --git a/configs/fedora/generic/CONFIG_NET_ACT_CTINFO b/configs/fedora/generic/CONFIG_NET_ACT_CTINFO
new file mode 100644
index 000000000..e17224c15
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_ACT_CTINFO
@@ -0,0 +1 @@
+CONFIG_NET_ACT_CTINFO=m
diff --git a/configs/fedora/generic/CONFIG_NET_ACT_MPLS b/configs/fedora/generic/CONFIG_NET_ACT_MPLS
new file mode 100644
index 000000000..18907e3e9
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_ACT_MPLS
@@ -0,0 +1 @@
+CONFIG_NET_ACT_MPLS=m
diff --git a/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM b/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM
new file mode 100644
index 000000000..7564ccf63
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM
@@ -0,0 +1 @@
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
diff --git a/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_SPI b/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_SPI
new file mode 100644
index 000000000..08b4d6091
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_DSA_VITESSE_VSC73XX_SPI
@@ -0,0 +1 @@
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
diff --git a/configs/fedora/generic/CONFIG_NET_VENDOR_GOOGLE b/configs/fedora/generic/CONFIG_NET_VENDOR_GOOGLE
new file mode 100644
index 000000000..e9bdb7cf1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_VENDOR_GOOGLE
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_GOOGLE=y
diff --git a/configs/fedora/generic/CONFIG_NFT_BRIDGE_META b/configs/fedora/generic/CONFIG_NFT_BRIDGE_META
new file mode 100644
index 000000000..93dbf6fa7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NFT_BRIDGE_META
@@ -0,0 +1 @@
+CONFIG_NFT_BRIDGE_META=m
diff --git a/configs/fedora/generic/CONFIG_NFT_SYNPROXY b/configs/fedora/generic/CONFIG_NFT_SYNPROXY
new file mode 100644
index 000000000..c0fa9ecc0
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NFT_SYNPROXY
@@ -0,0 +1 @@
+CONFIG_NFT_SYNPROXY=m
diff --git a/configs/fedora/generic/CONFIG_NF_CONNTRACK_BRIDGE b/configs/fedora/generic/CONFIG_NF_CONNTRACK_BRIDGE
new file mode 100644
index 000000000..fe3080043
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_CONNTRACK_BRIDGE
@@ -0,0 +1 @@
+CONFIG_NF_CONNTRACK_BRIDGE=m
diff --git a/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU b/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU
new file mode 100644
index 000000000..2ac3f31c1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU
@@ -0,0 +1 @@
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
diff --git a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..be81f38c4
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+# CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/configs/fedora/generic/CONFIG_NXP_TJA11XX_PHY b/configs/fedora/generic/CONFIG_NXP_TJA11XX_PHY
new file mode 100644
index 000000000..37d64a891
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NXP_TJA11XX_PHY
@@ -0,0 +1 @@
+# CONFIG_NXP_TJA11XX_PHY is not set
diff --git a/configs/fedora/generic/CONFIG_PHY_MIXEL_MIPI_DPHY b/configs/fedora/generic/CONFIG_PHY_MIXEL_MIPI_DPHY
new file mode 100644
index 000000000..dddc3c0bd
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_PHY_MIXEL_MIPI_DPHY
@@ -0,0 +1 @@
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
diff --git a/configs/fedora/generic/CONFIG_PHY_QCOM_PCIE2 b/configs/fedora/generic/CONFIG_PHY_QCOM_PCIE2
new file mode 100644
index 000000000..69c59e99a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_PHY_QCOM_PCIE2
@@ -0,0 +1 @@
+# CONFIG_PHY_QCOM_PCIE2 is not set
diff --git a/configs/fedora/generic/CONFIG_SCSI_FDOMAIN_PCI b/configs/fedora/generic/CONFIG_SCSI_FDOMAIN_PCI
new file mode 100644
index 000000000..7b92818ed
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SCSI_FDOMAIN_PCI
@@ -0,0 +1 @@
+CONFIG_SCSI_FDOMAIN_PCI=m
diff --git a/configs/fedora/generic/CONFIG_SENSORS_IRPS5401 b/configs/fedora/generic/CONFIG_SENSORS_IRPS5401
new file mode 100644
index 000000000..c16243880
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSORS_IRPS5401
@@ -0,0 +1 @@
+# CONFIG_SENSORS_IRPS5401 is not set
diff --git a/configs/fedora/generic/CONFIG_SENSORS_PXE1610 b/configs/fedora/generic/CONFIG_SENSORS_PXE1610
new file mode 100644
index 000000000..7d12a457c
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSORS_PXE1610
@@ -0,0 +1 @@
+# CONFIG_SENSORS_PXE1610 is not set
diff --git a/configs/fedora/generic/CONFIG_STMMAC_SELFTESTS b/configs/fedora/generic/CONFIG_STMMAC_SELFTESTS
new file mode 100644
index 000000000..00676e6b8
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_STMMAC_SELFTESTS
@@ -0,0 +1 @@
+# CONFIG_STMMAC_SELFTESTS is not set
diff --git a/configs/fedora/generic/CONFIG_TEST_BLACKHOLE_DEV b/configs/fedora/generic/CONFIG_TEST_BLACKHOLE_DEV
new file mode 100644
index 000000000..6243b331d
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_TEST_BLACKHOLE_DEV
@@ -0,0 +1 @@
+# CONFIG_TEST_BLACKHOLE_DEV is not set
diff --git a/configs/fedora/generic/CONFIG_XILINX_AXI_EMAC b/configs/fedora/generic/CONFIG_XILINX_AXI_EMAC
new file mode 100644
index 000000000..9b5486d39
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XILINX_AXI_EMAC
@@ -0,0 +1 @@
+# CONFIG_XILINX_AXI_EMAC is not set
diff --git a/configs/fedora/generic/CONFIG_XILINX_SDFEC b/configs/fedora/generic/CONFIG_XILINX_SDFEC
new file mode 100644
index 000000000..5de693e98
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XILINX_SDFEC
@@ -0,0 +1 @@
+# CONFIG_XILINX_SDFEC is not set
diff --git a/configs/fedora/generic/CONFIG_XILINX_XADC b/configs/fedora/generic/CONFIG_XILINX_XADC
new file mode 100644
index 000000000..c9b967ad1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XILINX_XADC
@@ -0,0 +1 @@
+# CONFIG_XILINX_XADC is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_64BIT b/configs/fedora/generic/arm/aarch64/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX b/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_XILINX
index 46ccaba73..46ccaba73 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NET_VENDOR_XILINX
+++ b/configs/fedora/generic/arm/armv7/CONFIG_NET_VENDOR_XILINX
diff --git a/configs/fedora/generic/s390x/CONFIG_64BIT b/configs/fedora/generic/s390x/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/configs/fedora/generic/s390x/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC b/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC
new file mode 100644
index 000000000..4bd669a69
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_WILCO_EC=m
diff --git a/configs/fedora/generic/x86/CONFIG_WILCO_EC b/configs/fedora/generic/x86/CONFIG_WILCO_EC
new file mode 100644
index 000000000..e54fe6e50
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_WILCO_EC
@@ -0,0 +1 @@
+CONFIG_WILCO_EC=m
diff --git a/configs/fedora/generic/x86/CONFIG_WILCO_EC_DEBUGFS b/configs/fedora/generic/x86/CONFIG_WILCO_EC_DEBUGFS
new file mode 100644
index 000000000..2e46a6371
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_WILCO_EC_DEBUGFS
@@ -0,0 +1 @@
+# CONFIG_WILCO_EC_DEBUGFS is not set
diff --git a/configs/fedora/generic/x86/CONFIG_WILCO_EC_EVENTS b/configs/fedora/generic/x86/CONFIG_WILCO_EC_EVENTS
new file mode 100644
index 000000000..a6d5aaf2e
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_WILCO_EC_EVENTS
@@ -0,0 +1 @@
+# CONFIG_WILCO_EC_EVENTS is not set
diff --git a/configs/fedora/generic/x86/CONFIG_WILCO_EC_TELEMETRY b/configs/fedora/generic/x86/CONFIG_WILCO_EC_TELEMETRY
new file mode 100644
index 000000000..8413a024f
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_WILCO_EC_TELEMETRY
@@ -0,0 +1 @@
+# CONFIG_WILCO_EC_TELEMETRY is not set
diff --git a/configs/fedora/generic/x86/i686/CONFIG_64BIT b/configs/fedora/generic/x86/i686/CONFIG_64BIT
deleted file mode 100644
index 2441d5a81..000000000
--- a/configs/fedora/generic/x86/i686/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_64BIT is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_64BIT b/configs/fedora/generic/x86/x86_64/CONFIG_64BIT
deleted file mode 100644
index 06a94e48b..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_64BIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_64BIT=y
diff --git a/gitrev b/gitrev
index 7ac5ffa18..10c77a95e 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-5450e8a316a64cddcbc15f90733ebc78aa736545
+d7d170a8e357bd9926cc6bfea5c2385c2eac65b2
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2c3387a7f..0f0514fe3 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1,6 +1,5 @@
# arm64
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -128,6 +127,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -382,7 +382,6 @@ CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -730,6 +729,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1073,6 +1073,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1419,6 +1420,7 @@ CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_DRM_AMD_ACP=y
@@ -1734,6 +1736,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1899,6 +1902,7 @@ CONFIG_FSL_DPAA2=y
CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA=y
CONFIG_FSL_EDMA=m
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
CONFIG_FSL_ENETC=m
CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_VF=m
@@ -2046,6 +2050,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2412,6 +2417,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3722,10 +3728,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3780,6 +3789,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3967,6 +3978,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_FARADAY is not set
CONFIG_NET_VENDOR_FREESCALE=y
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -4030,6 +4042,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4119,6 +4132,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4150,6 +4164,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4237,6 +4252,8 @@ CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -4253,6 +4270,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
# CONFIG_OCFS2_FS is not set
@@ -4473,6 +4491,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
CONFIG_PHY_MESON_G12A_USB3_PCIE=m
CONFIG_PHY_MESON_GXL_USB2=m
CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
CONFIG_PHY_MVEBU_A3700_COMPHY=m
CONFIG_PHY_MVEBU_A3700_UTMI=m
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4483,6 +4502,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_APQ8064_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_UFS_14NM=m
@@ -5242,6 +5262,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5402,6 +5423,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5472,6 +5494,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6162,6 +6185,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -6297,6 +6321,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7245,11 +7270,14 @@ CONFIG_XFS_WARN=y
CONFIG_XGENE_PMU=y
CONFIG_XGENE_SLIMPRO_MBOX=m
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILINX_ZYNQMP_DMA=m
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 400c72094..081d90935 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1,6 +1,5 @@
# arm64
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -128,6 +127,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -382,7 +382,6 @@ CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -730,6 +729,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1073,6 +1073,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1411,6 +1412,7 @@ CONFIG_DP83848_PHY=m
CONFIG_DP83867_PHY=m
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
@@ -1726,6 +1728,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1883,6 +1886,7 @@ CONFIG_FSL_DPAA2=y
CONFIG_FSL_DPAA_ETH=m
CONFIG_FSL_DPAA=y
CONFIG_FSL_EDMA=m
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
CONFIG_FSL_ENETC=m
CONFIG_FSL_ENETC_PTP_CLOCK=m
CONFIG_FSL_ENETC_VF=m
@@ -2030,6 +2034,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2396,6 +2401,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3702,10 +3708,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3760,6 +3769,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3947,6 +3958,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_FARADAY is not set
CONFIG_NET_VENDOR_FREESCALE=y
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -4010,6 +4022,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4099,6 +4112,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4130,6 +4144,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4217,6 +4232,8 @@ CONFIG_NUMA=y
CONFIG_NVME_FC=m
# CONFIG_NVMEM_IMX_IIM is not set
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -4233,6 +4250,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
# CONFIG_OCFS2_FS is not set
@@ -4453,6 +4471,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
CONFIG_PHY_MESON_G12A_USB3_PCIE=m
CONFIG_PHY_MESON_GXL_USB2=m
CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
CONFIG_PHY_MVEBU_A3700_COMPHY=m
CONFIG_PHY_MVEBU_A3700_UTMI=m
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4463,6 +4482,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_APQ8064_SATA is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_UFS_14NM=m
@@ -5221,6 +5241,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5381,6 +5402,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5451,6 +5473,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6140,6 +6163,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -6275,6 +6299,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7223,11 +7248,14 @@ CONFIG_XFS_QUOTA=y
CONFIG_XGENE_PMU=y
CONFIG_XGENE_SLIMPRO_MBOX=m
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILINX_ZYNQMP_DMA=m
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 625b61aa9..6fdd374c3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -98,6 +98,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -378,7 +379,6 @@ CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
CONFIG_ARM_ZYNQ_CPUIDLE=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -735,6 +735,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1069,6 +1070,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1418,6 +1420,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_DRM_AMD_ACP=y
@@ -1770,6 +1773,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_MAX8997=m
@@ -1933,6 +1937,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -2079,6 +2084,7 @@ CONFIG_GREENASIA_FF=y
CONFIG_GS_FPGABOOT=m
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2444,6 +2450,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3814,10 +3821,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3872,6 +3882,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -4059,6 +4071,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_FARADAY is not set
CONFIG_NET_VENDOR_FREESCALE=y
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -4121,6 +4134,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4210,6 +4224,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4241,6 +4256,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4326,6 +4342,7 @@ CONFIG_NVEC_POWER=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
@@ -4342,6 +4359,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OABI_COMPAT is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
@@ -4589,6 +4607,7 @@ CONFIG_PHY_MESON_G12A_USB3_PCIE=m
# CONFIG_PHY_MESON_GXL_USB2 is not set
CONFIG_PHY_MESON_GXL_USB3=m
CONFIG_PHY_MIPHY28LP=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_MVEBU_A3700_COMPHY is not set
# CONFIG_PHY_MVEBU_A3700_UTMI is not set
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4600,6 +4619,7 @@ CONFIG_PHY_MVEBU_SATA=y
CONFIG_PHY_PXA_USB=m
CONFIG_PHY_QCOM_APQ8064_SATA=m
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_UFS_14NM=m
@@ -5396,6 +5416,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5556,6 +5577,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5627,6 +5649,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6412,6 +6435,7 @@ CONFIG_STM32_WATCHDOG=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
CONFIG_STMPE_I2C=y
CONFIG_STMPE_SPI=y
@@ -6557,6 +6581,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7569,10 +7594,12 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_EMACLITE=m
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_XILINX_XADC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f78fced3a..72ca86a9c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -98,6 +98,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -365,7 +366,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -713,6 +713,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1038,6 +1039,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1379,6 +1381,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_DRM_AMD_ACP=y
@@ -1705,6 +1708,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_MAX8997=m
@@ -1867,6 +1871,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -2002,6 +2007,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2362,6 +2368,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3685,10 +3692,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3743,6 +3753,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3929,6 +3941,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3967,6 +3980,7 @@ CONFIG_NET_VENDOR_TEHUTI=y
CONFIG_NET_VENDOR_TI=y
CONFIG_NET_VENDOR_VIA=y
# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
# CONFIG_NET_VENDOR_XIRCOM is not set
CONFIG_NET_VRF=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -3990,6 +4004,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4079,6 +4094,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4110,6 +4126,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4193,6 +4210,8 @@ CONFIG_NULL_TTY=m
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -4208,6 +4227,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OABI_COMPAT is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
@@ -4424,6 +4444,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
CONFIG_PHY_MESON_G12A_USB3_PCIE=m
# CONFIG_PHY_MESON_GXL_USB2 is not set
CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_MVEBU_A3700_COMPHY is not set
# CONFIG_PHY_MVEBU_A3700_UTMI is not set
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4433,6 +4454,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_UFS_14NM=m
CONFIG_PHY_QCOM_UFS=m
# CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -5151,6 +5173,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5309,6 +5332,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5379,6 +5403,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6092,6 +6117,7 @@ CONFIG_STM32_WATCHDOG=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
CONFIG_STPMIC1_WATCHDOG=m
CONFIG_STRICT_DEVMEM=y
@@ -6234,6 +6260,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7197,11 +7224,14 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
# CONFIG_XILINX_ZYNQMP_DMA is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index d88e63b23..b8f176bae 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -98,6 +98,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -365,7 +366,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -713,6 +713,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1038,6 +1039,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1372,6 +1374,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
@@ -1698,6 +1701,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_MAX8997=m
@@ -1852,6 +1856,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1987,6 +1992,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2347,6 +2353,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3666,10 +3673,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3724,6 +3734,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3910,6 +3922,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3948,6 +3961,7 @@ CONFIG_NET_VENDOR_TEHUTI=y
CONFIG_NET_VENDOR_TI=y
CONFIG_NET_VENDOR_VIA=y
# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_XILINX=y
# CONFIG_NET_VENDOR_XIRCOM is not set
CONFIG_NET_VRF=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -3971,6 +3985,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4060,6 +4075,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4091,6 +4107,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4174,6 +4191,8 @@ CONFIG_NULL_TTY=m
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVMEM_SYSFS=y
@@ -4189,6 +4208,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OABI_COMPAT is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
@@ -4405,6 +4425,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
CONFIG_PHY_MESON_G12A_USB3_PCIE=m
# CONFIG_PHY_MESON_GXL_USB2 is not set
CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_MVEBU_A3700_COMPHY is not set
# CONFIG_PHY_MVEBU_A3700_UTMI is not set
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4414,6 +4435,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_UFS_14NM=m
CONFIG_PHY_QCOM_UFS=m
# CONFIG_PHY_QCOM_USB_HSIC is not set
@@ -5131,6 +5153,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5289,6 +5312,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5359,6 +5383,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6071,6 +6096,7 @@ CONFIG_STM32_WATCHDOG=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
CONFIG_STPMIC1_WATCHDOG=m
CONFIG_STRICT_DEVMEM=y
@@ -6213,6 +6239,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7176,11 +7203,14 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
# CONFIG_XILINX_ZYNQMP_DMA is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6ed530b27..5b11c676e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -98,6 +98,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -378,7 +379,6 @@ CONFIG_ARM_VIRT_EXT=y
CONFIG_ARM=y
CONFIG_ARM_ZYNQ_CPUIDLE=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -735,6 +735,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -1069,6 +1070,7 @@ CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1411,6 +1413,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
@@ -1763,6 +1766,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
CONFIG_EXTCON_GPIO=m
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_MAX8997=m
@@ -1918,6 +1922,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -2064,6 +2069,7 @@ CONFIG_GREENASIA_FF=y
CONFIG_GS_FPGABOOT=m
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2429,6 +2435,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3795,10 +3802,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3853,6 +3863,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -4040,6 +4052,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_FARADAY is not set
CONFIG_NET_VENDOR_FREESCALE=y
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -4102,6 +4115,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -4191,6 +4205,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -4222,6 +4237,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4307,6 +4323,7 @@ CONFIG_NVEC_POWER=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_STM32_ROMEM=m
CONFIG_NVMEM_SUNXI_SID=m
@@ -4323,6 +4340,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OABI_COMPAT is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
@@ -4570,6 +4588,7 @@ CONFIG_PHY_MESON_G12A_USB3_PCIE=m
# CONFIG_PHY_MESON_GXL_USB2 is not set
CONFIG_PHY_MESON_GXL_USB3=m
CONFIG_PHY_MIPHY28LP=m
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_MVEBU_A3700_COMPHY is not set
# CONFIG_PHY_MVEBU_A3700_UTMI is not set
CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4581,6 +4600,7 @@ CONFIG_PHY_MVEBU_SATA=y
CONFIG_PHY_PXA_USB=m
CONFIG_PHY_QCOM_APQ8064_SATA=m
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
CONFIG_PHY_QCOM_UFS_14NM=m
@@ -5376,6 +5396,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -5536,6 +5557,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
# CONFIG_SENSORS_ISL68137 is not set
@@ -5607,6 +5629,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
@@ -6391,6 +6414,7 @@ CONFIG_STM32_WATCHDOG=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
CONFIG_STMMAC_PLATFORM=m
+# CONFIG_STMMAC_SELFTESTS is not set
# CONFIG_STMPE_ADC is not set
CONFIG_STMPE_I2C=y
CONFIG_STMPE_SPI=y
@@ -6536,6 +6560,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -7548,10 +7573,12 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_EMACLITE=m
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_XILINX_XADC=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cf154711c..a185b0d4c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1,6 +1,5 @@
# i386
# CONFIG_60XX_WDT is not set
-# CONFIG_64BIT is not set
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -134,6 +133,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -254,7 +254,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
@@ -585,6 +584,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -878,6 +878,7 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1197,6 +1198,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
@@ -1496,6 +1498,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
CONFIG_EXTCON_INTEL_INT3496=m
# CONFIG_EXTCON_MAX3355 is not set
@@ -1661,6 +1664,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1798,6 +1802,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2163,6 +2168,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_KFIFO_BUF=m
@@ -3436,10 +3442,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3494,6 +3503,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3679,6 +3690,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3742,6 +3754,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3832,6 +3845,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3863,6 +3877,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3947,6 +3962,8 @@ CONFIG_NTB_SWITCHTEC=m
CONFIG_NULL_TTY=m
# CONFIG_NUMA is not set
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3961,6 +3978,7 @@ CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
CONFIG_NVRAM=y
CONFIG_NV_TCO=m
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -4167,9 +4185,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHYSICAL_ALIGN=0x400000
@@ -4642,6 +4662,7 @@ CONFIG_RTC_DRV_SD3078=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WILCO_EC=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_ZYNQMP is not set
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
@@ -4757,6 +4778,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4920,6 +4942,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4992,6 +5015,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5623,6 +5647,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5726,6 +5751,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6531,6 +6557,10 @@ CONFIG_WIL6210=m
# CONFIG_WIL6210_TRACING is not set
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILCO_EC_DEBUGFS is not set
+# CONFIG_WILCO_EC_EVENTS is not set
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_TELEMETRY is not set
CONFIG_WILINK_PLATFORM_DATA=y
# CONFIG_WIMAX is not set
CONFIG_WINBOND_840=m
@@ -6678,12 +6708,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 28c6517ad..264055984 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1,6 +1,5 @@
# i386
# CONFIG_60XX_WDT is not set
-# CONFIG_64BIT is not set
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -134,6 +133,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -253,7 +253,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
@@ -584,6 +583,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -877,6 +877,7 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
@@ -1188,6 +1189,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
@@ -1487,6 +1489,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
CONFIG_EXTCON_INTEL_INT3496=m
# CONFIG_EXTCON_MAX3355 is not set
@@ -1644,6 +1647,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1781,6 +1785,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2146,6 +2151,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_KFIFO_BUF=m
@@ -3417,10 +3423,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3475,6 +3484,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3660,6 +3671,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3723,6 +3735,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3813,6 +3826,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3844,6 +3858,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3928,6 +3943,8 @@ CONFIG_NTB_SWITCHTEC=m
CONFIG_NULL_TTY=m
# CONFIG_NUMA is not set
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3942,6 +3959,7 @@ CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
CONFIG_NVRAM=y
CONFIG_NV_TCO=m
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -4148,9 +4166,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHYSICAL_ALIGN=0x400000
@@ -4622,6 +4642,7 @@ CONFIG_RTC_DRV_SD3078=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WILCO_EC=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_ZYNQMP is not set
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
@@ -4737,6 +4758,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4900,6 +4922,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4972,6 +4995,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5602,6 +5626,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5705,6 +5730,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6510,6 +6536,10 @@ CONFIG_WIL6210=m
# CONFIG_WIL6210_TRACING is not set
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILCO_EC_DEBUGFS is not set
+# CONFIG_WILCO_EC_EVENTS is not set
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_TELEMETRY is not set
CONFIG_WILINK_PLATFORM_DATA=y
# CONFIG_WIMAX is not set
CONFIG_WINBOND_840=m
@@ -6657,12 +6687,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c2c6590f1..371eee80a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -97,6 +97,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -198,7 +199,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -523,6 +523,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -815,6 +816,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_RPMSG=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -1108,6 +1110,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_DRM_AMD_ACP=y
@@ -1359,6 +1362,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1512,6 +1516,7 @@ CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1634,6 +1639,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -1972,6 +1978,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_KFIFO_BUF=m
@@ -3162,10 +3169,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3220,6 +3230,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3404,6 +3416,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3466,6 +3479,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3555,6 +3569,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3586,6 +3601,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3670,6 +3686,8 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3683,6 +3701,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -3858,9 +3877,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_TUSB1210 is not set
@@ -4457,6 +4478,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4608,6 +4630,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4678,6 +4701,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5250,6 +5274,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5352,6 +5377,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6198,12 +6224,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
# CONFIG_XILINX_EMACLITE is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 870135512..da5d046d5 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -97,6 +97,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -197,7 +198,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -522,6 +522,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -814,6 +815,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_RPMSG=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -1099,6 +1101,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
@@ -1350,6 +1353,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1495,6 +1499,7 @@ CONFIG_FSI_OCC=m
CONFIG_FSI_SBEFIFO=m
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1617,6 +1622,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -1955,6 +1961,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_KFIFO_BUF=m
@@ -3141,10 +3148,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3199,6 +3209,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3383,6 +3395,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3445,6 +3458,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3534,6 +3548,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3565,6 +3580,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3649,6 +3665,8 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3662,6 +3680,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -3837,9 +3856,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_TUSB1210 is not set
@@ -4435,6 +4456,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4586,6 +4608,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4656,6 +4679,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5227,6 +5251,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5329,6 +5354,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6175,12 +6201,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
# CONFIG_XILINX_EMACLITE is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 123ba9a23..03174bed3 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1,6 +1,5 @@
# s390
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -98,6 +97,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -203,7 +203,6 @@ CONFIG_ARCH_RANDOM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -528,6 +527,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -822,6 +822,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_RPMSG=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -1115,6 +1116,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
CONFIG_DRM_AMD_ACP=y
@@ -1367,6 +1369,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1512,6 +1515,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1631,6 +1635,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -1952,6 +1957,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
# CONFIG_IIO is not set
@@ -3134,10 +3140,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3192,6 +3201,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3377,6 +3388,7 @@ CONFIG_NET_VENDOR_CADENCE=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3437,6 +3449,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3526,6 +3539,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3557,6 +3571,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3642,6 +3657,8 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3655,6 +3672,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -3826,9 +3844,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_TUSB1210 is not set
@@ -4410,6 +4430,7 @@ CONFIG_SCSI_DH=y
CONFIG_SCSI_ENCLOSURE=m
# CONFIG_SCSI_ESAS2R is not set
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4556,6 +4577,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4626,6 +4648,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5191,6 +5214,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5291,6 +5315,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6142,11 +6167,14 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
# CONFIG_XILLYBUS is not set
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6ce1ea437..e3e6af3f4 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1,6 +1,5 @@
# s390
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -98,6 +97,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -202,7 +202,6 @@ CONFIG_ARCH_RANDOM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
CONFIG_ASYNC_RAID6_TEST=m
@@ -527,6 +526,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -821,6 +821,7 @@ CONFIG_CRC_CCITT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_ISHTP=m
# CONFIG_CROS_EC_LIGHTBAR is not set
CONFIG_CROS_EC_RPMSG=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
@@ -1106,6 +1107,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_DRM_AMD_ACP=y
@@ -1358,6 +1360,7 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
# CONFIG_EXTCON_MAX3355 is not set
# CONFIG_EXTCON_PTN5150 is not set
@@ -1495,6 +1498,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1614,6 +1618,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -1935,6 +1940,7 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
# CONFIG_IIO is not set
@@ -3113,10 +3119,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3171,6 +3180,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3356,6 +3367,7 @@ CONFIG_NET_VENDOR_CADENCE=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3416,6 +3428,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3505,6 +3518,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3536,6 +3550,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3621,6 +3636,8 @@ CONFIG_NUMA_BALANCING=y
CONFIG_NUMA_EMU=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3634,6 +3651,7 @@ CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
# CONFIG_NVRAM is not set
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -3805,9 +3823,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
# CONFIG_PHY_TUSB1210 is not set
@@ -4388,6 +4408,7 @@ CONFIG_SCSI_DH=y
CONFIG_SCSI_ENCLOSURE=m
# CONFIG_SCSI_ESAS2R is not set
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4534,6 +4555,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -4604,6 +4626,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5168,6 +5191,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5268,6 +5292,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6119,11 +6144,14 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
# CONFIG_XILLYBUS is not set
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 71afc5168..3496b97ce 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1,6 +1,5 @@
# x86_64
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -138,6 +137,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -257,7 +257,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARM64_ERRATUM_858921=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
@@ -593,6 +592,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -892,6 +892,7 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
CONFIG_CROS_EC_DEBUGFS=m
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_LPC=m
# CONFIG_CROS_EC_LPC_MEC is not set
@@ -1241,6 +1242,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
CONFIG_DRAGONRISE_FF=y
CONFIG_DRBD_FAULT_INJECTION=y
@@ -1542,6 +1544,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
CONFIG_EXTCON_INTEL_CHT_WC=m
CONFIG_EXTCON_INTEL_INT3496=m
@@ -1703,6 +1706,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1837,6 +1841,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2207,6 +2212,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3482,10 +3488,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3540,6 +3549,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3725,6 +3736,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3788,6 +3800,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3878,6 +3891,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3909,6 +3923,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -4004,6 +4019,8 @@ CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4018,6 +4035,7 @@ CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
CONFIG_NVRAM=y
CONFIG_NV_TCO=m
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -4212,9 +4230,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -4688,6 +4708,7 @@ CONFIG_RTC_DRV_SD3078=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WILCO_EC=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_ZYNQMP is not set
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
@@ -4805,6 +4826,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4967,6 +4989,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -5039,6 +5062,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5680,6 +5704,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5783,6 +5808,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6592,6 +6618,10 @@ CONFIG_WIL6210=m
# CONFIG_WIL6210_TRACING is not set
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILCO_EC_DEBUGFS is not set
+# CONFIG_WILCO_EC_EVENTS is not set
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_TELEMETRY is not set
CONFIG_WILINK_PLATFORM_DATA=y
# CONFIG_WIMAX is not set
CONFIG_WINBOND_840=m
@@ -6734,12 +6764,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_WARN=y
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 9f87bcb03..4fa6168ed 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1,6 +1,5 @@
# x86_64
# CONFIG_60XX_WDT is not set
-CONFIG_64BIT=y
CONFIG_6LOWPAN_DEBUGFS=y
CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
@@ -138,6 +137,7 @@ CONFIG_AD7949=m
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADE7854 is not set
# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -256,7 +256,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCNET is not set
CONFIG_ARM64_ERRATUM_858921=y
# CONFIG_AS3935 is not set
-# CONFIG_ASIX_PHY is not set
CONFIG_ASUS_LAPTOP=m
CONFIG_ASUS_NB_WMI=m
CONFIG_ASUS_WIRELESS=m
@@ -592,6 +591,7 @@ CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_MTK is not set
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIUART_3WIRE=y
@@ -891,6 +891,7 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_DEBUGFS is not set
CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_LPC=m
# CONFIG_CROS_EC_LPC_MEC is not set
@@ -1232,6 +1233,7 @@ CONFIG_DP83848_PHY=m
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TC811_PHY is not set
CONFIG_DPOT_DAC=m
+# CONFIG_DPS310 is not set
CONFIG_DPTF_POWER=m
CONFIG_DRAGONRISE_FF=y
# CONFIG_DRBD_FAULT_INJECTION is not set
@@ -1533,6 +1535,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXTCON_ADC_JACK is not set
CONFIG_EXTCON_AXP288=m
+# CONFIG_EXTCON_FSA9480 is not set
# CONFIG_EXTCON_GPIO is not set
CONFIG_EXTCON_INTEL_CHT_WC=m
CONFIG_EXTCON_INTEL_INT3496=m
@@ -1686,6 +1689,7 @@ CONFIG_FSI_MASTER_HUB=m
# CONFIG_FSI_SBEFIFO is not set
CONFIG_FSI_SCOM=m
# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
@@ -1820,6 +1824,7 @@ CONFIG_GREENASIA_FF=y
# CONFIG_GS_FPGABOOT is not set
CONFIG_GTP=m
# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GVE=m
# CONFIG_HABANA_AI is not set
CONFIG_HAMACHI=m
CONFIG_HAMRADIO=y
@@ -2190,6 +2195,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
CONFIG_IIO_CROS_EC_BARO=m
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
CONFIG_IIO_CROS_EC_SENSORS=m
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -3463,10 +3469,13 @@ CONFIG_NET_9P_XEN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_CT=m
CONFIG_NET_ACT_GACT=m
CONFIG_NET_ACT_IFE=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_MPLS=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
@@ -3521,6 +3530,8 @@ CONFIG_NET_DSA_TAG_KSZ=m
CONFIG_NET_DSA_TAG_SJA1105=m
CONFIG_NET_DSA_TAG_TRAILER=m
# CONFIG_NET_DSA_VITESSE_VSC73XX is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
+# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
CONFIG_NET_EMATCH_CANID=m
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_IPSET=m
@@ -3706,6 +3717,7 @@ CONFIG_NET_VENDOR_EMULEX=y
# CONFIG_NET_VENDOR_EZCHIP is not set
# CONFIG_NET_VENDOR_FARADAY is not set
# CONFIG_NET_VENDOR_FUJITSU is not set
+CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_HISILICON is not set
# CONFIG_NET_VENDOR_HP is not set
# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -3769,6 +3781,7 @@ CONFIG_NFC_NCI_SPI=m
CONFIG_NFC_NXP_NCI_I2C=m
CONFIG_NFC_NXP_NCI=m
CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
@@ -3859,6 +3872,7 @@ CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NF_TABLES_SET=m
+CONFIG_NFT_BRIDGE_META=m
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NFT_COMPAT=m
# CONFIG_NFT_CONNLIMIT is not set
@@ -3890,6 +3904,7 @@ CONFIG_NFT_REDIR=m
CONFIG_NFT_REJECT_IPV4=m
CONFIG_NFT_REJECT=m
# CONFIG_NFT_SOCKET is not set
+CONFIG_NFT_SYNPROXY=m
# CONFIG_NFT_TPROXY is not set
# CONFIG_NFT_TUNNEL is not set
CONFIG_NFT_XFRM=m
@@ -3985,6 +4000,8 @@ CONFIG_NUMA=y
CONFIG_NVDIMM_DAX=y
CONFIG_NVDIMM_PFN=y
CONFIG_NVME_FC=m
+# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SYSFS=y
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3999,6 +4016,7 @@ CONFIG_NVME_TCP=m
# CONFIG_NVM is not set
CONFIG_NVRAM=y
CONFIG_NV_TCO=m
+# CONFIG_NXP_TJA11XX_PHY is not set
# CONFIG_OCFS2_DEBUG_FS is not set
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
CONFIG_OCFS2_FS=m
@@ -4193,9 +4211,11 @@ CONFIG_PHY_CADENCE_SIERRA=m
CONFIG_PHYLIB=y
CONFIG_PHYLINK=m
# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
# CONFIG_PHY_OCELOT_SERDES is not set
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_QCOM_PCIE2 is not set
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -4668,6 +4688,7 @@ CONFIG_RTC_DRV_SD3078=m
CONFIG_RTC_DRV_STK17TA8=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WILCO_EC=m
CONFIG_RTC_DRV_X1205=m
# CONFIG_RTC_DRV_ZYNQMP is not set
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
@@ -4785,6 +4806,7 @@ CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FDOMAIN_PCI=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_SCSI_GDTH=m
# CONFIG_SCSI_HISI_SAS is not set
@@ -4947,6 +4969,7 @@ CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
# CONFIG_SENSORS_IR38064 is not set
+# CONFIG_SENSORS_IRPS5401 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
# CONFIG_SENSORS_ISL68137 is not set
@@ -5019,6 +5042,7 @@ CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_PXE1610 is not set
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m
@@ -5659,6 +5683,7 @@ CONFIG_STK3310=m
CONFIG_STMMAC_ETH=m
# CONFIG_STMMAC_PCI is not set
# CONFIG_STMMAC_PLATFORM is not set
+# CONFIG_STMMAC_SELFTESTS is not set
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRING_SELFTEST is not set
CONFIG_STRIP_ASM_SYMS=y
@@ -5762,6 +5787,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
# CONFIG_TEST_BITFIELD is not set
# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BLACKHOLE_DEV is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_HASH is not set
@@ -6571,6 +6597,10 @@ CONFIG_WIL6210=m
# CONFIG_WIL6210_TRACING is not set
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
+# CONFIG_WILCO_EC_DEBUGFS is not set
+# CONFIG_WILCO_EC_EVENTS is not set
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_TELEMETRY is not set
CONFIG_WILINK_PLATFORM_DATA=y
# CONFIG_WIMAX is not set
CONFIG_WINBOND_840=m
@@ -6713,12 +6743,15 @@ CONFIG_XFS_QUOTA=y
# CONFIG_XFS_RT is not set
# CONFIG_XFS_WARN is not set
# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_XILINX_AXI_EMAC is not set
# CONFIG_XILINX_DMA is not set
CONFIG_XILINX_GMII2RGMII=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_XILINX_PR_DECOUPLER=m
+# CONFIG_XILINX_SDFEC is not set
CONFIG_XILINX_VCU=m
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_XILINX_XADC is not set
CONFIG_XILLYBUS=m
# CONFIG_XILLYBUS_OF is not set
CONFIG_XILLYBUS_PCIE=m
diff --git a/kernel.spec b/kernel.spec
index f9319af20..ad654d91f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,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
@@ -576,18 +576,12 @@ Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch
Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
-Patch332: bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
-
-Patch333: bcm2835-vchiq-use-interruptible-waits.patch
-
# Tegra bits
Patch340: arm64-tegra-jetson-tx1-fixes.patch
# QCom ACPI device support pieces
Patch350: arm64-qcom-pinctrl-support-for-ACPI.patch
# Patch352: arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch
-Patch353: arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch
-Patch354: arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch
# 400 - IBM (ppc/s390x) patches
@@ -1846,6 +1840,9 @@ fi
#
#
%changelog
+* Fri Jul 12 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git4.1
+- Linux v5.2-7109-gd7d170a8e357
+
* Thu Jul 11 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git3.1
- Linux v5.2-3311-g5450e8a316a6
diff --git a/sources b/sources
index e5e9782e8..92961b8a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
-SHA512 (patch-5.2-git3.xz) = 5bcdce810094d73de28f10c50d7787b891b0dd82923e9a29429e2e50ce2c413dd0e67693e683013520e59a293bc214e1cbae828fa9c8943b5e0c61ecc859a38a
+SHA512 (patch-5.2-git4.xz) = 49c89b27cd228aa71e4d5da49d0d6068dddaba565b33005571fde9530bc441a020ee4d319aea46f87ede049061830ed4f62c47ce153713f77335e2ee0e5cc3de