From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chen-Yu Tsai <wens@csie.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: Updating sunxi tree in linux-next
Date: Mon, 3 Apr 2017 13:45:50 +0200 [thread overview]
Message-ID: <20170403114550.wsubsqgacqdaaqkg@lukather> (raw)
In-Reply-To: <20170403095603.43cef189@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
next prev parent reply other threads:[~2017-04-03 11:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 7:57 Updating sunxi tree in linux-next Maxime Ripard
2017-04-02 23:56 ` Stephen Rothwell
2017-04-03 1:21 ` Chen-Yu Tsai
2017-04-03 11:45 ` Maxime Ripard [this message]
2017-04-03 21:40 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170403114550.wsubsqgacqdaaqkg@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox