From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbdDCLpx (ORCPT ); Mon, 3 Apr 2017 07:45:53 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:59272 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751342AbdDCLpw (ORCPT ); Mon, 3 Apr 2017 07:45:52 -0400 Date: Mon, 3 Apr 2017 13:45:50 +0200 From: Maxime Ripard To: Stephen Rothwell 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: <20170403114550.wsubsqgacqdaaqkg@lukather> References: <20170331075729.gsfewphm3zd45vwt@lukather> <20170403095603.43cef189@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hryu6h26tabx2iep" Content-Disposition: inline In-Reply-To: <20170403095603.43cef189@canb.auug.org.au> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --hryu6h26tabx2iep Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Stephen, On Mon, Apr 03, 2017 at 09:56:12AM +1000, Stephen Rothwell wrote: > Hi Maxime, >=20 > 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 > >=20 > > 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. > >=20 > > 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 > >=20 > > Could you add the branch sunxi-drm/for-next to the list of branches > > you merge? >=20 > OK, just so we are on the same page: >=20 > Currently I have: >=20 > git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git branch su= nxi/for-next >=20 > merged after the drm tree. >=20 > You want: >=20 > git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git branch sunx= i/for-next >=20 > merged after the arm-soc tree and >=20 > git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git branch su= nxi-drm/for-next >=20 > merged after the drm tree? Yep, exactly. > (I merge trees *after* the tree that is their upstream.) >=20 > Do you want to be the only contact for both trees? Like Chen-Yu said, please add us both for sunxi/for-next Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --hryu6h26tabx2iep Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJY4jXqAAoJEBx+YmzsjxAgF74P/16LrjpR80lj/tTy5mlCAiZs jHW+6VmFESUpsV6y9f5VA6qHDResgpvdGz0TdNIqRzuuWB2WkhK1TvbSiMNenGQd wvgnsJu/dLL5epsHd015ZhQUEZKMfUNnW1pO7EN4eKQdAq+AqDe7qF2x7Rxg1T8f PnyJihNSysWmrjAyUveMkZWJ2HNnRCqhDyILyHEaaq6XmAaKt7dL5w1wRoLxJ9Tg xk+yzToqbHi51AqoL4cfe6WUhmqAC5JBK0w9mj6T7kb3ocwW2Pir01LV//FzOY1O sqjZYI1ZQVdzjvgrVnjuHC/N4CrkIW7cLRTiNB/iMGjX6KmvKoKA4/7o5oYPnK51 /tC0q8+W9oCUmcbP56dPte0diiQjG9HRvBQ+igOj+BBaTyH/pjsho0ZgPsJ6GHgt uBr3suhLUKuWGKHkNR2iTAWePZwc0xcu9II+EEk0FPQ3HGsbyS7mzpJPXCgNj7aT 02eyah99mzRqF88GkYRZ/mvwhde+zOpDZyuKyni87AnL/JwaWJk7Ctd1+MrOGBH5 jKrx4VnNV78C4pMpU47phCIvicdY+soEhx2sEj/TA/3n3+LdHgS7OIBE0Kp691oo 8+qv6Kf1K9gNYf+wj3j2XLPKMbsm5FMds03SLICR6C4uMsKHdl9HWnvR3vmVV93z Rulek6ujjX9l7zMcJi6U =4jWM -----END PGP SIGNATURE----- --hryu6h26tabx2iep--