Skip to contentSkip to conversation

Linux 2.6.35-rc1

DISCUSSION Linus Torvalds 2 participants 3 messages May 30, 2010 – Jun 1, 2010

lore
Share & tools
lore
#0 lore raw

It's been two weeks, and so the merge window is closed. There may be a few trees I haven't pulled yet, but the bulk should all be there. And please, let's try to make the merge window mean something this time - don't send me any new pull request unless they are for real regressions or for major bugs, ok?

This time, there are no new filesystems (surprise surprise), but there's certainly been filesystem work both on an individual FS layer (btrfs, cept, cifs, ext4, nfs, ocfs2 and xfs) and at the VFS layer (superblock and quota cleanups in particular).

But as usual, the bulk of the changes are in drivers. About two thirds of all the changes, to be exact. infiniband, networking and staging drivers are the bulk of it, but there's changes all over (drm, sound, media, usb, input layer, you name it).

And what's good to see is that we continue to have very healthy statistics. About 8500 commits (of which 400+ are merges), with about a thousand individual developers involved (git counts 1047, but some of them are bound to be duplicates due to people mis-spelling their names etc). It's skewed, of course - with the median number of commits per person being just three - but I think that's what we want to see in a healthy development environment.

Linus

#1 lore raw
Quoted 5 lines · Linus Torvalds

It's been two weeks, and so the merge window is closed. There may be a few trees I haven't pulled yet, but the bulk should all be there. And please, let's try to make the merge window mean something this time - don't send me any new pull request unless they are for real regressions or for major bugs, ok?

I'm missing the CRIS tree changes, however, it seems to be me that screwed up here, my new computer was misconfigured for outgoing mail, so the request probably never reached you. Sorry about that.

Of the changes, the "mask_irq" one is still a candidate since it fixes a compile error.

The following changes since commit 1d16b0f2f3edf05f12a9e3960588e0d4854157bb:
Linus Torvalds (1):

        Merge branch 'for-linus' of git://git.kernel.org/.../lrg/voltage-2.6

are available in the git repository at:

git://www.jni.nu/cris.git for-linus

Arnd Bergmann (1):
cris: push down BKL into some device drivers

Jesper Nilsson (6):
CRISv32: Remove duplicated Kconfig items.
CRISv32: Fix RS485 port 4 CD Kconfig item.
CRISv10: Trivial fixes.
CRISv10: Whitespace fixes for hw_settings.S
CRIS: Simplify param.h by simply including <asm-generic/param.h>
CRIS: Don't use mask_irq as symbol name

 arch/cris/arch-v10/drivers/ds1302.c   |   20 +++++++++++++++-----
 arch/cris/arch-v10/drivers/pcf8563.c  |   19 +++++++++++++++----
 arch/cris/arch-v10/kernel/irq.c       |    8 ++++----
 arch/cris/arch-v10/lib/dmacopy.c      |   15 +++++++--------
 arch/cris/arch-v10/lib/hw_settings.S  |   14 ++++++--------
 arch/cris/arch-v32/drivers/Kconfig    |   16 +---------------
 arch/cris/arch-v32/drivers/i2c.c      |   22 ++++++++++++++--------
 arch/cris/arch-v32/drivers/pcf8563.c  |   21 ++++++++++++++++-----
 arch/cris/arch-v32/kernel/crisksyms.c |    4 ++--
 arch/cris/arch-v32/kernel/irq.c       |   14 ++++++--------
 arch/cris/arch-v32/kernel/smp.c       |    4 ++--
 arch/cris/include/arch-v10/arch/irq.h |    9 +++++----
 arch/cris/include/arch-v32/arch/irq.h |    4 ++--
 arch/cris/include/asm/param.h         |   17 ++---------------
 14 files changed, 97 insertions(+), 90 deletions(-)
Quoted 1 line

Linus

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
#2 lore raw
Quoted 7 lines · Jesper Nilsson

I'm missing the CRIS tree changes, however, it seems to be me that screwed up here, my new computer was misconfigured for outgoing mail, so the request probably never reached you. Sorry about that.

Of the changes, the "mask_irq" one is still a candidate since it fixes a compile error.

Ok, I'll take them, since while it's late it's all in arch/cris. And if you broke it, you get to keep both pieces, and I can't really claim to care too deeply ;)

Linus