diff --git a/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch deleted file mode 100644 index a57781800..000000000 --- a/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch +++ /dev/null @@ -1,138 +0,0 @@ -From patchwork Sun Dec 23 20:59:17 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 10741809 -Return-Path: - -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 2E9B66C2 - for ; - Sun, 23 Dec 2018 21:00:35 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BF3B28783 - for ; - Sun, 23 Dec 2018 21:00:35 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id 0FE412878E; Sun, 23 Dec 2018 21:00:35 +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 B7EB128783 - for ; - Sun, 23 Dec 2018 21:00:34 +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=0Cfst0aavwq2BzhOoJiKH5s4NpJ/Us+GjXPJ4zrLsg0=; b=ZZ4 - op3YV27iZX0UKzSqXuUq2LaE+MP3aEAQmT8Rdvb/NFFHbn+wqbOszDRj6XW3ajga4pCSwUf3L4gvo - ZheL4Sb+6+oiR1HdK8EBuDjmzKY1qn/zgS8gwvVv6TSbD2Bz8Lw0hQ/tW2MwUuIDngXtzfUoFvHrp - wADpWDQf/OcQj2dRuqMLquQTkjTnYDP94Ml87y52NZhbu9+9n3h0+0X7oerCqM/RLjCwl9atrORaV - DAWfKL1pif2kz0UoT1x6vjaOmbSa3NqSXmUo+2dM64jUixp5JllINpIuIDUX2KNTo2pRF3og+BnsP - 8TFZ0aIA+N69i6dOIQTBKCcJIb86Jjw==; -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 1gbArL-0005Ta-RL; Sun, 23 Dec 2018 21:00:27 +0000 -Received: from mout.kundenserver.de ([212.227.126.131]) - by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gbArH-0004QG-NL - for linux-arm-kernel@lists.infradead.org; Sun, 23 Dec 2018 21:00:25 +0000 -Received: from localhost.localdomain ([37.4.249.153]) by - mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) - id 1MSZDt-1gz0AW3YfB-00SsKG; Sun, 23 Dec 2018 21:59:57 +0100 -From: Stefan Wahren -To: Al Cooper , Adrian Hunter , - Ulf Hansson -Subject: [PATCH 1/2] mmc: sdhci-iproc: handle mmc_of_parse() errors during - probe -Date: Sun, 23 Dec 2018 21:59:17 +0100 -Message-Id: <1545598758-4502-1-git-send-email-stefan.wahren@i2se.com> -X-Mailer: git-send-email 2.7.4 -X-Provags-ID: V03:K1:FsBhp74NqgbMckX6QGEkM7zbuM0fjnbtNqB9c5GjfSu+JG+zOVC - nt6p6+TF28Gk+lb0VFAh2hNrWHdwlR1sqk5ygcbOiXLgQ93PecRf9Zl130rJ7qR4Km04fzv - AR0JypQ0XgjJ+nia824FdeQ9oO4xRynoGH5q7Raco0HsIMewr0syOybYSJgsqI5UUptIo+5 - FhdCMrpIfxuFpRh23naog== -X-UI-Out-Filterresults: notjunk:1;V03:K0:7uvqm/6Tn2w=:qedwftyLF+r+WaFGRyzPKR - vItrffDfG7f534X5qt1icf/24c6TYj93h3+1AKvP593z2hpmJxIemKNrdRT7/zXPP+Ipke8UQ - I08zvqpRa5wcGU3iO0jQaPt/WU58GkdmjkiuWzotVkbcj4+NuMi4iMPfiAMd1VdT5ouv2omWI - /7S/9AqsTnPbNYo+5i1oNsSFDmrxWvlKZC9K+Ab8vTe8J9L+wUiRCWFHsOr0C9lC1J3MRHbgZ - OPX3nnGBLnuKcWjrMJyIjqsNOJ2w89xWpOFvNfsPTrVhHX/xApgyQQcbDBXvwgMh709QJowTD - 88M4HvgmrK3Ah0BS164aJZtufA38R7Fpay/nQ6hojx7BKV6OM712L+vkkzNuK4MrfQKtQeiv5 - sf7mvN2YqPw13dJxC70+a8u2MvwhX7Udha2YtQJT7ZhcqlIYkVb4HoDJ565iYqAe/jp9npFjh - 3wPekqu1cY3V/0rhdWVETv/Atcchi598SE0RS4cL8/C7Z189r2wCrohPWDDedc8/AmF+J9y4N - 2lAHyAmq7u7IUBkxmYHzFu+KvE6jVNgVFm6mB21lO2gHqTIz6toyP36igFPxPp0FZrigwqCWb - Ot1jt/Ep+g9ykC8xjM36X5RKjfDrAOpgwSb+FWRqaablXguW1xgCC2weNx8PjENo21hCxHNgG - 2jSstrMAZFww3b39FzyTblcT3LcsuU6JOjyIMPCApzh0y7wgI+VVT+y3jyezQpszpAxbbdYnS - WH896vn09u7vjjjfG9zlqROWkG+q3ZLGfxrm4gRjo5HnJF78W1Fq11QIq0U= -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20181223_130024_058181_62761026 -X-CRM114-Status: GOOD ( 14.51 ) -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.21 -Precedence: list -List-Id: -List-Unsubscribe: - , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: - , - -Cc: Stefan Wahren , - Florian Fainelli , - Scott Branden , - Ray Jui , linux-mmc@vger.kernel.org, - stable@vger.kernel.org, - Eric Anholt , bcm-kernel-feedback-list@broadcom.com, - Gregory Fong , - Brian Norris , - linux-arm-kernel@lists.infradead.org -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Sender: "linux-arm-kernel" -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -X-Virus-Scanned: ClamAV using ClamSMTP - -We need to handle mmc_of_parse() errors during probe. - -This finally fixes the wifi regression on Raspberry Pi 3 series. -In error case the wifi chip was permanently in reset because of -the power sequence depending on the deferred probe of the GPIO expander. - -Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") -Cc: stable@vger.kernel.org -Signed-off-by: Stefan Wahren ---- - drivers/mmc/host/sdhci-iproc.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index 0db9905..9d12c06 100644 ---- a/drivers/mmc/host/sdhci-iproc.c -+++ b/drivers/mmc/host/sdhci-iproc.c -@@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) - - iproc_host->data = iproc_data; - -- mmc_of_parse(host->mmc); -+ ret = mmc_of_parse(host->mmc); -+ if (ret) -+ goto err; -+ - sdhci_get_property(pdev); - - host->mmc->caps |= iproc_host->data->mmc_caps; diff --git a/kernel.spec b/kernel.spec index 191fee1fa..3b62e915e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,9 +69,9 @@ Summary: The Linux kernel # Work around for major version bump %define upstream_sublevel 0 # The rc snapshot level -%global rcrev 3 +%global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -124,7 +124,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -428,7 +428,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %endif # Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz -Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc3.tar.gz +Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc4.tar.gz Source11: x509.genkey Source12: remove-binary-diff.pl @@ -579,9 +579,6 @@ Patch306: arm-sdhci-esdhc-imx-fixes.patch # Initall support for the 3A+ Patch330: bcm2837-dts-add-Raspberry-Pi-3-A.patch -# https://patchwork.kernel.org/patch/10741809/ -Patch331: bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch - # https://www.spinics.net/lists/arm-kernel/msg699583.html Patch332: ARM-dts-bcm283x-Several-DTS-improvements.patch @@ -1879,6 +1876,10 @@ fi # # %changelog +* Mon Jan 28 2019 Laura Abbott - 5.0.0-0.rc4.git0.1 +- Linux v5.0-rc4 +- Disable debugging options. + * Wed Jan 23 2019 Laura Abbott - 5.0.0-0.rc3.git1.1 - Linux v5.0-rc3-53-g333478a7eb21 diff --git a/sources b/sources index bff49dea5..94529db28 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (linux-5.0-rc3.tar.gz) = 4af12c1918c35635ce35e0fd51af36d9c9aa24a79eeab0c5889b7abb12b8feedcdcaa1969f45ab421a371046898e1676d266f38e7dacffb7240d501566e03ce2 -SHA512 (patch-5.0-rc3-git1.xz) = caf337615fd24a1b2cfe106cca310c08d86ced32f01da3274625e68e43df00392eda0829037736c17b0dab3c47cb3649be73599cdd655ea05af0c8aa5edfb410 +SHA512 (linux-5.0-rc4.tar.gz) = bc7431fd672e4a96c466ec108a17a692b617f60914924ba7fa635d901f632a0b25d067d427eaff4195e3e7c6c5d6269aff3c896854cd5a42a31f6b830c693f0f