rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

v3.6-9228-g547b1e8

Browse Source
This commit is contained in:
Justin M. Forbes 2012-10-09 10:44:40 -05:00
parent e5a9699c02
commit 7594423fc0
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel.spec
View File

@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 0 %define rcrev 0
# The git snapshot level # The git snapshot level
%define gitrev 3 %define gitrev 4
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %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 # revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
ApplyPatch taint-vbox.patch ApplyPatch taint-vbox.patch
ApplyPatch vmbugon-warnon.patch ApplyPatch vmbugon-warnon.patch
@ -2307,6 +2306,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Oct 09 2012 Justin M. Forbes <jforbes@redhat.com>
- v3.6-9228-g547b1e8
* Tue Oct 09 2012 Josh Boyer <jwboyer@redhat.com> * Tue Oct 09 2012 Josh Boyer <jwboyer@redhat.com>
- Drop unhandled irq polling patch - Drop unhandled irq polling patch

14
modsign-post-KS-jwb.patch
View File

@ -3587,16 +3587,6 @@ index 0000000..5928546
+extern enum OID look_up_OID(const void *data, size_t datasize); +extern enum OID look_up_OID(const void *data, size_t datasize);
+ +
+#endif /* _LINUX_OID_REGISTRY_H */ +#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 diff --git a/lib/Kconfig b/lib/Kconfig
index bb94c1b..4b31a46 100644 index bb94c1b..4b31a46 100644
--- a/lib/Kconfig --- a/lib/Kconfig
@ -5991,8 +5981,8 @@ index b042896..ca856b6 100644
+obj-$(CONFIG_ASN1) += asn1_decoder.o +obj-$(CONFIG_ASN1) += asn1_decoder.o
+ +
hostprogs-y := gen_crc32table obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
clean-files := crc32table.h obj-$(CONFIG_INTERVAL_TREE_TEST) += interval_tree_test.o
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c
new file mode 100644 new file mode 100644

2
sources
View File

@ -1,2 +1,2 @@
1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz 1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz
2184b28346009a40cc0e21f7a8d8e92b patch-3.6-git3.xz 50c67954e5115512f6dce25294fbacc2 patch-3.6-git4.xz