From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mathieu Poirier <mathieu.poirier@linaro•org>
Cc: linux-next@vger•kernel.org
Subject: Re: Coresight tree to -next please
Date: Wed, 6 May 2015 00:27:03 +1000 [thread overview]
Message-ID: <20150506002703.3fa4618f@canb.auug.org.au> (raw)
In-Reply-To: <CANLsYkyjBEGJ=L52GWqUPeY5egsceK34phSdFcaoLUxZxxnXfA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1147 bytes --]
Hi Mathieu,
On Tue, 5 May 2015 08:22:20 -0600 Mathieu Poirier <mathieu.poirier@linaro•org> wrote:
>
> On 4 May 2015 at 18:48, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > I used git://git.linaro.org/kernel/coresight.git, and added it from
> > today.
>
> Perfect - did you use the "next" branch?
Yes.
> > Is this tree to be submitted directly to Linus, or via some
> > other tree? (just gives me a clue as to where to positiion it in the
> > merge list)
>
> I take patches in my next tree and about twice per cycle will send a
> tally to GKH for inclusion in his char-misc-next branch. As such when
> he takes my patches there should be some duplication between the
> coresight next branch and his char-misc-next. Do you see this as a
> problem?
It can cause conflicts if you send patches to Greg and keep them in
your tree (if there are further changes to the same files in either
tree). Much better would be to ask him to pull your tree (or a subset)
that way you have the same commits (as opposed to patches) in both
trees.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-05-05 14:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-04 22:19 Coresight tree to -next please Mathieu Poirier
2015-05-05 0:48 ` Stephen Rothwell
2015-05-05 14:22 ` Mathieu Poirier
2015-05-05 14:27 ` Stephen Rothwell [this message]
2015-05-05 14:33 ` Mathieu Poirier
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=20150506002703.3fa4618f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.poirier@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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