[kernel] Linux 3.1-git4 (upstream dc47d3810cdc)

Josh Boyer jwboyer at fedoraproject.org
Tue Nov 1 19:17:54 UTC 2011 

commit 906f34d53bd601a61ff7567e00495c78aa5f62ef
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Nov 1 15:13:32 2011 -0400

    Linux 3.1-git4 (upstream dc47d3810cdc)

 ...imit-direct-reclaim-for-higher-order-allo.patch |   54 -
 ...claim-compaction-if-compaction-can-procee.patch |   81 --
 TODO                                               |    6 -
 config-arm-generic                                 |    1 +
 config-arm-omap-generic                            |    2 +
 config-generic                                     |   20 +-
 config-x86_64-generic                              |    3 +
 crypto-register-cryptd-first.patch                 |   26 -
 epoll-fix-spurious-lockdep-warnings.patch          |  119 --
 kernel.spec                                        |   35 +-
 linux-2.6-debug-taint-vm.patch                     |   66 --
 media-DiBcom-protect-the-I2C-bufer-access.patch    | 1150 --------------------
 media-dib0700-correct-error-message.patch          |  103 --
 ...dib0700-protect-the-dib0700-buffer-access.patch |  248 -----
 sources                                            |    1 +
 ...g-__pa-with-an-ioremap-address-is-invalid.patch |  211 ----
 16 files changed, 28 insertions(+), 2098 deletions(-)
---
diff --git a/TODO b/TODO
index ae1fc21..6f14c66 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,12 @@
 **** Queued for 3.2 ***********************************************************************************
 
-* linux-2.6-debug-taint-vm.patch
-* epoll-fix-spurious-lockdep-warnings.patch
 * hvcs_pi_buf_alloc.patch
 * acpi-ensure-thermal-limits-match-cpu-freq.patch
 * revert-efi-rtclock.patch
 * block-stray-block-put-after-teardown.patch
-* crypto-register-cryptd-first.patch
 * efi-dont-map-boot-services-on-32bit.patch
 * powerpc-Fix-deadlock-in-icswx-code.patch
 * usb-add-quirk-for-logitech-webcams.patch (reworked, sent upstream)
-* 000[12]-mm-*
-* x86-efi-Calling-__pa-with-an-ioremap-address-is-invalid.patch (also CC'd to
- stable)
 * epoll-limit-paths.patch (in linux-next via -mm tree)
 
 **** Other stuff that should go upstream (in decreasing likelyhood) ************************************
diff --git a/config-arm-generic b/config-arm-generic
index 19e9af4..332ada6 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -55,6 +55,7 @@ CONFIG_HIGH_RES_TIMERS=y
 
 CONFIG_LEDS=y
 CONFIG_LEDS_CPU=y
+# CONFIG_LEDS_RENESAS_TPU is not set
 
 CONFIG_MTD_AFS_PARTS=y
 CONFIG_MTD_ARM_INTEGRATOR=y
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index e8b6b6a..d836a90 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -688,6 +688,8 @@ CONFIG_VIDEO_OMAP2_VOUT=m
 # CONFIG_VIDEO_AU0828 is not set
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_OMAP3 is not set
+# CONFIG_VIDEO_MT9P031 is not set
+# CONFIG_VIDEO_MT9T001 is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_USB_ET61X251=m
 CONFIG_USB_SN9C102=m
diff --git a/config-generic b/config-generic
index 6ec1960..e56124b 100644
--- a/config-generic
+++ b/config-generic
@@ -2094,7 +2094,6 @@ CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
 
-CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 
@@ -2628,6 +2627,9 @@ CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TLG2300=m
 # CONFIG_VIDEO_TIMBERDALE is not set
 # CONFIG_VIDEO_M5MOLS is not set
@@ -2755,6 +2757,13 @@ CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_DW2102=m
 CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_S921=m
 CONFIG_DVB_ISL6405=m
@@ -2834,6 +2843,7 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_RC_CORE=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_RC_MAP=m
+CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
@@ -2849,6 +2859,7 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_REDRAT3=m
 
+
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
 
@@ -3308,6 +3319,7 @@ CONFIG_USB_GSPCA_SPCA561=m
 CONFIG_USB_GSPCA_STK014=m
 CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_ZC3XX=m
