From: Jason Cooper <jason@lakedaemon•net>
To: Thierry Reding <thierry.reding@gmail•com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the mvebu tree
Date: Thu, 10 Oct 2013 07:40:46 -0400 [thread overview]
Message-ID: <20131010114046.GE5402@titan.lakedaemon.net> (raw)
In-Reply-To: <20131010105702.GD6735@ulmo.nvidia.com>
On Thu, Oct 10, 2013 at 12:57:03PM +0200, Thierry Reding wrote:
> On Wed, Oct 09, 2013 at 10:37:27AM -0400, Jason Cooper wrote:
> > Thierry,
> >
> > On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote:
> > > Today's linux-next merge of the mvebu tree got conflicts in
> >
> > I looked in your scripts repo, and couldn't find the script you use to
> > send out this email thread :(
>
> Well, that's because I'm doing them manually.
:) Nice. I do like the threading, it provides a nice consolidated
summary of the day's tree.
> > Since I can't create a patch, I'll just ask, could you include the
> > commit id of the branch you pulled in the email?
> >
> > eg:
> >
> > Today's linux-next merge of the mvebu tree (477cdaf) got conflicts in
> > ...
> >
> > I had uploaded a new for-next branch less than 30 minutes before you
> > sent this out, so I wasn't sure which you were working with. Not a big
> > deal, just thought I'd pass along the idea for the next time you're
> > tweaking your scripts.
>
> It should be possible to extend the Next/fetch script with something
> that writes the SHA1 of each tree to a file. Stephen's linux-next trees
> contain such a file (Next/SHA1s). I'll see if I can find the time to
> update my scripts to do the same. That won't make it magically appear in
> the notification email, but I can probably remember to do that in the
> future.
No, not necessary. I don't want to add unnecessary work to your plate.
If the script modification put it in the email notification
automagically, it might be worth doing, but if a tree owner is already
looking at your -next tree, it's trivial to go one step further and look
at the merge commit (which is what I did in this case).
thanks, and sorry for the noise.
Jason.
next prev parent reply other threads:[~2013-10-10 11:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` [PATCH] ipv6: Unbreak build Thierry Reding
2013-10-09 14:41 ` Eric Dumazet
2013-10-10 10:48 ` Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the clk tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 16:56 ` Fabio Estevam
2013-10-09 14:14 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-09 14:21 ` Jason Cooper
2013-10-09 14:37 ` Jason Cooper
2013-10-10 10:57 ` Thierry Reding
2013-10-10 11:40 ` Jason Cooper [this message]
2013-10-09 15:29 ` linux-next: Tree for Oct 9 Guenter Roeck
2013-10-09 15:44 ` Guenter Roeck
2013-10-09 17:55 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-23 8:59 ` Jason Cooper
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=20131010114046.GE5402@titan.lakedaemon.net \
--to=jason@lakedaemon$(echo .)net \
--cc=ezequiel.garcia@free-electrons$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(echo .)com \
--cc=thierry.reding@gmail$(echo .)com \
/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