From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751613AbdDBX5X (ORCPT ); Sun, 2 Apr 2017 19:57:23 -0400 Received: from ozlabs.org ([103.22.144.67]:48719 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751203AbdDBX4P (ORCPT ); Sun, 2 Apr 2017 19:56:15 -0400 Date: Mon, 3 Apr 2017 09:56:12 +1000 From: Stephen Rothwell To: Maxime Ripard Cc: Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: Updating sunxi tree in linux-next Message-ID: <20170403095603.43cef189@canb.auug.org.au> In-Reply-To: <20170331075729.gsfewphm3zd45vwt@lukather> References: <20170331075729.gsfewphm3zd45vwt@lukather> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Maxime, On Fri, 31 Mar 2017 09:57:29 +0200 Maxime Ripard wrote: > > We've switched from my personal git tree for the Allwinner sunxi > development to a shared tree: > git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git > > The branch to be included in linux-next will still be called > sunxi/for-next as it used to be, and it will still go through the > arm-soc tree to reach Linux. > > However, I'll still have the patches for our DRM drivers on my > personal git repo: > git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git > > Could you add the branch sunxi-drm/for-next to the list of branches > you merge? OK, just so we are on the same page: Currently I have: git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git branch sunxi/for-next merged after the drm tree. You want: git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git branch sunxi/for-next merged after the arm-soc tree and git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git branch sunxi-drm/for-next merged after the drm tree? (I merge trees *after* the tree that is their upstream.) Do you want to be the only contact for both trees? -- Cheers, Stephen Rothwell