diff options
| -rw-r--r-- | autofs4-lockdep.patch | 84 | ||||
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | sources | 1 |
3 files changed, 6 insertions, 92 deletions
diff --git a/autofs4-lockdep.patch b/autofs4-lockdep.patch deleted file mode 100644 index fe4d65056..000000000 --- a/autofs4-lockdep.patch +++ /dev/null @@ -1,84 +0,0 @@ -Path: news.gmane.org!not-for-mail -From: Ian Kent <raven@themaw.net> -Newsgroups: gmane.linux.kernel -Subject: [PATCH] autofs4 - fix lockdep splat in autofs -Date: Mon, 22 Aug 2011 11:52:28 +0800 -Lines: 35 -Approved: news@gmane.org -Message-ID: <20110822035228.13189.62994.stgit@perseus.themaw.net> -NNTP-Posting-Host: lo.gmane.org -Mime-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit -X-Trace: dough.gmane.org 1313985730 20409 80.91.229.12 (22 Aug 2011 04:02:10 GMT) -X-Complaints-To: usenet@dough.gmane.org -NNTP-Posting-Date: Mon, 22 Aug 2011 04:02:10 +0000 (UTC) -Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>, - Steven Rostedt <rostedt@goodmis.org> -To: Al Viro <viro@ZenIV.linux.org.uk> -Original-X-From: linux-kernel-owner@vger.kernel.org Mon Aug 22 06:02:05 2011 -Return-path: <linux-kernel-owner@vger.kernel.org> -Envelope-to: glk-linux-kernel-3@lo.gmane.org -Original-Received: from vger.kernel.org ([209.132.180.67]) - by lo.gmane.org with esmtp (Exim 4.69) - (envelope-from <linux-kernel-owner@vger.kernel.org>) - id 1QvLi6-00059I-P9 - for glk-linux-kernel-3@lo.gmane.org; Mon, 22 Aug 2011 06:02:03 +0200 -Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1750951Ab1HVEBw (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>); - Mon, 22 Aug 2011 00:01:52 -0400 -Original-Received: from outbound.icp-qv1-irony-out2.iinet.net.au ([203.59.1.107]:23283 - "EHLO outbound.icp-qv1-irony-out2.iinet.net.au" rhost-flags-OK-OK-OK-OK) - by vger.kernel.org with ESMTP id S1750806Ab1HVEBu (ORCPT - <rfc822;linux-kernel@vger.kernel.org>); - Mon, 22 Aug 2011 00:01:50 -0400 -X-Greylist: delayed 554 seconds by postgrey-1.27 at vger.kernel.org; Mon, 22 Aug 2011 00:01:50 EDT -X-IronPort-Anti-Spam-Filtered: true -X-IronPort-Anti-Spam-Result: Av4EADDSUU7LO5kB/2dsb2JhbABBhEujSHeBQAEpBFIoCAUCGA4CSRYTrRSQOYEshAyBEASHXpBgi1k -X-IronPort-AV: E=Sophos;i="4.68,261,1312128000"; - d="scan'208";a="765105065" -Original-Received: from unknown (HELO perseus.themaw.net) ([203.59.153.1]) - by outbound.icp-qv1-irony-out2.iinet.net.au with ESMTP; 22 Aug 2011 11:52:32 +0800 -User-Agent: StGIT/0.14.3 -Original-Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-kernel.vger.kernel.org> -X-Mailing-List: linux-kernel@vger.kernel.org -Xref: news.gmane.org gmane.linux.kernel:1182197 -Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1182197> - -From: Steven Rostedt <rostedt@goodmis.org> - -When recursing down the locks when traversing a tree/list in -get_next_positive_dentry() or get_next_positive_subdir() a lock can -change from being nested to being a parent which breaks lockdep. This -patch tells lockdep about what we did. - -Signed-off-by: Steven Rostedt <rostedt@goodmis.org> -Acked-by: Ian Kent <raven@themaw.net> ---- - - fs/autofs4/expire.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c -index 450f529..1feb68e 100644 ---- a/fs/autofs4/expire.c -+++ b/fs/autofs4/expire.c -@@ -124,6 +124,7 @@ start: - /* Negative dentry - try next */ - if (!simple_positive(q)) { - spin_unlock(&p->d_lock); -+ lock_set_subclass(&q->d_lock.dep_map, 0, _RET_IP_); - p = q; - goto again; - } -@@ -186,6 +187,7 @@ again: - /* Negative dentry - try next */ - if (!simple_positive(ret)) { - spin_unlock(&p->d_lock); -+ lock_set_subclass(&ret->d_lock.dep_map, 0, _RET_IP_); - p = ret; - goto again; - } - diff --git a/kernel.spec b/kernel.spec index e9435c9d9..8b4560a82 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -764,9 +764,6 @@ Patch21234: Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch Patch21236: scsi-fix-sd_revalidate_disk-oops.patch -#rhbz 714828 -Patch21240: autofs4-lockdep.patch - Patch21250: mcelog-rcu-splat.patch Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch @@ -1488,9 +1485,6 @@ ApplyPatch Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch ApplyPatch scsi-fix-sd_revalidate_disk-oops.patch -#rhbz 714828 -ApplyPatch autofs4-lockdep.patch - ApplyPatch mcelog-rcu-splat.patch ApplyPatch x86-Avoid-invoking-RCU-when-CPU-is-idle.patch @@ -2371,6 +2365,9 @@ fi # ||----w | # || || %changelog +* Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc4.git1.1 +- Linux 3.3-rc4-git1 (upstream 27e74da9800289e69ba907777df1e2085231eff7) + * Mon Feb 20 2012 Dave Jones <davej@redhat.com> - Do not call drivers when invalidating partitions for -ENOMEDIUM @@ -1,3 +1,4 @@ 364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz 35f3b51bfd9bd47a939753e68d49ca00 patch-3.3-rc4.xz 02c210a8fd24acca8c1ac93f6f1d3913 compat-wireless-2012-02-05.tar.bz2 +203dba5a7d0c299a18fafdc8aaf70625 patch-3.3-rc4-git1.xz |