From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: Updating sunxi tree in linux-next
Date: Mon, 3 Apr 2017 09:56:12 +1000 [thread overview]
Message-ID: <20170403095603.43cef189@canb.auug.org.au> (raw)
In-Reply-To: <20170331075729.gsfewphm3zd45vwt@lukather>
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?
(I merge trees *after* the tree that is their upstream.)
Do you want to be the only contact for both trees?
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-04-02 23:56 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 [this message]
2017-04-03 1:21 ` Chen-Yu Tsai
2017-04-03 11:45 ` Maxime Ripard
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=20170403095603.43cef189@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).