From owner-svn-src-all@FreeBSD.ORG Wed May 14 00:07:58 2014 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C41F8134; Wed, 14 May 2014 00:07:58 +0000 (UTC) Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org [204.13.248.72]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 969552F2C; Wed, 14 May 2014 00:07:58 +0000 (UTC) Received: from c-24-8-230-52.hsd1.co.comcast.net ([24.8.230.52] helo=damnhippie.dyndns.org) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WkMjl-000Oel-4S; Wed, 14 May 2014 00:07:57 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id s4E07sTf035719; Tue, 13 May 2014 18:07:54 -0600 (MDT) (envelope-from ian@FreeBSD.org) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 24.8.230.52 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19mD768Tjg8d3CJH0NTYbTw Subject: Re: svn commit: r265973 - stable/10/sys/dev/uart From: Ian Lepore To: Sergey Kandaurov In-Reply-To: References: <201405131909.s4DJ90Cc040529@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Tue, 13 May 2014 18:07:54 -0600 Message-ID: <1400026074.56626.18.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-10@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 00:07:58 -0000 On Tue, 2014-05-13 at 23:35 +0400, Sergey Kandaurov wrote: > On 13 May 2014 23:09, Ian Lepore wrote: > > Author: ian > > Date: Tue May 13 19:09:00 2014 > > New Revision: 265973 > > URL: http://svnweb.freebsd.org/changeset/base/265973 > > > > Log: > > MFC r257111, r257144, r257157, r257183 > > > > Test UARTs physical address instead of virtual. > > > > Be a bit more flexible in how we find the console from the properties on > > /chosen, following the list of allowed console properties in ePAPR. Also > > do not require that stdin be defined and equal to stdout: stdin is > > nonstandard (for ePAPR) and console in an unexpected place is after all > > better than no console. > > > > Modified: > > stable/10/sys/dev/uart/uart_cpu_fdt.c > > > > Taking random commit of your merge series: all of them miss svn:mergeinfo. > Thanks. A combo of a misunderstanding on my part and a poorly written helper script caused this. (I wrote another script to help me fix it, I sure hope I got that one right) At least you let me know before it got too out of hand... I have over 400 ARM-related changesets to merge still. -- Ian