From: Jesper Nilsson <jesper.nilsson@axis.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
mikael.starvik@axis.com, jesper.nilsson@axis.com
Subject: Re: Linux 2.6.35-rc1
Date: Mon, 31 May 2010 11:46:52 +0200 [thread overview]
Message-ID: <20100531094652.GI5051@axis.com> (raw)
In-Reply-To: <alpine.LFD.2.00.1005301356350.3986@i5.linux-foundation.org>
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
next prev parent reply other threads:[~2010-05-31 9:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-30 21:11 Linux 2.6.35-rc1 Linus Torvalds
2010-05-31 9:46 ` Jesper Nilsson [this message]
2010-06-01 15:51 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2010-05-30 21:25 Sedat Dilek
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=20100531094652.GI5051@axis.com \
--to=jesper.nilsson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mikael.starvik@axis.com \
--cc=torvalds@linux-foundation.org \
/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