[kernel] v3.6-9228-g547b1e8

Justin M. Forbes jforbes at fedoraproject.org
Tue Oct 9 15:48:00 UTC 2012


commit 7594423fc02e17ea33274a13a77d550cf2520e5c
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Oct 9 10:44:40 2012 -0500

    v3.6-9228-g547b1e8

 kernel.spec               |    6 ++++--
 modsign-post-KS-jwb.patch |   14 ++------------
 sources                   |    2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 93fbbbc..15b201a 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
@@ -1312,7 +1312,6 @@ ApplyOptionalPatch linux-2.6-compile-fixes.patch
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-
 ApplyPatch taint-vbox.patch
 
 ApplyPatch vmbugon-warnon.patch
@@ -2307,6 +2306,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Oct 09 2012 Justin M. Forbes <jforbes at redhat.com>
+- v3.6-9228-g547b1e8 
+
 * Tue Oct 09 2012 Josh Boyer <jwboyer at redhat.com>
 - Drop unhandled irq polling patch
 
diff --git a/modsign-post-KS-jwb.patch b/modsign-post-KS-jwb.patch
index f528a2b..e8a86af 100644
--- a/modsign-post-KS-jwb.patch
+++ b/modsign-post-KS-jwb.patch
@@ -3587,16 +3587,6 @@ index 0000000..5928546
 +extern enum OID look_up_OID(const void *data, size_t datasize);
 +
 +#endif /* _LINUX_OID_REGISTRY_H */
-diff --git a/lib/.gitignore b/lib/.gitignore
-index 3bef1ea..09aae85 100644
---- a/lib/.gitignore
-+++ b/lib/.gitignore
-@@ -3,4 +3,4 @@
- #
- gen_crc32table
- crc32table.h
--
-+oid_registry_data.c
 diff --git a/lib/Kconfig b/lib/Kconfig
 index bb94c1b..4b31a46 100644
 --- a/lib/Kconfig
@@ -5991,8 +5981,8 @@ index b042896..ca856b6 100644
  
 +obj-$(CONFIG_ASN1) += asn1_decoder.o
 +
- hostprogs-y	:= gen_crc32table
- clean-files	:= crc32table.h
+ obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
+ obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o
  
 diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
 new file mode 100644
diff --git a/sources b/sources
index b269720..ddf4a5d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-2184b28346009a40cc0e21f7a8d8e92b  patch-3.6-git3.xz
+50c67954e5115512f6dce25294fbacc2  patch-3.6-git4.xz


More information about the scm-commits mailing list