Linux 3.1-git3. Happy Halloween.
This commit is contained in:
Josh Boyer
parent
dff0854796
commit
8e04ce5a38
1
Makefile
1
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
13
kernel.spec
13
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@redhat.com>
|
||||
- Linux 3.1-git3. Happy Halloween.
|
||||
|
||||
* Fri Oct 28 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Linux 3.1-git2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
From 65ff02dff67bf26a9c27d9aa11a30eaf3d28469e Mon Sep 17 00:00:00 2001
|
||||
From: Josh Boyer <jwboyer@redhat.com>
|
||||
Date: Wed, 5 Oct 2011 11:29:57 -0400
|
||||
Subject: [PATCH] mmc: Always check for lower base frequency quirk for Ricoh
|
||||
1180:e823
|
||||
|
||||
Commit 15bed0f2f added a quirk for the e823 Ricoh card reader to lower the
|
||||
base frequency. However, the quirk first checks to see if the proprietary
|
||||
MMC controller is disabled, and returns if so. On some devices, such as the
|
||||
Lenovo X220, the MMC controller is already disabled by firmware it seems,
|
||||
but the frequency change is still needed so sdhci-pci can talk to the cards.
|
||||
Since the MMC controller is disabled, the frequency fixup was never being run
|
||||
on these machines.
|
||||
|
||||
This moves the e823 check above the MMC controller check so that it always
|
||||
gets run.
|
||||
|
||||
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=722509
|
||||
|
||||
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
|
||||
---
|
||||
drivers/pci/quirks.c | 28 ++++++++++++++--------------
|
||||
1 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index 1196f61..cec4629 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -2745,20 +2745,6 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
|
||||
/* disable must be done via function #0 */
|
||||
if (PCI_FUNC(dev->devfn))
|
||||
return;
|
||||
-
|
||||
- pci_read_config_byte(dev, 0xCB, &disable);
|
||||
-
|
||||
- if (disable & 0x02)
|
||||
- return;
|
||||
-
|
||||
- pci_read_config_byte(dev, 0xCA, &write_enable);
|
||||
- pci_write_config_byte(dev, 0xCA, 0x57);
|
||||
- pci_write_config_byte(dev, 0xCB, disable | 0x02);
|
||||
- pci_write_config_byte(dev, 0xCA, write_enable);
|
||||
-
|
||||
- dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n");
|
||||
- dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n");
|
||||
-
|
||||
/*
|
||||
* RICOH 0xe823 SD/MMC card reader fails to recognize
|
||||
* certain types of SD/MMC cards. Lowering the SD base
|
||||
@@ -2781,6 +2767,20 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
|
||||
|
||||
dev_notice(&dev->dev, "MMC controller base frequency changed to 50Mhz.\n");
|
||||
}
|
||||
+
|
||||
+ pci_read_config_byte(dev, 0xCB, &disable);
|
||||
+
|
||||
+ if (disable & 0x02)
|
||||
+ return;
|
||||
+
|
||||
+ pci_read_config_byte(dev, 0xCA, &write_enable);
|
||||
+ pci_write_config_byte(dev, 0xCA, 0x57);
|
||||
+ pci_write_config_byte(dev, 0xCB, disable | 0x02);
|
||||
+ pci_write_config_byte(dev, 0xCA, write_enable);
|
||||
+
|
||||
+ dev_notice(&dev->dev, "proprietary Ricoh MMC controller disabled (via firewire function)\n");
|
||||
+ dev_notice(&dev->dev, "MMC cards are now supported by standard SDHCI controller\n");
|
||||
+
|
||||
}
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
|
||||
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
|
||||
f1c7a6ed2090ffd76affc7b1f0612317 patch-3.1-git2.bz2
|
||||
f6754489c6fb6de511c3fcd2b2fa4474 patch-3.1-git3.bz2
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From c91a793f66d5b06292aa431ae3a36c8aca991fa3 Mon Sep 17 00:00:00 2001
|
||||
From: Kay Sievers <kay.sievers@vrfy.org>
|
||||
Date: Tue, 5 Jul 2011 17:04:11 -0700
|
||||
Subject: [PATCH] drivers/video/udlfb bind framebuffer to interface.
|
||||
|
||||
Udlfb has been binding the framebuffer device to its parent, which
|
||||
isn't correct and causes confusion with operations like udev remove.
|
||||
|
||||
Coming plug and play multiseat support is dependent on this fix.
|
||||
|
||||
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
|
||||
Signed-off-by: Bernie Thompson <bernie@plugable.com>
|
||||
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
||||
---
|
||||
drivers/video/udlfb.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
|
||||
index 816a4fd..c6584c9 100644
|
||||
--- a/drivers/video/udlfb.c
|
||||
+++ b/drivers/video/udlfb.c
|
||||
@@ -1549,7 +1549,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
|
||||
/* We don't register a new USB class. Our client interface is fbdev */
|
||||
|
||||
/* allocates framebuffer driver structure, not framebuffer memory */
|
||||
- info = framebuffer_alloc(0, &usbdev->dev);
|
||||
+ info = framebuffer_alloc(0, &interface->dev);
|
||||
if (!info) {
|
||||
retval = -ENOMEM;
|
||||
pr_err("framebuffer_alloc failed\n");
|
||||
--
|
||||
1.7.4.4
|
||||
|
||||
Loading…
Reference in New Issue