linux-kernel - Re: Updating sunxi tree in linux-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170403114550.wsubsqgacqdaaqkg@lukather>
Date:   Mon, 3 Apr 2017 13:45:50 +0200
From:   Maxime Ripard <maxime.ripard@...e-electrons.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Chen-Yu Tsai <wens@...e.org>, linux-arm-kernel@...ts.infradead.org,
        linux-kernel@...r.kernel.org
Subject: Re: Updating sunxi tree in linux-next

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@...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?

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

Download attachment "signature.asc" of type "application/pgp-signature" (802 bytes)