summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 08:46:16 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 08:46:16 -0400
commit56937f61af5d0870816f73166305919233f9270f (patch)
tree38b221f23bd5ece7e557b85e591f1f60196bbe45
parent0593e57f5f5cd7fb9a51f2a370809396202d7445 (diff)
downloadkernel-56937f61af5d0870816f73166305919233f9270f.tar.gz
kernel-56937f61af5d0870816f73166305919233f9270f.tar.xz
kernel-56937f61af5d0870816f73166305919233f9270f.zip
Linux v3.11-2200-gf66c83d
-rw-r--r--config-generic13
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 13 insertions, 7 deletions
diff --git a/config-generic b/config-generic
index a184635a3..2d6092e4c 100644
--- a/config-generic
+++ b/config-generic
@@ -433,6 +433,7 @@ CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_SCSI_MVSAS=m
# CONFIG_SCSI_MVSAS_DEBUG is not set
CONFIG_SCSI_MVSAS_TASKLET=y
@@ -2232,6 +2233,13 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_XILINX_PS_UART is not set
# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_PCH_UART is not set
+
CONFIG_UNIX98_PTYS=y
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
@@ -2451,13 +2459,8 @@ CONFIG_SENSORS_MAX197=m
# CONFIG_BMP085 is not set
# CONFIG_BMP085_I2C is not set
# CONFIG_PCH_PHUB is not set
-# CONFIG_SERIAL_PCH_UART is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_SRAM is not set
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
CONFIG_W1=m
CONFIG_W1_CON=y
diff --git a/kernel.spec b/kernel.spec
index 83c837467..edbdb3786 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 4
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2313,6 +2313,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git5.1
+- Linux v3.11-2200-gf66c83d
+
* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git4.1
- Linux v3.11-1851-g7511442
diff --git a/sources b/sources
index 37d85e027..c0b87ad27 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz
-e0fd73466c6a1f1a352e6a4fd1db001e patch-3.11-git4.xz
+294e3992a541813e409560ec542e394b patch-3.11-git5.xz