summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-12-02 15:42:00 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-12-02 15:42:00 -0500
commit01383f49c2f4a14033dc391ccf504c85a9dbf9ad (patch)
tree103cfce36689df18923a9e053c53b76b3d037066
parent0fdcea1ca4a29167409ee6b2b43d016bddeda7ce (diff)
downloadkernel-01383f49c2f4a14033dc391ccf504c85a9dbf9ad.tar.gz
kernel-01383f49c2f4a14033dc391ccf504c85a9dbf9ad.tar.xz
kernel-01383f49c2f4a14033dc391ccf504c85a9dbf9ad.zip
Linux v3.13-rc2-119-ga45299e
-rw-r--r--fix-arm-xen-driver-build.patch14
-rw-r--r--kernel.spec9
-rw-r--r--sources2
3 files changed, 5 insertions, 20 deletions
diff --git a/fix-arm-xen-driver-build.patch b/fix-arm-xen-driver-build.patch
deleted file mode 100644
index 9e29ea699..000000000
--- a/fix-arm-xen-driver-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/arch/arm/xen/p2m.c b/arch/arm/xen/p2m.c
-index 23732cd..7772fa8 100644
---- a/arch/arm/xen/p2m.c
-+++ b/arch/arm/xen/p2m.c
-@@ -27,7 +27,9 @@ struct xen_p2m_entry {
-
- rwlock_t p2m_lock;
- struct rb_root phys_to_mach = RB_ROOT;
-+EXPORT_SYMBOL_GPL(phys_to_mach);
- static struct rb_root mach_to_phys = RB_ROOT;
-+EXPORT_SYMBOL_GPL(mach_to_phys);
-
- static int xen_add_phys_to_mach_entry(struct xen_p2m_entry *new)
- {
diff --git a/kernel.spec b/kernel.spec
index f45d005c5..9a76df0ce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -684,8 +684,6 @@ Patch21020: arm-tegra-usb-no-reset-linux33.patch
# http://www.spinics.net/lists/devicetree/msg08276.html
Patch21030: arm-imx6-utilite.patch
-Patch21031: fix-arm-xen-driver-build.patch
-
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1263,8 +1261,6 @@ ApplyPatch arm-omap-load-tfp410.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
ApplyPatch arm-imx6-utilite.patch
-ApplyPatch fix-arm-xen-driver-build.patch
-
#
# bugfixes to drivers and filesystems
#
@@ -2194,6 +2190,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Dec 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git2.1
+- Linux v3.13-rc2-119-ga45299e
+
* Mon Dec 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git1.1
- Linux v3.13-rc2-1-gaf91706
- Reenable debugging options.
diff --git a/sources b/sources
index ecd441e6c..e3de965e2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
cc6ee608854e0da4b64f6c1ff8b6398c linux-3.12.tar.xz
ed069580489aca6ddafa04d171e5c098 patch-3.13-rc2.xz
-9539c0dbc8a01e84ef213eccfadf09c9 patch-3.13-rc2-git1.xz
+172f0eefcb98516d730413183edc3da0 patch-3.13-rc2-git2.xz