From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752202AbdBOVI4 (ORCPT <rfc822;w@1wt.eu>);
        Wed, 15 Feb 2017 16:08:56 -0500
Received: from smtp.codeaurora.org ([198.145.29.96]:57104 "EHLO
        smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751328AbdBOVIy (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 15 Feb 2017 16:08:54 -0500
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 50A3F60BDD
Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org
Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=cov@codeaurora.org
Subject: Re: [PATCH v3] tty: pl011: Work around QDF2400 E44 stuck BUSY bit
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Mark Rutland <mark.rutland@arm.com>
References: <20170215180159.11359-1-cov@codeaurora.org>
 <20170215195026.GN31733@leverpostej> <20170215200754.GA23091@kroah.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
From: Christopher Covington <cov@codeaurora.org>
Message-ID: <37d33921-f1c7-3c65-515d-cf25c1d79585@codeaurora.org>
Date: Wed, 15 Feb 2017 16:08:48 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2
MIME-Version: 1.0
In-Reply-To: <20170215200754.GA23091@kroah.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.