* Re: Linux 3.3-1 out - merge window closed
2012-01-20 4:14 ` Linux 3.3-1 out - merge window closed Stephen Rothwell
@ 2012-01-20 17:41 ` Steven Rostedt
2012-01-20 20:15 ` Junio C Hamano
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Steven Rostedt @ 2012-01-20 17:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linus Torvalds, Linux Kernel Mailing List, linux-next
On Fri, Jan 20, 2012 at 03:14:52PM +1100, Stephen Rothwell wrote:
>
> This leaves 1174 commits (13%) in v3.3-rc1 that were not in next-20120106
> for some reason (not too bad really, I guess). Some will clearly be bug
> fixes, of course. Some will be quilt trees (probably rebased before
> being sent to Linus). Some will be patches that depend on work by others.
Well, 19 of those were ktest patches. Although it's not something we
need to worry about, as it's just a script for users to test their
kernels and not something that would conflict with others. I'll send out
that email to get ktest included into linux-next regardless.
Thanks!
-- Steve
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Linux 3.3-1 out - merge window closed
2012-01-20 4:14 ` Linux 3.3-1 out - merge window closed Stephen Rothwell
2012-01-20 17:41 ` Steven Rostedt
@ 2012-01-20 20:15 ` Junio C Hamano
2012-01-22 10:35 ` Geert Uytterhoeven
2012-01-26 9:48 ` Andrew Morton
3 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2012-01-20 20:15 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: Stephen Rothwell, Linus Torvalds, linux-next
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> On Thu, 19 Jan 2012 15:58:28 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>>
>> (Stats for those that like them: 20% arch updates (arm, power, mips,
>> x86), 60% drivers (networking - wireless in particular, staging,
>> media, dri, sound, misc - including getting rid of 'struct sysdev'),
>> and 20% random stuff: filesystems, networking, perf etc)
>
> More stats for the bored:
>
> (I don't count merge commits below and everything is relative to v3.2)
Even more stats for the really bored:
(I count only merge commits below and everything is relative to v3.2)
There are 171 merges by Linus, merging 174 side branches (there were two
Octopus merges, one merging two and the other merging three topics), 35
among which are pulling signed tags (20%).
No lieutenant pulled signed tags from his or her contributors.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Linux 3.3-1 out - merge window closed
2012-01-20 4:14 ` Linux 3.3-1 out - merge window closed Stephen Rothwell
2012-01-20 17:41 ` Steven Rostedt
2012-01-20 20:15 ` Junio C Hamano
@ 2012-01-22 10:35 ` Geert Uytterhoeven
2012-01-26 9:48 ` Andrew Morton
3 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2012-01-22 10:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linus Torvalds, Linux Kernel Mailing List, linux-next
On Fri, Jan 20, 2012 at 05:14, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 19 Jan 2012 15:58:28 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>> (Stats for those that like them: 20% arch updates (arm, power, mips,
>> x86), 60% drivers (networking - wireless in particular, staging,
>> media, dri, sound, misc - including getting rid of 'struct sysdev'),
>> and 20% random stuff: filesystems, networking, perf etc)
>
> More stats for the bored:
>
> (I don't count merge commits below and everything is relative to v3.2)
>
> Of the 8899 commits in v3.3-rc1, 6918 were in next-20120106 (the first
> -next based on v3.2). A further 792 commits have the same subject line as
> commits in next-20120116 and a further 16 have the same patch-id.
>
> This leaves 1174 commits (13%) in v3.3-rc1 that were not in next-20120106
> for some reason (not too bad really, I guess). Some will clearly be bug
> fixes, of course. Some will be quilt trees (probably rebased before
> being sent to Linus). Some will be patches that depend on work by others.
Even more stats for the bored (more details in "Build regressions/improvements
in v3.3-rc1"): 80 new build errors were introduced.
(Un?)fortunately not all of them can be attributed to the changesets
that skipped
-next, as I know of several that affected the builds I'm most
interested in in -next.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Linux 3.3-1 out - merge window closed
2012-01-20 4:14 ` Linux 3.3-1 out - merge window closed Stephen Rothwell
` (2 preceding siblings ...)
2012-01-22 10:35 ` Geert Uytterhoeven
@ 2012-01-26 9:48 ` Andrew Morton
3 siblings, 0 replies; 5+ messages in thread
From: Andrew Morton @ 2012-01-26 9:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linus Torvalds, Linux Kernel Mailing List, linux-next
On Fri, 20 Jan 2012 15:14:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Thu, 19 Jan 2012 15:58:28 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
> >
> > (Stats for those that like them: 20% arch updates (arm, power, mips,
> > x86), 60% drivers (networking - wireless in particular, staging,
> > media, dri, sound, misc - including getting rid of 'struct sysdev'),
> > and 20% random stuff: filesystems, networking, perf etc)
>
> More stats for the bored:
>
> (I don't count merge commits below and everything is relative to v3.2)
>
> Of the 8899 commits in v3.3-rc1, 6918 were in next-20120106 (the first
> -next based on v3.2). A further 792 commits have the same subject line as
> commits in next-20120116 and a further 16 have the same patch-id.
>
> This leaves 1174 commits (13%) in v3.3-rc1 that were not in next-20120106
> for some reason (not too bad really, I guess).
That's a lot. Please name names!
I was impacted by several busted patches which had not appeared in
-next.
Also, I saw numerous patches which were significantly altered during
their trip from -next to mainline, which is cheating. These showed up
as a massive reject storm when I attempted to git-merge linus-now with
next-from-12-hours-ago. I went in and checked. tools/perf was a major
culprit.
> Some will clearly be bug
> fixes, of course. Some will be quilt trees (probably rebased before
> being sent to Linus). Some will be patches that depend on work by others.
The quilt trees would have been eliminated by the "commits have the
same subject line" test?
I don't think this is all a huuuge problem - we sort this stuff out
fairly quickly. But things could be improved a bit.
^ permalink raw reply [flat|nested] 5+ messages in thread