From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751018Ab1IUOIW (ORCPT ); Wed, 21 Sep 2011 10:08:22 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:50155 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766Ab1IUOIV (ORCPT ); Wed, 21 Sep 2011 10:08:21 -0400 X-Sasl-enc: jp+kM1JLVM4llS+QaSUFtJdNtPvGVqU2v6/VqDpwJ2A8 1316614100 Date: Wed, 21 Sep 2011 07:06:23 -0700 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hector Martin , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, Andre Heider , Geoff Levand Subject: Re: linux-next: manual merge of the tty tree with the powerpc tree Message-ID: <20110921140623.GA19567@kroah.com> References: <20110921150121.9f530384bc0bb6c2268fd9ea@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110921150121.9f530384bc0bb6c2268fd9ea@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got conflicts in > arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between > commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the > powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR > embedded hypervisor byte channel driver") from the tty tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thanks, that looks fine to me. greg k-h