[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGb2v666uxLLiAo3eQmsM8xe8rGjTMDZCJQZSbZ3DL3u3SucLA@mail.gmail.com>
Date: Mon, 3 Apr 2017 09:21:45 +0800
From: Chen-Yu Tsai <wens@...e.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Maxime Ripard <maxime.ripard@...e-electrons.com>,
Chen-Yu Tsai <wens@...e.org>,
linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: Updating sunxi tree in linux-next
Hi Stephen,
On Mon, Apr 3, 2017 at 7:56 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Maxime,
>
> On Fri, 31 Mar 2017 09:57:29 +0200 Maxime Ripard <maxime.ripard@...e-electrons.com> 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?
Please add me as a contact for sunxi/for-next.
Thanks
ChenYu
> --
> Cheers,
> Stephen Rothwell
Powered by blists - more mailing lists