[kernel] Linux v4.0-rc1-178-g023a6007a08d

Josh Boyer jwboyer at fedoraproject.org
Tue Mar 3 14:01:00 UTC 2015


commit 3b35d75b8c3f7046e93c9bb9d0bfce145fbd9033
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Tue Mar 3 09:00:03 2015 -0500

    Linux v4.0-rc1-178-g023a6007a08d

 ...Fix-text-patching-logic-when-using-fixmap.patch | 68 ----------------------
 ...35x-bone-common-add-uart2_pins-uart4_pins.patch |  2 +-
 ...ts-am335x-bone-common-enable-and-use-i2c2.patch |  4 +-
 ...35x-bone-common-setup-default-pinmux-http.patch |  6 +-
 drm-i915-hush-check-crtc-state.patch               |  4 +-
 kernel.spec                                        | 16 ++---
 ...Define-_GNU_SOURCE-on-pthread_attr_setaff.patch | 30 ----------
 7 files changed, 13 insertions(+), 117 deletions(-)
---
diff --git a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
index 6cec247..0d6ccd7 100644
--- a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+++ b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson at gmail.com>
  1 file changed, 21 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 4991a1664773..096ddbe4c4b3 100644
+index db880bf46135..c931ec7201c0 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -102,6 +102,27 @@
diff --git a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
index 6a6ea50..94fd324 100644
--- a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+++ b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
@@ -8,7 +8,7 @@ Signed-off-by: Robert Nelson <robertcnelson at gmail.com>
  1 file changed, 39 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 6cc25ed912ee..754b96c5dbb1 100644
+index 2c6248d9a9ef..ec755eeb78ee 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -81,6 +81,13 @@
@@ -25,7 +25,7 @@ index 6cc25ed912ee..754b96c5dbb1 100644
  	uart0_pins: pinmux_uart0_pins {
  		pinctrl-single,pins = <
  			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-@@ -217,6 +224,38 @@
+@@ -218,6 +225,38 @@
  		reg = <0x24>;
  	};
  
diff --git a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
index d676839..7f10489 100644
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson at gmail.com>
  1 file changed, 130 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 754b96c5dbb1..4991a1664773 100644
+index ec755eeb78ee..db880bf46135 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -95,6 +95,13 @@
@@ -74,7 +74,7 @@ index 754b96c5dbb1..4991a1664773 100644
  &usb {
  	status = "okay";
  };
-@@ -258,6 +299,56 @@
+@@ -259,6 +300,56 @@
  	};
  };
  
@@ -131,7 +131,7 @@ index 754b96c5dbb1..4991a1664773 100644
  /include/ "tps65217.dtsi"
  
  &tps {
-@@ -339,3 +430,42 @@
+@@ -340,3 +431,42 @@
  	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
  	cd-inverted;
  };
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 7a818a6..1bdf894 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 3d220a67f865..8e18e0575d52 100644
+index 3117679299a6..ff781dc0535a 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10870,7 +10870,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10885,7 +10885,7 @@ check_crtc_state(struct drm_device *dev)
  
  		if (active &&
  		    !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {
diff --git a/kernel.spec b/kernel.spec
index 2e7ee39..309034d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -613,8 +613,6 @@ Patch26059: i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
 #rhbz 1094948
 Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
 
-Patch26134: perf-tools-Define-_GNU_SOURCE-on-pthread_attr_setaff.patch
-
 Patch26137: fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
 
 #CVE-2015-0275 rhbz 1193907 1195178
@@ -633,9 +631,6 @@ Patch26141: NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
 Patch30000: kernel-arm64.patch
 Patch30001: kernel-arm64-fix-psci-when-pg.patch
 
-# Not yet upstream, for https://bugzilla.redhat.com/show_bug.cgi?id=1194366#c12
-Patch30002: 0001-arm64-Fix-text-patching-logic-when-using-fixmap.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1351,8 +1346,6 @@ ApplyPatch i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
 #rhbz 1094948
 ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
 
-ApplyPatch perf-tools-Define-_GNU_SOURCE-on-pthread_attr_setaff.patch
-
 ApplyPatch fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch
 
 #CVE-2015-0275 rhbz 1193907 1195178
@@ -1373,9 +1366,7 @@ ApplyPatch kernel-arm64.patch
 ApplyPatch kernel-arm64.patch -R
 %endif
 %endif
-ApplyPatch kernel-arm64-fix-psci-when-pg.patch
-# Not yet upstream, for https://bugzilla.redhat.com/show_bug.cgi?id=1194366#c12
-ApplyPatch 0001-arm64-Fix-text-patching-logic-when-using-fixmap.patch
+# pplyPatch kernel-arm64-fix-psci-when-pg.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2227,6 +2218,9 @@ fi
 #
 # 
 %changelog
+* Tue Mar 03 2015 Josh Boyer <jwboyer at fedoraproject.org> - 4.0.0-0.rc1.git3.1
+- Linux v4.0-rc1-178-g023a6007a08d
+
 * Mon Mar 02 2015 Josh Boyer <jwboyer at fedoraproject.org>
 - Add patch to fix nfsd soft lockup (rhbz 1185519)
 - Enable ET131X driver (rhbz 1197842)


More information about the scm-commits mailing list