Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1615129

Re: Updating sunxi tree in linux-next

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi Stephen,

On Mon, Apr 03, 2017 at 09:56:12AM +1000, Stephen Rothwell wrote:
> Hi Maxime,
> 
> On Fri, 31 Mar 2017 09:57:29 +0200 Maxime Ripard <maxime.ripard@free-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?

Yep, exactly.

> (I merge trees *after* the tree that is their upstream.)
> 
> 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

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Updating sunxi tree in linux-next Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-03-31 10:00 +0200
  Re: Updating sunxi tree in linux-next Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-03 02:00 +0200
    Re: Updating sunxi tree in linux-next Chen-Yu Tsai <wens@csie.org> - 2017-04-03 03:30 +0200
    Re: Updating sunxi tree in linux-next Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-04-03 13:50 +0200
  Re: Updating sunxi tree in linux-next Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-03 23:50 +0200

csiph-web