From: Nicholas Mc Guire <der.herr@hofr.at>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: process question - linux-next conflicts
Date: Tue, 5 Jul 2016 17:42:51 +0000 [thread overview]
Message-ID: <20160705174251.GA20939@osadl.at> (raw)
In-Reply-To: <20160705233634.55d802c3@canb.auug.org.au>
On Tue, Jul 05, 2016 at 11:36:34PM +1000, Stephen Rothwell wrote:
> Hi Nicholas,
>
> On Tue, 5 Jul 2016 13:01:24 +0000 Nicholas Mc Guire <der.herr@hofr.at> wrote:
> >
> > linux-next daily tree mails include information on conflicts like
> >
> > "The drm-misc tree gained a conflict against Linus' tree."
> >
> > and if one looks at these email-reported conflicts they are quite
> > inffrequent, e.g. March 2016 range from 0-5 with a mean of about 1.5,
> > but the plots on http://neuling.org/linux-next-size.html for
> > conflicts show significantly higher numbers, again March 2016
> > range between aprox. 10 and 75 with a mean of aprox. 40 - so I´m
> > mixing up something here - are the plots refereing to different
> > conflicts or am I just interpreting the e-mail notes incorectly ?
>
> The graphs show the total number of conflicts you would get if you did
> the merges of all the trees from scratch on any one day. But I only
> report new conflicts each day.
>
thanks - that explains it - what confused me is that the plot never seems
to reach 0 which I would have expected - but I guess that is due to the
fixes you are applying and/or trees that get temporarily dropping trees
that dont resolve conflicts.
thx!
hofrat
prev parent reply other threads:[~2016-07-05 17:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 13:01 process question - linux-next conflicts Nicholas Mc Guire
2016-07-05 13:36 ` Stephen Rothwell
2016-07-05 17:42 ` Nicholas Mc Guire [this message]
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=20160705174251.GA20939@osadl.at \
--to=der.herr@hofr.at \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).