Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753491Ab3JANxd (ORCPT ); Tue, 1 Oct 2013 09:53:33 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:52041 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995Ab3JANxc (ORCPT ); Tue, 1 Oct 2013 09:53:32 -0400 Date: Tue, 1 Oct 2013 06:53:36 -0700 From: Greg Kroah-Hartman To: Thierry Reding Cc: Paul Mundt , Simon Horman , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the sh tree Message-ID: <20131001135336.GB19805@kroah.com> References: <20131001110344.GA20249@ulmo.nvidia.com> <1380625644-11331-7-git-send-email-treding@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1380625644-11331-7-git-send-email-treding@nvidia.com> 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 Content-Length: 603 Lines: 17 On Tue, Oct 01, 2013 at 01:07:23PM +0200, Thierry Reding wrote: > Today's linux-next merge of the sh tree got conflicts in > > arch/sh/kernel/cpu/sh2a/Makefile > drivers/tty/serial/sh-sci.c > include/linux/serial_sci.h > > I fixed them up (see below). Please check if the resolution looks correct. Looks correct to me, thanks for doing this. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/