summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic2
-rw-r--r--ext4-Support-check-none-nocheck-mount-options.patch51
-rw-r--r--ext4-fix-resize-when-resizing-within-single-group.patch82
-rw-r--r--jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch91
-rw-r--r--kernel.spec23
-rw-r--r--linux-2.6-compile-fixes.patch39
-rw-r--r--sony-laptop-Enable-keyboard-backlight-by-default.patch44
-rw-r--r--sources2
8 files changed, 45 insertions, 289 deletions
diff --git a/config-generic b/config-generic
index 1f94da0ef..685bd1c0a 100644
--- a/config-generic
+++ b/config-generic
@@ -4389,7 +4389,7 @@ CONFIG_BCMA_HOST_PCI=y
# CONFIG_BCMA_DEBUG is not set
# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_INTEL_MID_PTI=m
+# CONFIG_INTEL_MID_PTI is not set
CONFIG_IOMMU_SUPPORT=y
# CONFIG_PM_DEVFREQ is not set
diff --git a/ext4-Support-check-none-nocheck-mount-options.patch b/ext4-Support-check-none-nocheck-mount-options.patch
deleted file mode 100644
index 281e4237a..000000000
--- a/ext4-Support-check-none-nocheck-mount-options.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From ea75f7357e3a881bd1bd0db5e483fc6a8681567b Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Tue, 10 Jan 2012 09:39:02 -0500
-Subject: [PATCH] ext4: Support "check=none" "nocheck" mount options
-
-The ext2/ext3 filesystems supported "check=none" and "nocheck" as mount options
-even though that was already the default behavior and it essentially did
-nothing. When using ext4 to mount ext2/ext3 filesystems, that mount option
-causes the mount to fail. That isn't as backward compatible as it could be,
-so add support to ext4 to accept the option.
-
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- fs/ext4/super.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 3e1329e..5ff09e7 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1333,7 +1333,7 @@ enum {
- Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
- Opt_inode_readahead_blks, Opt_journal_ioprio,
- Opt_dioread_nolock, Opt_dioread_lock,
-- Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
-+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, Opt_nocheck,
- };
-
- static const match_table_t tokens = {
-@@ -1409,6 +1409,8 @@ static const match_table_t tokens = {
- {Opt_init_itable, "init_itable=%u"},
- {Opt_init_itable, "init_itable"},
- {Opt_noinit_itable, "noinit_itable"},
-+ {Opt_nocheck, "check=none"},
-+ {Opt_nocheck, "nocheck"},
- {Opt_err, NULL},
- };
-
-@@ -1905,6 +1907,9 @@ set_qf_format:
- case Opt_noinit_itable:
- clear_opt(sb, INIT_INODE_TABLE);
- break;
-+ case Opt_nocheck:
-+ /* ext2/ext3 used to "support" this option. Silently eat it */
-+ break;
- default:
- ext4_msg(sb, KERN_ERR,
- "Unrecognized mount option \"%s\" "
---
-1.7.7.5
-
diff --git a/ext4-fix-resize-when-resizing-within-single-group.patch b/ext4-fix-resize-when-resizing-within-single-group.patch
deleted file mode 100644
index 9d911b425..000000000
--- a/ext4-fix-resize-when-resizing-within-single-group.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From a0ade1deb86d2325aecc36272bb4505a6eec9235 Mon Sep 17 00:00:00 2001
-From: Lukas Czerner <lczerner@redhat.com>
-Date: Mon, 20 Feb 2012 23:02:06 -0500
-Subject: [PATCH] ext4: fix resize when resizing within single group
-
-When resizing file system in the way that the new size of the file
-system is still in the same group (no new groups are added), then we can
-hit a BUG_ON in ext4_alloc_group_tables()
-
-BUG_ON(flex_gd->count == 0 || group_data == NULL);
-
-because flex_gd->count is zero. The reason is the missing check for such
-case, so the code always extend the last group fully and then attempt to
-add more groups, but at that time n_blocks_count is actually smaller
-than o_blocks_count.
-
-It can be easily reproduced like this:
-
-mkfs.ext4 -b 4096 /dev/sda 30M
-mount /dev/sda /mnt/test
-resize2fs /dev/sda 50M
-
-Fix this by checking whether the resize happens within the singe group
-and only add that many blocks into the last group to satisfy user
-request. Then o_blocks_count == n_blocks_count and the resize will exit
-successfully without and attempt to add more groups into the fs.
-
-Also fix mixing together block number and blocks count which might be
-confusing and can easily lead to off-by-one errors (but it is actually
-not the case here since the two occurrence of this mix-up will cancel
-each other).
-
-Signed-off-by: Lukas Czerner <lczerner@redhat.com>
-Reported-by: Milan Broz <mbroz@redhat.com>
-Reviewed-by: Eric Sandeen <sandeen@redhat.com>
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
----
- fs/ext4/resize.c | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index f9d948f..3fed79d 100644
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -1582,7 +1582,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
- ext4_fsblk_t o_blocks_count;
- ext4_group_t o_group;
- ext4_group_t n_group;
-- ext4_grpblk_t offset;
-+ ext4_grpblk_t offset, add;
- unsigned long n_desc_blocks;
- unsigned long o_desc_blocks;
- unsigned long desc_blocks;
-@@ -1605,7 +1605,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
- return 0;
-
- ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset);
-- ext4_get_group_no_and_offset(sb, o_blocks_count, &o_group, &offset);
-+ ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset);
-
- n_desc_blocks = (n_group + EXT4_DESC_PER_BLOCK(sb)) /
- EXT4_DESC_PER_BLOCK(sb);
-@@ -1634,10 +1634,12 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
- }
- brelse(bh);
-
-- if (offset != 0) {
-- /* extend the last group */
-- ext4_grpblk_t add;
-- add = EXT4_BLOCKS_PER_GROUP(sb) - offset;
-+ /* extend the last group */
-+ if (n_group == o_group)
-+ add = n_blocks_count - o_blocks_count;
-+ else
-+ add = EXT4_BLOCKS_PER_GROUP(sb) - (offset + 1);
-+ if (add > 0) {
- err = ext4_group_extend_no_check(sb, o_blocks_count, add);
- if (err)
- goto out;
---
-1.7.6.5
-
diff --git a/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch b/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
deleted file mode 100644
index 5ea8ccc10..000000000
--- a/jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Path: news.gmane.org!not-for-mail
-From: Eric Sandeen <sandeen@redhat.com>
-Newsgroups: gmane.comp.file-systems.ext4
-Subject: [PATCH] jbd2: clear BH_Delay & BH_Unwritten in journal_unmap_buffer
-Date: Tue, 07 Feb 2012 16:07:20 -0600
-Lines: 42
-Approved: news@gmane.org
-Message-ID: <4F31A098.4050601@redhat.com>
-NNTP-Posting-Host: plane.gmane.org
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Trace: dough.gmane.org 1328656072 12026 80.91.229.3 (7 Feb 2012 23:07:52 GMT)
-X-Complaints-To: usenet@dough.gmane.org
-NNTP-Posting-Date: Tue, 7 Feb 2012 23:07:52 +0000 (UTC)
-To: ext4 development <linux-ext4@vger.kernel.org>
-Original-X-From: linux-ext4-owner@vger.kernel.org Wed Feb 08 00:07:52 2012
-Return-path: <linux-ext4-owner@vger.kernel.org>
-Envelope-to: gcfe-linux-ext4@plane.gmane.org
-Original-Received: from vger.kernel.org ([209.132.180.67])
- by plane.gmane.org with esmtp (Exim 4.69)
- (envelope-from <linux-ext4-owner@vger.kernel.org>)
- id 1Ruu8d-0000lK-5P
- for gcfe-linux-ext4@plane.gmane.org; Wed, 08 Feb 2012 00:07:51 +0100
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1756187Ab2BGXHt (ORCPT <rfc822;gcfe-linux-ext4@m.gmane.org>);
- Tue, 7 Feb 2012 18:07:49 -0500
-Original-Received: from mx1.redhat.com ([209.132.183.28]:19432 "EHLO mx1.redhat.com"
- rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
- id S1753992Ab2BGXHs (ORCPT <rfc822;linux-ext4@vger.kernel.org>);
- Tue, 7 Feb 2012 18:07:48 -0500
-Original-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q17N7dj0027622
- (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
- for <linux-ext4@vger.kernel.org>; Tue, 7 Feb 2012 18:07:48 -0500
-Original-Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q17M7Kgt001990
- (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
- for <linux-ext4@vger.kernel.org>; Tue, 7 Feb 2012 17:07:21 -0500
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0) Gecko/20120129 Thunderbird/10.0
-X-Enigmail-Version: 1.3.5
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
-Original-Sender: linux-ext4-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-ext4.vger.kernel.org>
-X-Mailing-List: linux-ext4@vger.kernel.org
-Xref: news.gmane.org gmane.comp.file-systems.ext4:30623
-Archived-At: <http://permalink.gmane.org/gmane.comp.file-systems.ext4/30623>
-
-journal_unmap_buffer()'s zap_buffer: code clears a lot of buffer head
-state ala discard_buffer(), but does not touch _Delay or _Unwritten
-as discard_buffer() does.
-
-This can be problematic in some areas of the ext4 code which assume
-that if they have found a buffer marked unwritten or delay, then it's
-a live one. Perhaps those spots should check whether it is mapped
-as well, but if jbd2 is going to tear down a buffer, let's really
-tear it down completely.
-
-Without this I get some fsx failures on sub-page-block filesystems
-up until v3.2, at which point 4e96b2dbbf1d7e81f22047a50f862555a6cb87cb
-and 189e868fa8fdca702eb9db9d8afc46b5cb9144c9 make the failures go
-away, because buried within that large change is some more flag
-clearing. I still think it's worth doing in jbd2, since
-->invalidatepage leads here directly, and it's the right place
-to clear away these flags.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
-Cc: stable@vger.kernel.org
----
-
-diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
-index 35ae096..52653306 100644
---- a/fs/jbd2/transaction.c
-+++ b/fs/jbd2/transaction.c
-@@ -1949,6 +1949,8 @@ zap_buffer_unlocked:
- clear_buffer_mapped(bh);
- clear_buffer_req(bh);
- clear_buffer_new(bh);
-+ clear_buffer_delay(bh);
-+ clear_buffer_unwritten(bh);
- bh->b_bdev = NULL;
- return may_free;
- }
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-
diff --git a/kernel.spec b/kernel.spec
index f1a7817e5..b4cff0f93 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -703,7 +703,6 @@ Patch2900: linux-2.6-v4l-dvb-update.patch
Patch2901: linux-2.6-v4l-dvb-experimental.patch
# fs fixes
-Patch4000: ext4-fix-resize-when-resizing-within-single-group.patch
# NFSv4
@@ -727,13 +726,8 @@ Patch21004: arm-tegra-nvec-kconfig.patch
# Highbank clock functions need to be EXPORT for module builds
Patch21010: highbank-export-clock-functions.patch
-Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
-
Patch21094: power-x86-destdir.patch
-#rhbz 788260
-Patch21233: jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
-
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -742,9 +736,6 @@ Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
#rhbz 727865 730007
Patch21300: ACPICA-Fix-regression-in-FADT-revision-checks.patch
-#rhbz 728478
-Patch21302: sony-laptop-Enable-keyboard-backlight-by-default.patch
-
#rhbz 804007
Patch21305: mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
@@ -1322,7 +1313,6 @@ ApplyPatch arm-tegra-nvec-kconfig.patch
#
# ext4
-ApplyPatch ext4-fix-resize-when-resizing-within-single-group.patch
# xfs
@@ -1427,22 +1417,14 @@ ApplyPatch efi-dont-map-boot-services-on-32bit.patch
ApplyPatch lis3-improve-handling-of-null-rate.patch
-ApplyPatch ext4-Support-check-none-nocheck-mount-options.patch
-
ApplyPatch power-x86-destdir.patch
-#rhbz 788269
-ApplyPatch jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
-
#rhbz 754518
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
#rhbz 727865 730007
ApplyPatch ACPICA-Fix-regression-in-FADT-revision-checks.patch
-#rhbz 728478
-ApplyPatch sony-laptop-Enable-keyboard-backlight-by-default.patch
-
#rhbz 804007
ApplyPatch mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
@@ -2309,6 +2291,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1
+- Linux v3.3-8839-gb5174fa
+
* Thu Mar 29 2012 Josh Boyer <jwboyer@redhat.com>
- Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
diff --git a/linux-2.6-compile-fixes.patch b/linux-2.6-compile-fixes.patch
index 34c08ce47..c0d5082c8 100644
--- a/linux-2.6-compile-fixes.patch
+++ b/linux-2.6-compile-fixes.patch
@@ -4,3 +4,42 @@
# Please add the errors from gcc before the diffs to save others having
# to do a compile to figure out what your diff is fixing. Thanks.
#
+# ../../lib/rbtree.c:24:26: fatal error: linux/export.h: No such file or directory
+diff --git a/tools/perf/Makefile b/tools/perf/Makefile
+index b492e3a..2f42886 100644
+--- a/tools/perf/Makefile
++++ b/tools/perf/Makefile
+@@ -251,7 +251,7 @@ LIB_H += util/include/linux/const.h
+ LIB_H += util/include/linux/ctype.h
+ LIB_H += util/include/linux/kernel.h
+ LIB_H += util/include/linux/list.h
+-LIB_H += util/include/linux/module.h
++LIB_H += util/include/linux/export.h
+ LIB_H += util/include/linux/poison.h
+ LIB_H += util/include/linux/prefetch.h
+ LIB_H += util/include/linux/rbtree.h
+diff --git a/tools/perf/util/include/linux/export.h b/tools/perf/util/include/linux/export.h
+new file mode 100644
+index 0000000..b43e2dc
+--- /dev/null
++++ b/tools/perf/util/include/linux/export.h
+@@ -0,0 +1,6 @@
++#ifndef PERF_LINUX_MODULE_H
++#define PERF_LINUX_MODULE_H
++
++#define EXPORT_SYMBOL(name)
++
++#endif
+diff --git a/tools/perf/util/include/linux/module.h b/tools/perf/util/include/linux/module.h
+deleted file mode 100644
+index b43e2dc..0000000
+--- a/tools/perf/util/include/linux/module.h
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#ifndef PERF_LINUX_MODULE_H
+-#define PERF_LINUX_MODULE_H
+-
+-#define EXPORT_SYMBOL(name)
+-
+-#endif
+--
diff --git a/sony-laptop-Enable-keyboard-backlight-by-default.patch b/sony-laptop-Enable-keyboard-backlight-by-default.patch
deleted file mode 100644
index c993fd86d..000000000
--- a/sony-laptop-Enable-keyboard-backlight-by-default.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0dbc2bc96b1ec741bdd43451c286ccd45da3310b Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Wed, 2 Nov 2011 14:31:59 -0400
-Subject: [PATCH] sony-laptop: Enable keyboard backlight by default
-
-When the keyboard backlight support was originally added, the commit said
-to default it to on with a 10 second timeout. That actually wasn't the
-case, as the default value is commented out for the kbd_backlight parameter.
-Because it is a static variable, it gets set to 0 by default without some
-other form of initialization.
-
-However, it seems the function to set the value wasn't actually called
-immediately, so whatever state the keyboard was in initially would remain.
-Then commit df410d522410e67660 was introduced during the 2.6.39 timeframe to
-immediately set whatever value was present (as well as attempt to
-restore/reset the state on module removal or resume). That seems to have
-now forced the light off immediately when the module is loaded unless
-the option kbd_backlight=1 is specified.
-
-Let's enable it by default again (for the first time). This should solve
-https://bugzilla.redhat.com/show_bug.cgi?id=728478
-
-Acked-by: Mattia Dongili <malattia@linux.it>
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- drivers/platform/x86/sony-laptop.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index c006dee..40c4705 100644
---- a/drivers/platform/x86/sony-laptop.c
-+++ b/drivers/platform/x86/sony-laptop.c
-@@ -127,7 +127,7 @@ MODULE_PARM_DESC(minor,
- "default is -1 (automatic)");
- #endif
-
--static int kbd_backlight; /* = 1 */
-+static int kbd_backlight = 1;
- module_param(kbd_backlight, int, 0444);
- MODULE_PARM_DESC(kbd_backlight,
- "set this to 0 to disable keyboard backlight, "
---
-1.7.7.6
-
diff --git a/sources b/sources
index e527013c7..d6db52e48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz
-429e26b7a8aafcff6229cb8a76c6b081 patch-3.3-git3.xz
+60c207c091e934060815826dc6ea08da patch-3.3-git4.xz