From: John Kacur <jkacur@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: RT <linux-rt-users@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Carsten Emde <Carsten.Emde@osadl.org>,
stable@kernel.org, Clark Williams <williams@redhat.com>
Subject: merge of v2.6.33.14 with tip/rt/2.6.33
Date: Wed, 25 May 2011 17:20:29 +0200 [thread overview]
Message-ID: <BANLkTin+PPqSSqwHgo0kE0T2m3k9EKasnA@mail.gmail.com> (raw)
Hi Thomas
I'm still doing some testing but I have merged v2.6.33.14 with my own
v2.6.33.13-rt31 which ultimately comes from tip/rt/2.6.33
I see that Carsten has also already done the same thing.
This can be fetched from
git://git.kernel.org/pub/scm/linux/kernel/git/jkacur/jk-2.6.git rt/2.6.33
What follows is the commit-log
commit aac9a6b18a38b03f0d61a1b64c0a8762b6ad6a5f
Merge: cbbe989 0413500
Author: John Kacur <jkacur@redhat.com>
Date: Wed May 25 15:35:54 2011 +0200
Merge commit 'v2.6.33.14' into rt/2.6.33
* commit 'v2.6.33.14': (23 commits)
Linux 2.6.33.14
vmxnet3: Fix inconsistent LRO state after initialization
megaraid_sas: Sanity check user supplied length before passing it to dma_a
x86, mce, AMD: Fix leaving freed data in a list
x86, apic: Fix spurious error interrupts triggering on all non-boot APs
tick: Clear broadcast active bit when switching to oneshot
clocksource: Install completely before selecting
x86, AMD: Fix ARAT feature setting again
Revert "x86, AMD: Fix APIC timer erratum 400 affecting K8 Rev.A-E processo
cifs: add fallback in is_path_accessible for old servers
fixes for using make 3.82
zorro8390: Fix regression caused during net_device_ops conversion
libertas: fix cmdpendingq locking
hydra: Fix regression caused during net_device_ops conversion
ne-h8300: Fix regression caused during net_device_ops conversion
NET: slip, fix ldisc->open retval
ehea: fix wrongly reported speed and port
CIFS: Fix memory over bound bug in cifs_parse_mount_options
dccp: handle invalid feature options length
ptrace: Prepare to fix racy accesses on task breakpoints
...
Conflicts:
Makefile
include/linux/sched.h
Signed-off-by: John Kacur <jkacur@redhat.com>
reply other threads:[~2011-05-25 15:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=BANLkTin+PPqSSqwHgo0kE0T2m3k9EKasnA@mail.gmail.com \
--to=jkacur@redhat.com \
--cc=Carsten.Emde@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/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).