[kernel: 1/2] Linux v3.3-8839-gb5174fa

[Justin M. Forbes]

commit 4f8c60a7f666e766619d44d836c3c1a42e753e36
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Thu Mar 29 14:41:04 2012 -0500

    Linux v3.3-8839-gb5174fa

 config-generic                                     |    2 +-
 ...-Support-check-none-nocheck-mount-options.patch |   51 -----------
 ...-resize-when-resizing-within-single-group.patch |   82 ------------------
 ...lay-and-BH_Unwritten-in-journal_unmap_buf.patch |   91 --------------------
 kernel.spec                                        |   23 +----
 linux-2.6-compile-fixes.patch                      |   39 +++++++++
 ...ptop-Enable-keyboard-backlight-by-default.patch |   44 ----------
 sources                                            |    2 +-
 8 files changed, 45 insertions(+), 289 deletions(-)
---
diff --git a/config-generic b/config-generic
index 1f94da0..685bd1c 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/kernel.spec b/kernel.spec
index a2b8471..4b0bb26 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
@@ -702,7 +702,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
 
@@ -726,13 +725,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
 
@@ -741,9 +735,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
 
@@ -1320,7 +1311,6 @@ ApplyPatch arm-tegra-nvec-kconfig.patch
 #
 
 # ext4
-ApplyPatch ext4-fix-resize-when-resizing-within-single-group.patch
 
 # xfs
 
@@ -1425,22 +1415,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
 
@@ -2307,6 +2289,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Mar 29 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git4.1
+- Linux v3.3-8839-gb5174fa
+
 * Wed Mar 28 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git3.1
 - Linux v3.3-7919-g6658a69
 
diff --git a/linux-2.6-compile-fixes.patch b/linux-2.6-compile-fixes.patch
index 34c08ce..c0d5082 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/sources b/sources
index e527013..d6db52e 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