linux-kernel - Re: [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 15 Feb 2017 16:08:48 -0500
From:   Christopher Covington <cov@...eaurora.org>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Mark Rutland <mark.rutland@....com>
Cc:     Jonathan Corbet <corbet@....net>,
        Marc Zyngier <marc.zyngier@....com>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will.deacon@....com>, linux-doc@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org,
        Peter Hurley <peter@...leysoftware.com>,
        Aleksey Makarov <aleksey.makarov@...aro.org>,
        Robin Murphy <robin.murphy@....com>,
        linux-kernel@...r.kernel.org, shankerd@...eaurora.org,
        timur@...eaurora.org, "Rafael J. Wysocki" <rjw@...ysocki.net>,
        Len Brown <lenb@...nel.org>,
        Russell King <linux@...linux.org.uk>,
        Jiri Slaby <jslaby@...e.com>, linux-acpi@...r.kernel.org,
        linux-serial@...r.kernel.org, Mark Langsdorf <mlangsdo@...hat.com>,
        Mark Salter <msalter@...hat.com>, Jon Masters <jcm@...hat.com>,
        Neil Leeder <nleeder@...eaurora.org>, nd@....com
Subject: Re: [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit

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.