From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Kacur Subject: merge of v2.6.33.14 with tip/rt/2.6.33 Date: Wed, 25 May 2011 17:20:29 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: RT , LKML , Carsten Emde , stable@kernel.org, Clark Williams To: Thomas Gleixner Return-path: Received: from mail-qy0-f181.google.com ([209.85.216.181]:43753 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757794Ab1EYPUa (ORCPT ); Wed, 25 May 2011 11:20:30 -0400 Sender: linux-rt-users-owner@vger.kernel.org List-ID: 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 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