[kernel] Linux 3.1-git3. Happy Halloween.
Josh Boyer
jwboyer at fedoraproject.org
Mon Oct 31 19:52:22 UTC 2011
commit 8e04ce5a387af9a033773520fa7c07b705e081c6
Author: Josh Boyer <jwboyer at redhat.com>
Date: Mon Oct 31 15:20:40 2011 -0400
Linux 3.1-git3. Happy Halloween.
Makefile | 1 +
Makefile.release | 1 +
config-arm-generic | 3 +
config-arm-omap-generic | 3 +
config-debug | 1 +
config-generic | 6 ++
config-nodebug | 1 +
config-sparc64-generic | 1 +
kernel.spec | 13 +---
...check-for-lower-base-frequency-quirk-for-.patch | 73 --------------------
sources | 2 +-
udlfb-bind-framebuffer-to-interface.patch | 33 ---------
12 files changed, 22 insertions(+), 116 deletions(-)
---
diff --git a/Makefile b/Makefile
index 25249d8..cb1d381 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ debug:
@perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAIL_IO_TIMEOUT is not set/CONFIG_FAIL_IO_TIMEOUT=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_FAIL_MMC_REQUEST is not set/CONFIG_FAIL_MMC_REQUEST=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index 88a014d..eb37093 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -22,6 +22,7 @@ config-release:
@perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAIL_IO_TIMEOUT=y/# CONFIG_FAIL_IO_TIMEOUT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_FAIL_MMC_REQUEST=y/# CONFIG_FAIL_MMC_REQUEST is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
diff --git a/config-arm-generic b/config-arm-generic
index a41f954..19e9af4 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -44,6 +44,8 @@ CONFIG_OABI_COMPAT=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
CONFIG_NO_HZ=y
@@ -172,3 +174,4 @@ CONFIG_FTGMAC100=m
# CONFIG_DRM_RADEON is not set
# CONFIG_ATM_HE is not set
# CONFIG_SCSI_ACARD is not set
+# CONFIG_ARM_KPROBES_TEST is not set
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index ebfafa4..e8b6b6a 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -51,6 +51,7 @@ CONFIG_OMAP_32K_TIMER_HZ=128
CONFIG_OMAP_DM_TIMER=y
# CONFIG_OMAP_PM_NONE is not set
CONFIG_OMAP_PM_NOOP=y
+# CONFIG_OMAP_IOMMU is not set
#
# TI OMAP2/3/4 Specific Features
@@ -741,6 +742,8 @@ CONFIG_PANEL_GENERIC_DPI=y
CONFIG_PANEL_SHARP_LS037V7DW01=y
CONFIG_PANEL_NEC_NL8048HL11_01B=y
CONFIG_PANEL_TPO_TD043MTEA1=y
+# CONFIG_PANEL_DVI is not set
+# CONFIG_PANEL_PICODLP is not set
# CONFIG_LCD_L4F00242T03 is not set
# CONFIG_LCD_LMS283GF05 is not set
# CONFIG_LCD_LTV350QV is not set
diff --git a/config-debug b/config-debug
index a252390..e33c42c 100644
--- a/config-debug
+++ b/config-debug
@@ -24,6 +24,7 @@ CONFIG_FAIL_MAKE_REQUEST=y
CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAIL_IO_TIMEOUT=y
+CONFIG_FAIL_MMC_REQUEST=y
CONFIG_SLUB_DEBUG_ON=y
diff --git a/config-generic b/config-generic
index f944644..6ec1960 100644
--- a/config-generic
+++ b/config-generic
@@ -89,6 +89,8 @@ CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
CONFIG_HT_IRQ=y
CONFIG_PCI_MSI=y
CONFIG_PCIEPORTBUS=y
@@ -528,6 +530,8 @@ CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
CONFIG_SCSI_MPT2SAS_LOGGING=y
+CONFIG_SCSI_MVUMI=m
+
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_OSD_DPRINT_SENSE=1
@@ -2917,6 +2921,7 @@ CONFIG_FB_SAVAGE_ACCEL=y
CONFIG_FB_SIS_300=y
CONFIG_FB_SIS_315=y
CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
CONFIG_FB_TILEBLITTING=y
CONFIG_FB_TRIDENT=m
# CONFIG_FB_UVESA is not set
@@ -3604,6 +3609,7 @@ CONFIG_LOGFS=m
CONFIG_CEPH_FS=m
CONFIG_BLK_DEV_RBD=m
CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_FSCACHE=m
CONFIG_FSCACHE_STATS=y
diff --git a/config-nodebug b/config-nodebug
index a6acb91..25fbef8 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -24,6 +24,7 @@ CONFIG_FAIL_MAKE_REQUEST=y
CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAIL_IO_TIMEOUT=y
+CONFIG_FAIL_MMC_REQUEST=y
CONFIG_SLUB_DEBUG_ON=y
diff --git a/config-sparc64-generic b/config-sparc64-generic
index e5ee2c4..e9b66f6 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -43,6 +43,7 @@ CONFIG_I2C_ALI1535=m
# CONFIG_VGASTATE is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BW2 is not set
+# CONFIG_FB_GRVGA is not set
CONFIG_FB_CG3=y
CONFIG_FB_CG6=y
# CONFIG_FB_RIVA is not set
diff --git a/kernel.spec b/kernel.spec
index 70027c7..07fc238 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -677,7 +677,6 @@ Patch2905: media-dib0700-correct-error-message.patch
# patches headed upstream
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch12021: udlfb-bind-framebuffer-to-interface.patch
Patch12022: x86-efi-Calling-__pa-with-an-ioremap-address-is-invalid.patch
Patch12024: epoll-fix-spurious-lockdep-warnings.patch
@@ -702,9 +701,6 @@ Patch20000: utrace.patch
Patch21000: arm-omap-dt-compat.patch
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
-#rhbz #722509
-Patch21002: mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
-
#rhbz #735946
Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
@@ -1278,7 +1274,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
# Patches headed upstream
ApplyPatch disable-i8042-check-on-apple-mac.patch
-ApplyPatch udlfb-bind-framebuffer-to-interface.patch
ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
ApplyPatch epoll-limit-paths.patch
ApplyPatch block-stray-block-put-after-teardown.patch
@@ -1299,9 +1294,6 @@ ApplyPatch hvcs_pi_buf_alloc.patch
ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
-#rhbz #722509
-ApplyPatch mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
-
ApplyPatch media-DiBcom-protect-the-I2C-bufer-access.patch
ApplyPatch media-dib0700-protect-the-dib0700-buffer-access.patch
ApplyPatch media-dib0700-correct-error-message.patch
@@ -1997,6 +1989,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Oct 31 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-git3. Happy Halloween.
+
* Fri Oct 28 2011 Josh Boyer <jwboyer at redhat.com>
- Linux 3.1-git2
diff --git a/sources b/sources
index 50a6248..a357384 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
-f1c7a6ed2090ffd76affc7b1f0612317 patch-3.1-git2.bz2
+f6754489c6fb6de511c3fcd2b2fa4474 patch-3.1-git3.bz2
More information about the scm-commits
mailing list