Linux 2.6.35-rc1

Linux 2.6.35-rc1

[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?

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

Re: Linux 2.6.35-rc1

[Jesper Nilsson]

On Sun, May 30, 2010 at 11:11:09PM +0200, Linus Torvalds wrote:
> 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(-)

> 			Linus

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com

Re: Linux 2.6.35-rc1

[Linus Torvalds]

On Mon, 31 May 2010, Jesper Nilsson wrote:
> 
> 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

Re: Linux 2.6.35-rc1

[Sedat Dilek]

Hi,

>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.

I am missing the merge of linux-2.6-block.git/for-linus [1], dunno if
there was a pull request for it on LKML.

Kind Regards,
- Sedat -

[1] http://git.kernel.org/?p=linux/kernel/git/axboe/linux-2.6-block.git;a=shortlog;h=refs/heads/for-linus