The patch titled
My name is Ingo Molnar, you killed my make allyesconfig, prepare to die
has been added to the -mm tree. Its filename is
my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: My name is Ingo Molnar, you killed my make allyesconfig, prepare to die
From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Teach the qdi driver to be more polite about probing when compiled in so
that crazy people who try to execute their `make allyesconfig' kernels
don't get burned.
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/pata_qdi.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff -puN drivers/scsi/pata_qdi.c~my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die drivers/scsi/pata_qdi.c
--- a/drivers/scsi/pata_qdi.c~my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die
+++ a/drivers/scsi/pata_qdi.c
@@ -26,7 +26,7 @@
#include <linux/platform_device.h>
#define DRV_NAME "pata_qdi"
-#define DRV_VERSION "0.2.3"
+#define DRV_VERSION "0.2.4"
#define NR_HOST 4 /* Two 6580s */
@@ -41,7 +41,13 @@ struct qdi_data {
static struct ata_host_set *qdi_host[NR_HOST];
static struct qdi_data qdi_data[NR_HOST];
-static int nr_qdi_host = 0;
+static int nr_qdi_host;
+
+#ifdef MODULE
+static int probe_qdi = 1;
+#else
+static int probe_qdi;
+#endif
static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
{
@@ -302,6 +308,9 @@ static __init int qdi_init(void)
int ct = 0;
int i;
+ if (probe_qdi == 0)
+ return;
+
/*
* Check each possible QD65xx base address
*/
@@ -390,3 +399,5 @@ MODULE_VERSION(DRV_VERSION);
module_init(qdi_init);
module_exit(qdi_exit);
+module_param(probe_qdi, int, 0);
+
_
Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are
origin.patch
fix-istallion=y.patch
edac-pci-device-to-device-cleanup.patch
edac-mc-numbers-refactor-1-of-2.patch
edac-probe1-cleanup-1-of-2.patch
edac-maintainers-update.patch
via-pata-controller-xfer-fixes.patch
git-pcmcia.patch
git-scsi-misc.patch
megaraid-gcc-41-warning-fix.patch
my-name-is-ingo-molnar-you-killed-my-make-allyesconfig-prepare-to-die.patch
fix-problem-with-atapi-dma-on-it8212-in-linux.patch
ide-claim-extra-dma-ports-regardless-of-channel.patch
ide-always-release-dma-engine.patch
ide-error-handling-fixes.patch
ide-hpt3xxn-clocking-fixes.patch
ide-fix-hpt37x-timing-tables.patch
ide-optimize-hpt37x-timing-tables.patch
ide-fix-hpt3xx-hotswap-support.patch
ide-fix-the-case-of-multiple-hpt3xx-chips-present.patch
ide-hpt3xx-fix-pci-clock-detection.patch
ide-hpt3xx-fix-pci-clock-detection-fix-2.patch
piix-fix-82371mx-enablebits.patch
piix-remove-check-for-broken-mw-dma-mode-0.patch
piix-slc90e66-pio-mode-fallback-fix.patch
make-number-of-ide-interfaces-configurable.patch
ide_dma_speed-fixes.patch
hpt3xx-rework-rate-filtering.patch
hpt3xx-rework-rate-filtering-tidy.patch
hpt3xx-print-the-real-chip-name-at-startup.patch
hpt3xx-switch-to-using-pci_get_slot.patch
hpt3xx-cache-channels-mcr-address.patch
hpt3x7-merge-speedproc-handlers.patch
hpt370-clean-up-dma-timeout-handling.patch
enable-cdrom-dma-access-with-pdc20265_old.patch
ide-fix-revision-comparison-in-ide_in_drive_list.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch
hpt3xx-init-code-rewrite.patch
revert-tty-buffering-comment-out-debug-code.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
