[kernel] Linux v3.14-rc1-150-g34a9bff

Josh Boyer jwboyer at fedoraproject.org
Sat Feb 8 08:25:26 UTC 2014


commit 28a80a313cb4ddf896143d6260a2efee9e9bfb1e
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Sat Feb 8 03:24:55 2014 -0500

    Linux v3.14-rc1-150-g34a9bff

 config-arm-generic        |    2 +
 kernel.spec               |   11 +--
 kernfs-oops-fix.patch     |  141 ---------------------------------------------
 makefile-after_link.patch |   11 ++--
 sources                   |    2 +-
 5 files changed, 13 insertions(+), 154 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 6bbfa91..0afd445 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -158,6 +158,8 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 
 # CONFIG_ARM_PTDUMP is not set
 
+# CONFIG_PATA_PLATFORM is not set
+
 ### turn off things which make no sense on embedded SoC
 
 # core
diff --git a/kernel.spec b/kernel.spec
index 75d3a9f..56729ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -624,9 +624,6 @@ Patch25188: 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
 Patch25189: ath9k-fix-bad-udelay.patch
 Patch25190: perf-fix-asm-hash-build.patch
 
-#rhbz 1055105
-Patch25191: kernfs-oops-fix.patch
-
 Patch25192: imx-hdmi-fix.patch
 Patch25193: fix-exynos-hdmi-build.patch
 
@@ -1276,9 +1273,6 @@ ApplyPatch 0001-usb-phy-Quiet-unable-to-find-transceiver-message.patch
 ApplyPatch ath9k-fix-bad-udelay.patch
 ApplyPatch perf-fix-asm-hash-build.patch
 
-#rhbz 1055105
-ApplyPatch kernfs-oops-fix.patch
-
 ApplyPatch imx-hdmi-fix.patch
 ApplyPatch fix-exynos-hdmi-build.patch
 
@@ -2061,6 +2055,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat Feb 08 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc1.git4.1
+- Linux v3.14-rc1-150-g34a9bff
+
 * Fri Feb 07 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.14.0-0.rc1.git3.1
 - Linux v3.14-rc1-86-g9343224
 
diff --git a/makefile-after_link.patch b/makefile-after_link.patch
index 4c96701..23406fc 100644
--- a/makefile-after_link.patch
+++ b/makefile-after_link.patch
@@ -11,17 +11,18 @@ after each final link.  This includes vmlinux itself and vDSO images.
 
 Signed-off-by: Roland McGrath <roland at redhat.com>
 
+
 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index d8064af..04dcfe1 100644
+index 6d20b7d..863a01b 100644
 --- a/arch/arm64/kernel/vdso/Makefile
 +++ b/arch/arm64/kernel/vdso/Makefile
 @@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S
  
  # Actual build commands
  quiet_cmd_vdsold = VDSOL $@
--      cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+      cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@ \
-+			$(if $(AFTER_LINK),; $(AFTER_LINK))
+-      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@
++      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ \
++				   $(if $(AFTER_LINK),;$(AFTER_LINK))
  quiet_cmd_vdsoas = VDSOA $@
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
@@ -98,7 +99,7 @@ index fd14be1..1f3eb19 100644
  VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
  GCOV_PROFILE := n
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 0149949..e307cda 100644
+index 2dcb377..25e170e 100644
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
 @@ -65,6 +65,10 @@ vmlinux_link()
diff --git a/sources b/sources
index 583b521..903221d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 0ecbaf65c00374eb4a826c2f9f37606f  linux-3.13.tar.xz
 732d1952898b28d5ccc264cad77b0619  perf-man-3.13.tar.gz
 c3ef4db4edbf6ca3a01a0c392dd048b9  patch-3.14-rc1.xz
-c2bf432f4279d2dd6f9774b06ab312ce  patch-3.14-rc1-git3.xz
+59d408271069adeb5969ddcf48781a97  patch-3.14-rc1-git4.xz


More information about the scm-commits mailing list