diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-03-01 07:57:08 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-03-01 07:58:25 -0800 |
| commit | 3a9b20b346214a5b463b2e8a8ab35d0721f67bfa (patch) | |
| tree | 4b9d3614dcbb6c4d60127bd4e37cf7bf3c512e80 | |
| parent | 51f1cbdea98a8b36de6daa5b0f2dfb6b26647a4d (diff) | |
| download | kernel-3a9b20b346214a5b463b2e8a8ab35d0721f67bfa.tar.gz kernel-3a9b20b346214a5b463b2e8a8ab35d0721f67bfa.tar.xz kernel-3a9b20b346214a5b463b2e8a8ab35d0721f67bfa.zip | |
Linux v4.10-10770-g2d6be4a
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch | 52 |
4 files changed, 61 insertions, 3 deletions
@@ -1 +1 @@ -86292b33d4b79ee03e2f43ea0381ef85f077c760 +2d6be4abf514fc26c83d239c7f31da1f95e4a31d diff --git a/kernel.spec b/kernel.spec index 1b933af01..73f2a3204 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -599,6 +599,9 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch #rhbz 1427593 Patch666: ccm-stack.patch +# grabbed from mailing list +Patch667: v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch + # END OF PATCH DEFINITIONS %endif @@ -2163,6 +2166,9 @@ fi # # %changelog +* Wed Mar 01 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git7.1 +- Linux v4.10-10770-g2d6be4a + * Wed Mar 1 2017 Peter Robinson <pbrobinson@fedoraproject.org> - Enable Tiny DRM on ARM platforms - ARM config updates @@ -1,3 +1,3 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 -SHA512 (patch-4.10-git6.xz) = 66803a6214e6f09379e82be51a3c1ef771e7357efb44fdbd4b77cf5654adc4b12efd3f7d97ecddc3c6ae4886118cb3d064dabb2637f2b7e648898d79671683c8 +SHA512 (patch-4.10-git7.xz) = a1b1a02964417fca4d131be78f5881a53b6c1b54aef0a847aff1cd8108cd8681ce2bac92e8ea6cc24e2a474b7f801f0021bfd15c4b8e940462dffa6dc9c35af7 diff --git a/v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch b/v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch new file mode 100644 index 000000000..50ab8a415 --- /dev/null +++ b/v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch @@ -0,0 +1,52 @@ +From patchwork Wed Mar 1 15:23:02 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v3] Revert "tty: serial: pl011: add ttyAMA for matching pl011 + console" +From: Aleksey Makarov <aleksey.makarov@linaro.org> +X-Patchwork-Id: 9598601 +Message-Id: <20170301152304.29635-1-aleksey.makarov@linaro.org> +To: linux-serial@vger.kernel.org +Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, + Aleksey Makarov <aleksey.makarov@linaro.org>, + Sudeep Holla <sudeep.holla@arm.com>, + Greg Kroah-Hartman <gregkh@linuxfoundation.org>, + Peter Hurley <peter@hurleysoftware.com>, + Russell King <linux@armlinux.org.uk>, Jiri Slaby <jslaby@suse.com>, + Robin Murphy <robin.murphy@arm.com> +Date: Wed, 1 Mar 2017 18:23:02 +0300 + +The original patch makes the condition always true, so it is wrong. + +It masks (but not fixes) the bug described in the commit message +but introduces a regression (no console is selected by SPCR) +in regular (no 'console=ttyAMA') case. + +s/||/&&/ would not fix the problem as the root cause was identified +incorrectly. + +This reverts commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b. + +Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org> +--- + +v3: fix commit message (Robin Murphy) +v2: add Signed-off-by: + + drivers/tty/serial/amba-pl011.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c +index 8789ea423ccf..56f92d7348bf 100644 +--- a/drivers/tty/serial/amba-pl011.c ++++ b/drivers/tty/serial/amba-pl011.c +@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, + if (strcmp(name, "qdf2400_e44") == 0) { + pr_info_once("UART: Working around QDF2400 SoC erratum 44"); + qdf2400_e44_present = true; +- } else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) { ++ } else if (strcmp(name, "pl011") != 0) { + return -ENODEV; + } + |