On 02/15/2017 03:07 PM, Greg Kroah-Hartman wrote:

On Wed, Feb 15, 2017 at 07:50:27PM +0000, Mark Rutland wrote:

quoted

On Wed, Feb 15, 2017 at 01:01:59PM -0500, Christopher Covington wrote:

quoted

quoted

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

quoted

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.