@@ -3954,6 +3966,9 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_USER=m
+
+
 
 # Random number generation
 
@@ -4413,7 +4428,6 @@ CONFIG_UWB_I1480U=m
 CONFIG_STAGING=y
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
-# CONFIG_VIDEO_TM6000 is not set
 # CONFIG_WLAGS49_H2 is not set
 # CONFIG_WLAGS49_H25 is not set
 # CONFIG_VIDEO_DT3155 is not set
@@ -4461,7 +4475,7 @@ CONFIG_USB_ATMEL=m
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_RTS_PSTOR is not set
 # CONFIG_DRM_PSB is not set
-# CONFIG_ALTERA_STAPL is not set
+CONFIG_ALTERA_STAPL=m
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_USBIP_CORE is not set
 # CONFIG_BRCMSMAC is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 49448bd..f6645fe 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -44,6 +44,9 @@ CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
diff --git a/kernel.spec b/kernel.spec
index 0d4b61c..ff5734e 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 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -623,8 +623,6 @@ Patch100: taint-vbox.patch
 Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
 Patch161: linux-2.6-i386-nx-emulation.patch
 
-Patch202: linux-2.6-debug-taint-vm.patch
-
 Patch383: linux-2.6-defaults-aspm.patch
 
 Patch390: linux-2.6-defaults-acpi-video.patch
@@ -674,10 +672,6 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 
-Patch2903: media-DiBcom-protect-the-I2C-bufer-access.patch
-Patch2904: media-dib0700-protect-the-dib0700-buffer-access.patch
-Patch2905: media-dib0700-correct-error-message.patch
-
 # fs fixes
 
 # NFSv4
@@ -685,12 +679,8 @@ Patch2905: media-dib0700-correct-error-message.patch
 # patches headed upstream
 Patch12016: disable-i8042-check-on-apple-mac.patch
 
-Patch12022: x86-efi-Calling-__pa-with-an-ioremap-address-is-invalid.patch
-
-Patch12024: epoll-fix-spurious-lockdep-warnings.patch
 Patch12026: block-stray-block-put-after-teardown.patch
 Patch12027: usb-add-quirk-for-logitech-webcams.patch
-Patch12029: crypto-register-cryptd-first.patch
 Patch12030: epoll-limit-paths.patch
 
 Patch12303: dmar-disable-when-ricoh-multifunction.patch
@@ -709,10 +699,6 @@ Patch20000: utrace.patch
 Patch21000: arm-omap-dt-compat.patch
 Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.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
-
 #rhbz 749166
 Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
 
@@ -1245,9 +1231,6 @@ ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
 ApplyPatch acpi-ensure-thermal-limits-match-cpu-freq.patch
 ApplyPatch acpi-sony-nonvs-blacklist.patch
 
-# Various low-impact patches to aid debugging.
-ApplyPatch linux-2.6-debug-taint-vm.patch
-
 #
 # PCI
 #
@@ -1320,15 +1303,10 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 # Patches headed upstream
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
-ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
 ApplyPatch epoll-limit-paths.patch
 ApplyPatch block-stray-block-put-after-teardown.patch
 ApplyPatch usb-add-quirk-for-logitech-webcams.patch
 
-ApplyPatch crypto-register-cryptd-first.patch
-
-ApplyPatch x86-efi-Calling-__pa-with-an-ioremap-address-is-invalid.patch
-
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 
@@ -1340,17 +1318,9 @@ ApplyPatch hvcs_pi_buf_alloc.patch
 
 ApplyPatch powerpc-Fix-deadlock-in-icswx-code.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
-
 # utrace.
 ApplyPatch utrace.patch
 
-#rhbz #735946
-ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
-ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
-
 ApplyPatch select-regmap-from-wm8400.patch
 
 #rhbz 750402
@@ -2059,6 +2029,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Nov 01 2011 Josh Boyer <jwboyer at redhat.com>
+- Linux 3.1-git4
+
 * Tue Nov 01 2011 Dave Jones <davej at redhat.com>
 - allow building the perf rpm for ARM (rhbz 741325)
 
diff --git a/sources b/sources
index a357384..42103e6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
 f6754489c6fb6de511c3fcd2b2fa4474  patch-3.1-git3.bz2
+349569748e059f2b64adab5eb7cf42e6  patch-3.1-git4.bz2

More information about the scm-commits mailing list