From: Christopher Covington <cov@codeaurora.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Mark Rutland <mark.rutland@arm.com> Cc: Jonathan Corbet <corbet@lwn.net>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peter Hurley <peter@hurleysoftware.com>, Aleksey Makarov <aleksey.makarov@linaro.org>, Robin Murphy <robin.murphy@arm.com>, linux-kernel@vger.kernel.org, shankerd@codeaurora.org, timur@codeaurora.org, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>, Russell King <linux@armlinux.org.uk>, Jiri Slaby <jslaby@suse.com>, linux-acpi@vger.kernel.org, linux-serial@vger.kernel.org, Mark Langsdorf <mlangsdo@redhat.com>, Mark Salter <msalter@redhat.com>, Jon Masters <jcm@redhat.com>, Neil Leeder <nleeder@codeaurora.org>, nd@arm.com Subject: Re: [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit Date: Wed, 15 Feb 2017 16:08:48 -0500 [thread overview] Message-ID: <37d33921-f1c7-3c65-515d-cf25c1d79585@codeaurora.org> (raw) In-Reply-To: <20170215200754.GA23091@kroah.com> On 02/15/2017 03:07 PM, Greg Kroah-Hartman wrote: > On Wed, Feb 15, 2017 at 07:50:27PM +0000, Mark Rutland wrote: >> On Wed, Feb 15, 2017 at 01:01:59PM -0500, Christopher Covington wrote: >>> Due to known (although trivial) conflicts in silicon-errata.txt, based on >>> http://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/log/?h=for-next/core >> It might be best to split the silicon-errata doc into a separate patch. >> That can go via the arm64 tree without conflict whiel the driver patch >> can go via the tty tree. > > Well, I can't take this as-is because I get conflicts in my tty tree > with the doc, and with the driver itself: > > checking file Documentation/arm64/silicon-errata.txt > Hunk #1 FAILED at 68. > 1 out of 1 hunk FAILED > checking file drivers/acpi/spcr.c > checking file drivers/tty/serial/amba-pl011.c > Hunk #5 FAILED at 2370. > 1 out of 8 hunks FAILED > > I have no idea what the driver conflict is, what branch was this made > against? I'll make the split Mark suggested in v4, basing driver changes on gregkh/tty tty-next unless someone suggests otherwise. (FWIW the previous base was arm64/linux.git for-next/core.) Thanks, Cov -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
WARNING: multiple messages have this Message-ID (diff)
From: cov@codeaurora.org (Christopher Covington) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit Date: Wed, 15 Feb 2017 16:08:48 -0500 [thread overview] Message-ID: <37d33921-f1c7-3c65-515d-cf25c1d79585@codeaurora.org> (raw) In-Reply-To: <20170215200754.GA23091@kroah.com> On 02/15/2017 03:07 PM, Greg Kroah-Hartman wrote: > On Wed, Feb 15, 2017 at 07:50:27PM +0000, Mark Rutland wrote: >> On Wed, Feb 15, 2017 at 01:01:59PM -0500, Christopher Covington wrote: >>> Due to known (although trivial) conflicts in silicon-errata.txt, based on >>> http://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/log/?h=for-next/core >> It might be best to split the silicon-errata doc into a separate patch. >> That can go via the arm64 tree without conflict whiel the driver patch >> can go via the tty tree. > > Well, I can't take this as-is because I get conflicts in my tty tree > with the doc, and with the driver itself: > > checking file Documentation/arm64/silicon-errata.txt > Hunk #1 FAILED at 68. > 1 out of 1 hunk FAILED > checking file drivers/acpi/spcr.c > checking file drivers/tty/serial/amba-pl011.c > Hunk #5 FAILED at 2370. > 1 out of 8 hunks FAILED > > I have no idea what the driver conflict is, what branch was this made > against? I'll make the split Mark suggested in v4, basing driver changes on gregkh/tty tty-next unless someone suggests otherwise. (FWIW the previous base was arm64/linux.git for-next/core.) Thanks, Cov -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2017-02-15 21:08 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-15 18:01 [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit Christopher Covington 2017-02-15 18:01 ` Christopher Covington 2017-02-15 18:44 ` Timur Tabi 2017-02-15 18:44 ` Timur Tabi 2017-02-15 19:50 ` Mark Rutland 2017-02-15 19:50 ` Mark Rutland 2017-02-15 19:50 ` Mark Rutland 2017-02-15 20:07 ` Greg Kroah-Hartman 2017-02-15 20:07 ` Greg Kroah-Hartman 2017-02-15 20:07 ` Greg Kroah-Hartman 2017-02-15 21:08 ` Christopher Covington [this message] 2017-02-15 21:08 ` Christopher Covington
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=37d33921-f1c7-3c65-515d-cf25c1d79585@codeaurora.org \ --to=cov@codeaurora.org \ --cc=aleksey.makarov@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=corbet@lwn.net \ --cc=gregkh@linuxfoundation.org \ --cc=jcm@redhat.com \ --cc=jslaby@suse.com \ --cc=lenb@kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=mlangsdo@redhat.com \ --cc=msalter@redhat.com \ --cc=nd@arm.com \ --cc=nleeder@codeaurora.org \ --cc=peter@hurleysoftware.com \ --cc=rjw@rjwysocki.net \ --cc=robin.murphy@arm.com \ --cc=shankerd@codeaurora.org \ --cc=timur@codeaurora.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.