From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755356AbcIEPpQ (ORCPT ); Mon, 5 Sep 2016 11:45:16 -0400 Received: from mga03.intel.com ([134.134.136.65]:56736 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754635AbcIEPpM (ORCPT ); Mon, 5 Sep 2016 11:45:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,287,1470726000"; d="scan'208";a="1035692637" Date: Mon, 5 Sep 2016 21:23:21 +0530 From: Vinod Koul To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nandor Han , Dave Jiang Subject: Re: linux-next: manual merge of the tty tree with the slave-dma tree Message-ID: <20160905155321.GT9355@localhost> References: <20160905164321.4dd8801b@canb.auug.org.au> <20160905112802.GJ9355@localhost> <20160905113333.GA27586@kroah.com> <20160905124305.GQ9355@localhost> <20160905135541.GA13403@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160905135541.GA13403@kroah.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 On Mon, Sep 05, 2016 at 03:55:41PM +0200, Greg KH wrote: > On Mon, Sep 05, 2016 at 06:13:05PM +0530, Vinod Koul wrote: > > > > Stephen, > > > > > > > > The fix looks right to me. > > > > > > > > Greg let me know if you would like me to merge this to avoid conflict > > > > > > Sure, which way do you want to merge, do you want me to pull your tree > > > into mine, or do you want to pull my tree into yours? Either is fine > > > with me. > > > > Great, I would prefer to pull. > > Do you want a signed tag, or do you just want to pull my tty-next branch > directly into your tree? Signed tag would be better Thanks -- ~Vinod