)]}' { "log": [ { "commit": "ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a", "tree": "2223e34469b7d70a2c740b55379fd09ff95257b6", "parents": [ "e27fc7e476077c724f313a3ddec44ad26c49f678", "0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 22:04:12 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 18 22:04:12 2011 -0200" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:\n cy82c693: fix PCI device selection\n icside: DMA support fix\n IDE: Don\u0027t powerdown Compaq Triflex IDE device on suspend\n piix: ICH7 MWDMA1 errata\n" }, { "commit": "3ec7215e5d1a714ef65069a1d0999a31e4930bb7", "tree": "c68f48ad75828a95b57125704e2d206b6cebf90c", "parents": [ "59433a59b073b88cb32efd03af8ac9b13d56f4cf" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed May 25 21:40:59 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:46 2011 +0100" }, "message": "ide-{cd,floppy,tape}: Do not include \u003clinux/irq.h\u003e\n\nThe top of \u003clinux/irq.h\u003e has this comment:\n\n * Please do not include this file in generic code. There is currently\n * no requirement for any architecture to implement anything held\n * within this file.\n *\n * Thanks. --rmk\n\nRemove inclusion of \u003clinux/irq.h\u003e, to prevent the following compile error\nfrom happening soon:\n\n| include/linux/irq.h:132: error: redefinition of ‘struct irq_data’\n| include/linux/irq.h:286: error: redefinition of ‘struct irq_chip’\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Borislav Petkov \u003cbp@alien8.de\u003e\nCc: linux-ide@vger.kernel.org\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "d6748066ad0e8b2514545998f8367ebb3906f299", "tree": "f7a9bfd764a8fb781aeda0ef2249afbab42dddf7", "parents": [ "f04c045f8ce69c22bda9d99eb927276b776135fc", "3ba1e543ab4b02640d396098f2f6a199560d5f2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 13:28:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Nov 03 13:28:14 2011 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)\n MIPS: O32: Provide definition of registers ta0 .. ta3.\n MIPS: perf: Add Octeon support for hardware perf.\n MIPS: perf: Add support for 64-bit perf counters.\n MIPS: perf: Reorganize contents of perf support files.\n MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c\n MIPS: Add accessor macros for 64-bit performance counter registers.\n MIPS: Add probes for more Octeon II CPUs.\n MIPS: Add more CPU identifiers for Octeon II CPUs.\n MIPS: XLR, XLS: Add comment for smp setup\n MIPS: JZ4740: GPIO: Check correct IRQ in demux handler\n MIPS: JZ4740: GPIO: Simplify IRQ demuxer\n MIPS: JZ4740: Use generic irq chip\n MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines\n MIPS: Alchemy: kill au1xxx.h header\n MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines\n MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep\n MIPS: Alchemy: Redo PCI as platform driver\n MIPS: Alchemy: more base address cleanup\n MIPS: Alchemy: rewrite USB platform setup.\n MIPS: Alchemy: abstract USB block control register access\n ...\n\nFix up trivial conflicts in:\n\tarch/mips/alchemy/devboards/db1x00/platform.c\n\tdrivers/ide/Kconfig\n\tdrivers/mmc/host/au1xmmc.c\n\tdrivers/video/Kconfig\n\tsound/mips/Kconfig\n" }, { "commit": "bff7832dd6670dd0e215ce32d60b18f3825a6555", "tree": "a3ec5bb11d9708086568639220ed768cdbc48889", "parents": [ "38789fda295689689d064c0157bc363b1837b5e6" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 03 13:41:29 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:37 2011 -0400" }, "message": "ide/ata: Add module.h to the implicit modular users\n\nA pending cleanup will mean that module.h won\u0027t be implicitly\neverywhere anymore. Make sure the modular drivers in the ide dir\nare actually calling out for \u003cmodule.h\u003e explicitly in advance.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "38789fda295689689d064c0157bc363b1837b5e6", "tree": "ff03cfacc7dcc05faecc18fd5b1b213a1eef9c3c", "parents": [ "fec14d2fcebe824377ef0305babc365d039f6b39" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 17 15:33:58 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:37 2011 -0400" }, "message": "ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed\n\nThey were getting this implicitly by an include of module.h\nfrom device.h -- but we are going to clean that up and break\nthat include chain, so include export.h explicitly now.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "ca90666287401b475d9e0becf85bd02f069f1de8", "tree": "ad4dd789f8d5ab639c78997d3655b94fcbf660ef", "parents": [ "60325f0c6ee7c6b68f95aaa643260fb33d4bdd88", "374e759db148d1e874e3afb76707082af67e0984" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 27 08:39:10 2011 +0200" }, "message": "Merge branch \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027gpio\u0027 of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)\n ARM: 7135/1: ep93xx: bring back missing \u003cmach/gpio.h\u003e\n ARM: 7104/1: plat-pxa: break out GPIO driver specifics\n ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem\n ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics\n ARM: 7101/1: arm/tegra: Replace \u003cmach/gpio.h\u003e with \u003cmach/gpio-tegra.h\u003e\n ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h\n ARM: 7083/1: rewrite U300 GPIO to use gpiolib\n ARM: 7074/1: gpio: davinci: eliminate unused variable warnings\n ARM: 7063/1: Orion: gpio: add missing include of linux/types.h\n ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build\n ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio\n ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq\n ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio\n ARM: 7057/1: mach-pnx4008: rename GPIO header\n ARM: 7056/1: plat-nomadik: kill off \u003cplat/gpio.h\u003e\n ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function\n ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem\n ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics\n ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem\n ARM: 7043/1: mach-ixp2000: rename GPIO header\n ...\n\nFix up trivial conflicts in arch/arm/mach-u300/Kconfig manually\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "3766386037827fe7064f57f9aec27b3b5e9417aa", "tree": "306a7b1ccf3100469fd711af37963801d8d387c0", "parents": [ "50d5676ebac57c187ac347bae24290f0dc16fdbe" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Fri Aug 12 11:39:45 2011 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Oct 24 23:34:24 2011 +0100" }, "message": "MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines\n\nNow that no driver any longer depends on the CONFIG_SOC_AU1??? symbols,\nit\u0027s time to get rid of them: Move some of the platform devices to the\nboards which can use them, Rename a few (unused) constants in the header,\nReplace them with MIPS_ALCHEMY in the various Kconfig files. Finally\ndelete them altogether from the Alchemy Kconfig file.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nPatchwork: https://patchwork.linux-mips.org/patch/2707/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "50d5676ebac57c187ac347bae24290f0dc16fdbe", "tree": "0f967ceb36482f6e8c0d2831c9bd0c957e12fdeb", "parents": [ "f2e442fd2ff4ed565835e407114f75c92c9fe443" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Fri Aug 12 11:39:43 2011 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Oct 24 23:34:24 2011 +0100" }, "message": "MIPS: Alchemy: kill au1xxx.h header\n\nNo longer required\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nPatchwork: https://patchwork.linux-mips.org/patch/2705/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n delete mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx.h\n" }, { "commit": "d4f07ae748539d792162a9aa56f192c3992cb3fb", "tree": "6f87cb57e87ebc4a76fa377633da00d404ac652e", "parents": [ "7517de348663b08a808aff44b5300e817157a568" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Thu Aug 18 11:11:58 2011 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Oct 24 23:34:24 2011 +0100" }, "message": "MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep\n\nau1xxx-ide uses defines from the pb1200/db1200 headers:\nget DBDMA ID through platform resource information,\nhardcode register spacing. The only 2 users of this driver (and\nthe only boards it can really work on realiably) use the same\nregister layout.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nCc: linux-ide@vger.kernel.org\nTo: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nCc: linux-ide@vger.kernel.org\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nPatchwork: https://patchwork.linux-mips.org/patch/2716/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92", "tree": "876459554ff66e9c1e30bb9f1ac34b1e32fc68d2", "parents": [ "acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Thu Oct 13 00:28:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 13 17:04:50 2011 -0400" }, "message": "cy82c693: fix PCI device selection\n\nWrong PCI device may be selected by cy82c693_set_pio_mode() if modular\nIDE host drivers are used and there are additional IDE PCI devices\ninstalled in the system. Fix it.\n\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acc8dbe7f44f1bab6fcf21f2d5efb32ea92e19fd", "tree": "e7c2fe6790992dd632c76c0171ab1429ed7fe67b", "parents": [ "839e7306e5d1ebd57cf12e83d9910b8b2dbe79ba" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Wed Oct 12 04:45:34 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 13 17:04:50 2011 -0400" }, "message": "icside: DMA support fix\n\nFix problem introduced by commit 5e37bdc (\"ide: add struct\nide_dma_ops (take 3)\"): d.dma_ops shouldn\u0027t be cleared if\nwe are going to use DMA.\n\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "839e7306e5d1ebd57cf12e83d9910b8b2dbe79ba", "tree": "85977ca70f0181dac828cd6b7e2f294f2c5c4a0f", "parents": [ "dc9c0beecfeb4866fdbc245c295cf30d340b702c" ], "author": { "name": "Mikulas Patocka", "email": "mikulas@artax.karlin.mff.cuni.cz", "time": "Wed Oct 12 04:31:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 13 17:04:49 2011 -0400" }, "message": "IDE: Don\u0027t powerdown Compaq Triflex IDE device on suspend\n\nDon\u0027t powerdown Compaq Triflex IDE device on suspend\n\nThis fixes APM suspend on Compaq Armada 7400.\nAPM BIOS doesn\u0027t suspend if IDE is powered down when suspending.\nThe Triflex controller is found only on old Compaq boards,\nso this patch will hopefully have no side effects.\n\nThis patch fixes a suspend regression introduced in\nfeb22b7f8e62b1b987a3a1dbad95af767a1df832 (\"ide: add proper PCI PM\nsupport (v2)\").\n\nSigned-off-by: Mikulas Patocka \u003cmikulas@artax.karlin.mff.cuni.cz\u003e\n[bart: add commit\u0027s summary in parens]\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6af677ea59fb62ae6b720a9e5e9d5cba32ada553", "tree": "cf40612753d083ae70727dbd9a96040ceb6d37f7", "parents": [ "c0b5bf090bb47104ac78f463063933966c6ca00b" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Oct 10 11:44:51 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Oct 13 18:14:28 2011 +0200" }, "message": "Kconfig: remove redundant CONFIG_ prefix on two symbols\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "1d1136012163ab5e33a97f9779af269cf4049cb9", "tree": "2397f9b4b18c7274003f84f169ce1a38275d008f", "parents": [ "b2f9452bd5234d573898bbda52a410b154f8f510" ], "author": { "name": "Johann Felix Soden", "email": "johfel@users.sourceforge.net", "time": "Mon Oct 10 11:37:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 13 18:25:11 2011 +1200" }, "message": "ide: Fix file references in drivers/ide/\n\nFix file references in drivers/ide/\n\nThere are a lot of file references to now moved or deleted files in the\nwhole tree, especially in documentation and Kconfig files. This patch\nfixes the references in drivers/ide/.\n\nSigned-off-by: Johann Felix Soden \u003cjohfel@users.sourceforge.net\u003e\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dc9c0beecfeb4866fdbc245c295cf30d340b702c", "tree": "1b649c406bef866cfac9e346bcc4188def54477c", "parents": [ "65112dccf8a113737684366349d7f9ec373ddc47" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Tue Oct 11 15:19:43 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 11 15:19:43 2011 -0400" }, "message": "piix: ICH7 MWDMA1 errata\n\nBased on libata commit c611bed7.\n\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "40cba97105d1892ee1170bc281484f559aaa5138", "tree": "879f251c5432b760641d481fcf9e607e3835f9ce", "parents": [ "1f01358cec0e4ea40cda00cee7c6a209bc82cc8d" ], "author": { "name": "Johann Felix Soden", "email": "johfel@users.sourceforge.net", "time": "Mon Oct 10 23:48:53 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 10 23:48:53 2011 +0200" }, "message": "Fix file references in drivers/ide/\n\nThere are a lot of file references to now moved or deleted files in the\nwhole tree, especially in documentation and Kconfig files. This patch\nfixes the references in drivers/ide/.\n\nSigned-off-by: Johann Felix Soden \u003cjohfel@users.sourceforge.net\u003e\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "2c8fc867602e385fd2abe76da0b6bda8ed907547", "tree": "21507c7b823953e8632ae4a1853d1196b6ff02a3", "parents": [ "9b13776977d45505469edc6decc93e9e3799afe2" ], "author": { "name": "Borislav Petkov", "email": "bp@alien8.de", "time": "Mon Oct 03 14:28:18 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 03 14:28:18 2011 -0400" }, "message": "ide-disk: Fix request requeuing\n\nSimon Kirby reported that on his RAID setup with idedisk underneath\nthe box OOMs after a couple of days of runtime. Running with\nCONFIG_DEBUG_KMEMLEAK pointed to idedisk_prep_fn() which unconditionally\nallocates an ide_cmd struct. However, ide_requeue_and_plug() can be\ncalled more than once per request, either from the request issue or the\nIRQ handler path and do blk_peek_request() ends up in idedisk_prep_fn()\nrepeatedly, allocating a struct ide_cmd everytime and \"forgetting\" the\nprevious pointer.\n\nMake sure the code reuses the old allocated chunk.\n\nReported-and-tested-by: Simon Kirby \u003csim@hostway.ca\u003e\nCc: \u003cstable@kernel.org\u003e [ 39.x, 3.0.x ]\nLink: http://marc.info/?l\u003dlinux-kernel\u0026m\u003d131667641517919\nLink: http://lkml.kernel.org/r/20110922072643.GA27232@hostway.ca\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60e8972dc7e1df843d7132fb572e74f10502a4b7", "tree": "b5edecee53b01b7581951b0640e4126396e2d3bf", "parents": [ "1bc857f700fb14bbcb990a81b1255f39807ae59e" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Jul 26 10:56:19 2011 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Aug 08 14:27:48 2011 +0100" }, "message": "ARM: gpio: at91: convert drivers to use asm/gpio.h rather than mach/gpio.h\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0302899e144296d6ce8cb3679a9a42d5c6436910", "tree": "b6c4c8414f93f9feb4142f68ab02c7bfb1f284f6", "parents": [ "89e9aad65ffad96c3a35ff979a61a65761873951" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 04 01:30:34 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 04 01:30:34 2011 -0700" }, "message": "drivers/ide/cy82c693.c: Add missing pci_dev_put\n\nPci_get_slot calls pci_dev_get, so pci_dev_put is needed before leaving the\nfunction in the case where pci_get_slot is locally used.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nlocal idexpression x;\nexpression e;\n@@\n\n*x \u003d pci_get_slot(...)\n... when !\u003d true x \u003d\u003d NULL\n when !\u003d pci_dev_put(x)\n when !\u003d e \u003d x\n when !\u003d if (x !\u003d NULL) {\u003c+... pci_dev_put(x); ...+\u003e}\n*return ...;\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89e9aad65ffad96c3a35ff979a61a65761873951", "tree": "8197ad0688a895fa190b4e03a975610b41b4d583", "parents": [ "288d5abec8314ae50fe6692f324b0444acae8486" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Aug 04 01:29:51 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 04 01:29:51 2011 -0700" }, "message": "ide: Fix irq flags madness\n\ncommit ec1a123 (IDE: pass IRQ flags to the IDE core) introduced the\nbogosity of passing unfiltered resource-\u003eflags to the irq_flags which\nare used for request_irq. It results in random bits set (especially\nIORESOURCE_IRQ which maps to IRQF_PER_CPU).\n\nFilter the bits proper.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "3307d0d83b7bf636dc6dd2aa4a584d0f52cc185b", "tree": "69a8886e0cd21e6369fd196e237972a5fbfcaefc", "parents": [ "56a210526adb2854d5b7c398a40260720390ee05" ], "author": { "name": "Connor Hansen", "email": "cmdkhh@gmail.com", "time": "Sat Jun 11 15:06:48 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 11 15:06:48 2011 -0700" }, "message": "ide-cd: signedness warning fix again\n\nOne of the legit warnings \u0027make W\u003d3 drivers/ide/ide-cd.c\u0027\ngenerates is:\ndrivers/ide/ide-cd.c: In function ide_cd_do_request\ndrivers/ide/ide-cd.c:828:2: warning: conversion to int from \\\nunsigned int may change the sign of the result\ndrivers/ide/ide-cd.c:833:2: warning: conversion to int from \\\nunsigned int may change the sign of the result\n\nnsectors is declared int, should be unsigned int.\n\nblk_rq_sectors() returns unsigned int, and ide_complete_rq\nexpects unsigned int as well. Fixes both warnings.\n\nSigned-off-by: Connor Hansen \u003ccmdkhh@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "0f48f2600911d5de6393829e4a9986d4075558b3", "tree": "39745ab1858bb308f3b101f5ae555f08485bb7ea", "parents": [ "3f303103b884ca577908d3e5c0650ad12e40c586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "message": "block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal\n\nJens\u0027 back-merge commit 698567f3fa79 (\"Merge commit \u0027v2.6.39\u0027 into\nfor-2.6.40/core\") was incorrectly done, and re-introduced the\nDISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits\n\n - 9fd097b14918 (\"block: unexport DISK_EVENT_MEDIA_CHANGE for\n legacy/fringe drivers\")\n\n - 7eec77a1816a (\"ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd\n and ide-cd\")\n\nbecause of conflicts with the \"g-\u003eflags\" updates near-by by commit\nd4dc210f69bc (\"block: don\u0027t block events on excl write for non-optical\ndevices\")\n\nAs a result, we re-introduced the hanging behavior due to infinite disk\nmedia change reports.\n\nTssk, tssk, people! Don\u0027t do back-merges at all, and *definitely* don\u0027t\ndo them to hide merge conflicts from me - especially as I\u0027m likely\nbetter at merging them than you are, since I do so many merges.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "798ce8f1cca29dcc3f4b55947f611f4ffb32ac2b", "tree": "15fba84ba4b930397c29fe562504f66211365699", "parents": [ "22e12bbc9bc38c6d0bd541d061a0f547596fc19d", "1547010e6e15a3f44f49381246421a1e19de526e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:14:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 09:14:07 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.40/core\u0027 of git://git.kernel.dk/linux-2.6-block: (40 commits)\n cfq-iosched: free cic_index if cfqd allocation fails\n cfq-iosched: remove unused \u0027group_changed\u0027 in cfq_service_tree_add()\n cfq-iosched: reduce bit operations in cfq_choose_req()\n cfq-iosched: algebraic simplification in cfq_prio_to_maxrq()\n blk-cgroup: Initialize ioc-\u003ecgroup_changed at ioc creation time\n block: move bd_set_size() above rescan_partitions() in __blkdev_get()\n block: call elv_bio_merged() when merged\n cfq-iosched: Make IO merge related stats per cpu\n cfq-iosched: Fix a memory leak of per cpu stats for root group\n backing-dev: Kill set but not used var in bdi_debug_stats_show()\n block: get rid of on-stack plugging debug checks\n blk-throttle: Make no throttling rule group processing lockless\n blk-cgroup: Make cgroup stat reset path blkg-\u003elock free for dispatch stats\n blk-cgroup: Make 64bit per cpu stats safe on 32bit arch\n blk-throttle: Make dispatch stats per cpu\n blk-throttle: Free up a group only after one rcu grace period\n blk-throttle: Use helper function to add root throtl group to lists\n blk-throttle: Introduce a helper function to fill in device details\n blk-throttle: Dynamically allocate root group\n blk-cgroup: Allow sleeping while dynamically allocating a group\n ...\n" }, { "commit": "f50d1d9e8d964fdd3b4cedfbca8843d1bc5916c1", "tree": "105b5bc4bb96b555dba90fa11dd5af66784c132f", "parents": [ "98b98d316349e9a028e632629fe813d07fa5afdd", "4ef7e71444b48cc89152cbc499ed94dde50515ee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:28:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 13:28:35 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: Make struct pcmcia_device_id const, sound drivers edition\n staging: pcmcia: Convert pcmcia_device_id declarations to const\n pcmcia: Convert pcmcia_device_id declarations to const\n pcmcia: Make declaration and uses of struct pcmcia_device_id const\n pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data\n" }, { "commit": "d798f7f080805ad7e15fc37a43d8c6f91edb6dda", "tree": "73e3783cb619d3a5dc40a5f32859f063b5cd0664", "parents": [ "e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6", "db210f824c2f155703edf03bc2137da1bd76e27d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:08:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 22:08:32 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n ide/ide-scan-pci.c: Use for_each_pci_dev().\n ide: Use linux/mutex.h\n IDE: ide-floppy, remove unnecessary NULL check\n drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata\n ide: fix use after free in ide-acpi\n" }, { "commit": "698567f3fa790fea37509a54dea855302dd88331", "tree": "7a1df976a0eb12cab03e82c18809a30d5482fee4", "parents": [ "d70d0711edd8076ec2ce0ed109106e2df950681b", "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri May 20 20:33:15 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri May 20 20:33:15 2011 +0200" }, "message": "Merge commit \u0027v2.6.39\u0027 into for-2.6.40/core\n\nSince for-2.6.40/core was forked off the 2.6.39 devel tree, we\u0027ve\nhad churn in the core area that makes it difficult to handle\npatches for eg cfq or blk-throttle. Instead of requiring that they\nbe based in older versions with bugs that have been fixed later\nin the rc cycle, merge in 2.6.39 final.\n\nAlso fixes up conflicts in the below files.\n\nConflicts:\n\tdrivers/block/paride/pcd.c\n\tdrivers/cdrom/viocd.c\n\tdrivers/ide/ide-cd.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "db210f824c2f155703edf03bc2137da1bd76e27d", "tree": "6d1a27d428c6ffbe92552964b77db18eff1ddb8d", "parents": [ "245e37182b7dead255bdc9e333e0bcc128360675" ], "author": { "name": "Thiago Farina", "email": "tfransosi@gmail.com", "time": "Sun May 01 12:10:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 16 14:24:46 2011 -0700" }, "message": "ide/ide-scan-pci.c: Use for_each_pci_dev().\n\nUse for_each_pci_dev() to simplify the code.\n\nSigned-off-by: Thiago Farina \u003ctfransosi@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25f8f54f6e178acfd503a95441b0ea05c525f751", "tree": "47837e1b55600602d129afb373670104f8012c60", "parents": [ "e9fb13bfec7e017130ddc5c1b5466340470f4900" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue May 03 19:29:01 2011 -0700" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri May 06 07:46:22 2011 +0200" }, "message": "pcmcia: Convert pcmcia_device_id declarations to const\n\nSaves about 50KB of data.\n\nOld/new size of all objects:\n text\t data\t bss\t dec\t hex\tfilename\n 563015\t 80096\t 130684\t 773795\t bcea3\t(TOTALS)\n 610916\t 32256\t 130632\t 773804\t bceac\t(TOTALS)\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Kurt Van Dijck \u003ckurt.van.dijck@eia.be\u003e (for drivers/net/can/softing/softing_cs.c)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "d4dc210f69bcb0b4bef5a83b1c323817be89bad1", "tree": "58774a27fa6faff1260a416a86d2c121f0013431", "parents": [ "1196f8b814f32cd04df334abf47648c2a9fd8324" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 21 20:54:46 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Apr 21 20:54:46 2011 +0200" }, "message": "block: don\u0027t block events on excl write for non-optical devices\n\nDisk event code automatically blocks events on excl write. This is\nprimarily to avoid issuing polling commands while burning is in\nprogress. This behavior doesn\u0027t fit other types of devices with\nremoveable media where polling commands don\u0027t have adverse side\neffects and door locking usually doesn\u0027t exist.\n\nThis patch introduces new genhd flag which controls the auto-blocking\nbehavior and uses it to enable auto-blocking only on optical devices.\n\nNote for stable: 2.6.38 and later only\n\nCc: stable@kernel.org\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7eec77a1816a7042591a6cbdb4820e9e7ebffe0e", "tree": "138c0ed198471151e2590fc3d35f56c5d57ba720", "parents": [ "7c88a168da8003fd4d8fb6ae103c4ecf29cb1130" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 21 19:43:59 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Apr 21 19:43:59 2011 +0200" }, "message": "ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd\n\ncheck_events() implementations in both ide-gd and ide-cd are\ninadequate for in-kernel event polling. Both generate media change\nevents continuously when certain conditions are met causing infinite\nevent loop between the driver and userland event handler.\n\nAs disk event now supports suppression of unlisted events, simply\nde-listing DISK_EVENT_MEDIA_CHANGE from disk-\u003eevents resolves the\nproblem. Internal handling around media revalidation will behave the\nsame while userland will fall back to userland event polling after\ndetecting the device doesn\u0027t support disk events.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "782b86e2656762382ae1c2686d8d5c91f7d5eacf", "tree": "a2d47765c87d1407e67ac55634c2bcbfa6cddb59", "parents": [ "f83e826181f7f8fb152e4190d03854fc3a5dd040" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Apr 05 03:29:57 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Apr 05 23:52:49 2011 +0200" }, "message": "ide: always ensure that blk_delay_queue() is called if we have pending IO\n\nJust because we are not requeuing a request does not mean that\nsome aren\u0027t pending. So always issue a blk_delay_queue() if\neither we are requeueing OR there\u0027s pending IO.\n\nThis fixes a boot problem for some IDE boxes.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "929e27252e8ca69363f81f26af5eaba62cb4c572", "tree": "12dea354d609e42222195f8b6cbe5728893de01b", "parents": [ "6f0379377047b18103b88ce33c03e5b19747ae57" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Wed Mar 30 12:22:23 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Apr 05 23:51:37 2011 +0200" }, "message": "ide: ide_requeue_and_plug() reinstate \"always plug\" behaviour\n\nWe see stalls if we don\u0027t always ensure that the queue gets run\nagain. Even if rq \u003d\u003d NULL, we could have other pending requests\nin the queue.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "9ced0b95b3993660e7990cf6bf68c1a80f31544e", "tree": "d424345b88c0f2dae88beb6bbb5d153b028f824a", "parents": [ "40471856f2e38e9bfa8d605295e8234421110dd6" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Mar 26 19:49:54 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Mar 26 19:49:54 2011 +0100" }, "message": "ide: ensure that we re-run the queue handler\n\nThe conversion to blk_delay_queue() missed parts of IDE.\nAdd a blk_delay_queue() to ensure that the request handler\ngets reinvoked when it needs to.\n\nNote that in all but one place the old plug re-run delay of\n3 msecs is used, even though it probably could be shorter\nfor performance reasons in some of those cases.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "6c5103890057b1bb781b26b7aae38d33e4c517d8", "tree": "e6e57961dcddcb5841acb34956e70b9dc696a880", "parents": [ "3dab04e6978e358ad2307bca563fabd6c5d2c58b", "9d2e157d970a73b3f270b631828e03eb452d525e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block: (65 commits)\n Documentation/iostats.txt: bit-size reference etc.\n cfq-iosched: removing unnecessary think time checking\n cfq-iosched: Don\u0027t clear queue stats when preempt.\n blk-throttle: Reset group slice when limits are changed\n blk-cgroup: Only give unaccounted_time under debug\n cfq-iosched: Don\u0027t set active queue in preempt\n block: fix non-atomic access to genhd inflight structures\n block: attempt to merge with existing requests on plug flush\n block: NULL dereference on error path in __blkdev_get()\n cfq-iosched: Don\u0027t update group weights when on service tree\n fs: assign sb-\u003es_bdi to default_backing_dev_info if the bdi is going away\n block: Require subsystems to explicitly allocate bio_set integrity mempool\n jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n fs: make fsync_buffers_list() plug\n mm: make generic_writepages() use plugging\n blk-cgroup: Add unaccounted time to timeslice_used.\n block: fixup plugging stubs for !CONFIG_BLOCK\n block: remove obsolete comments for blkdev_issue_zeroout.\n blktrace: Use rq-\u003ecmd_flags directly in blk_add_trace_rq.\n ...\n\nFix up conflicts in fs/{aio.c,super.c}\n" }, { "commit": "732f36d82fc4acfd2fa77c939494edeee390b080", "tree": "e38430cfbd232755109f13467844f1acedf08c37", "parents": [ "5c39e31195f49f6725f04b22921eca2388a3f909" ], "author": { "name": "matt mooney", "email": "mfm@muteddisk.com", "time": "Fri Jan 14 06:12:39 2011 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu Mar 17 14:05:34 2011 +0100" }, "message": "ide: change to new flag variable\n\nReplace EXTRA_CFLAGS with ccflags-y.\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "4c63f5646e405b5010cc9499419060bf2e838f5b", "tree": "df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1", "parents": [ "cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24", "69d60eb96ae8a73cf9b79cf28051caf973006011" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "message": "Merge branch \u0027for-2.6.39/stack-plug\u0027 into for-2.6.39/core\n\nConflicts:\n\tblock/blk-core.c\n\tblock/blk-flush.c\n\tdrivers/md/raid1.c\n\tdrivers/md/raid10.c\n\tdrivers/md/raid5.c\n\tfs/nilfs2/btnode.c\n\tfs/nilfs2/mdt.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7eaceaccab5f40bbfda044629a6298616aeaed50", "tree": "33954d12f63e25a47eb6d86ef3d3d0a5e62bf752", "parents": [ "73c101011926c5832e6e141682180c4debe2cf45" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "message": "block: remove per-queue plugging\n\nCode has been converted over to the new explicit on-stack plugging,\nand delay users have been converted to use the new API for that.\nSo lets kill off the old plugging along with aops-\u003esync_page().\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "0a41e90bb7c931fd53d73ea770f5b251af6c91ce", "tree": "efb0bdfece80587bdc4985500eeb43df08585feb", "parents": [ "3cca6dc1c81e2407928dc4c6105252146fd3924f" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Apr 16 21:11:21 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:45:54 2011 +0100" }, "message": "ide-cd: convert to blk_delay_queue() for a short pause\n\nIt was always abuse to reuse the plugging infrastructure for this,\nconvert it to the (new) real API for delaying queueing a bit.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b03a1b140e13a28ff6be1526892a9dc538ddef6", "tree": "63d6acaaf4d3c7855cbe4a76dca73f66cda72c31", "parents": [ "69e02c59a7d962dced8047401b81a8d897e1702e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 09 19:54:27 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 09 19:54:27 2011 +0100" }, "message": "ide: Convert to bdops-\u003echeck_events()\n\nConvert -\u003emedia_changed() to the new -\u003echeck_events() method. The\nconversion is mostly mechanical. The only notable change is that\ncdrom now doesn\u0027t generate any event if @slot_nr isn\u0027t CDSL_CURRENT.\nIt used to return -EINVAL which would be treated as media changed. As\nmedia changer isn\u0027t supported anyway, this doesn\u0027t make any\ndifference.\n\nThis makes ide emit the standard disk events and allows kernel event\npolling. Currently, only MEDIA_CHANGE event is implemented. Adding\nsupport for EJECT_REQUEST shouldn\u0027t be difficult; however, given that\nide driver is already deprecated, it probably is best to leave it\nalone.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: linux-ide@vger.kernel.org\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f17bfe79e6aa34aecbd579258a5c55a790807aca", "tree": "e25465febd94697cd720f4c63b529e3ca8d5c753", "parents": [ "f2ba70a22c31a179226fa0517729104497a7853f" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Mon Nov 22 11:39:30 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 11:39:30 2010 -0800" }, "message": "IDE: ide-floppy, remove unnecessary NULL check\n\nStanse found that rq in ide_floppy_callback cannot be NULL, because it\nis dereferenced all around. So remove the superfluous check.\n\nThis appeared after blk_* macros removal.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2ba70a22c31a179226fa0517729104497a7853f", "tree": "3695ff637d2e69679ea746c13db266c0c930d677", "parents": [ "ba5787323d38084b30261e84510d4a173fcb493a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Nov 22 11:38:08 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 11:38:08 2010 -0800" }, "message": "drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba5787323d38084b30261e84510d4a173fcb493a", "tree": "8d3c718f5627ac5898bcd56a993e6aca944dabfc", "parents": [ "dd8717da6da9b0e745df49762be4573010f1013c" ], "author": { "name": "Mariusz Kozlowski", "email": "mk@lab.zgora.pl", "time": "Mon Nov 22 11:37:21 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 11:37:21 2010 -0800" }, "message": "ide: fix use after free in ide-acpi\n\nout_obj points to kfreed memory and we dereference that pointer in\nDEBPRINT/printk.\n\nSigned-off-by: Mariusz Kozlowski \u003cmk@lab.zgora.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dd8717da6da9b0e745df49762be4573010f1013c", "tree": "e1875e541ce097b30edc17e431b4dd7074218c00", "parents": [ "bbe54d78cc59a39f1ef3ffbe70423376ad9aab4c" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Apr 08 01:45:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 10:17:30 2010 -0700" }, "message": "ide: clean up timed out request handling\n\n8f6205cd572fece673da0255d74843680f67f879 introduced a bug where a\ntimed out DMA request is never requeued and lost.\n6072f7491f5ef391a575e18a1165e72a3eef1601 fixed this by making\nide_dma_timeout_retry() requeue the request itself. While the fix is\ncorrect, it makes DMA and non-DMA paths asymmetric regarding how the\nin flight request is requeued.\n\nAs long as hwif-\u003erq is set, the IDE driver is assuming ownership of\nthe request and the request should either be completed or requeued\nwhen clearing hwif-\u003erq. In the timeout path, the ide driver holds\nonto the request as long as the recovery action (ie. reset) is in\nprogress and clears it after the state machine is stopped (ide_stopped\nreturn), so the existing requeueing logic is correct. The bug\noccurred because ide_dma_timeout_retry() explicitly clears hwif-\u003erq\nwithout requeueing it.\n\nide_dma_timeout_retry() is called only by ide_timer_expiry() and\nreturns ide_started only when ide_error() would return it - ie. after\nreset state machine has started in which case the state machine will\neventually end up executing the ide_stopped path in ide_timer_expiry()\nafter reset protocol is complete. So, there is no need to clear\nhwif-\u003erq from ide_dma_timeout_retry(). ide_timer_expiry() will handle\nit the same way as PIO timeout path.\n\nKill hwif-\u003erq clearing and requeueing from ide_dma_timeout_retry() and\nlet ide_timer_expiry() deal with it. The end result should remain the\nsame.\n\ngrepping shows ide_dma_timeout_retry() is the only site which clears\nhwif-\u003erq without taking care of the request, so there shouldn\u0027t be\nsimilar fallouts.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbe54d78cc59a39f1ef3ffbe70423376ad9aab4c", "tree": "57f31f976c066738ef0f726bab4233786f9087ff", "parents": [ "5d3f1a493e19f34ba427936b76f0b5624a2fc62a" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Mon Sep 27 11:01:32 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 10:17:29 2010 -0700" }, "message": "hpt366: fix clock turnaround\n\nDPLL clock (0x21) should be used for writes and PCI clock (0x23) for reads,\nnot vice versa.\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d3f1a493e19f34ba427936b76f0b5624a2fc62a", "tree": "ef5dc2f973f4b8ed5450c7be1a748a51d28394bc", "parents": [ "b18cae4224bde7e5a332c19bc99247b2098ea232" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Mon Sep 27 11:00:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 10:17:29 2010 -0700" }, "message": "hpt366: add debounce delay to cable_detect() method\n\nAlan Cox reported that cable detection sometimes works unreliably\nfor HPT3xxN and that the issue is fixed by adding debounce delay\nas used by the vendor drivers.\n\nWhile at it, get rid of unneeded parens/space in the vicinity...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "a2887097f25cd38cadfc11d10769e2b349fb5eca", "tree": "cd4adcb305365d6ba9acd2c02d4eb9d0125c6f8d", "parents": [ "8abfc6e7a45eb74e51904bbae676fae008b11366", "005a1d15f5a6b2bb4ada80349513effbf22b4588" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 17:07:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 17:07:18 2010 -0700" }, "message": "Merge branch \u0027for-2.6.37/barrier\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.37/barrier\u0027 of git://git.kernel.dk/linux-2.6-block: (46 commits)\n xen-blkfront: disable barrier/flush write support\n Added blk-lib.c and blk-barrier.c was renamed to blk-flush.c\n block: remove BLKDEV_IFL_WAIT\n aic7xxx_old: removed unused \u0027req\u0027 variable\n block: remove the BH_Eopnotsupp flag\n block: remove the BLKDEV_IFL_BARRIER flag\n block: remove the WRITE_BARRIER flag\n swap: do not send discards as barriers\n fat: do not send discards as barriers\n ext4: do not send discards as barriers\n jbd2: replace barriers with explicit flush / FUA usage\n jbd2: Modify ASYNC_COMMIT code to not rely on queue draining on barrier\n jbd: replace barriers with explicit flush / FUA usage\n nilfs2: replace barriers with explicit flush / FUA usage\n reiserfs: replace barriers with explicit flush / FUA usage\n gfs2: replace barriers with explicit flush / FUA usage\n btrfs: replace barriers with explicit flush / FUA usage\n xfs: replace barriers with explicit flush / FUA usage\n block: pass gfp_mask and flags to sb_issue_discard\n dm: convey that all flushes are processed as empty\n ...\n" }, { "commit": "092e0e7e520a1fca03e13c9f2d157432a8657ff2", "tree": "451897252c4c08c4b5a8ef535da156f1e817e80b", "parents": [ "79f14b7c56d3b3ba58f8b43d1f70b9b71477a800", "776c163b1b93c8dfa5edba885bc2bfbc2d228a5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "message": "Merge branch \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n vfs: make no_llseek the default\n vfs: don\u0027t use BKL in default_llseek\n llseek: automatically add .llseek fop\n libfs: use generic_file_llseek for simple_attr\n mac80211: disallow seeks in minstrel debug code\n lirc: make chardev nonseekable\n viotape: use noop_llseek\n raw: use explicit llseek file operations\n ibmasmfs: use generic_file_llseek\n spufs: use llseek in all file operations\n arm/omap: use generic_file_llseek in iommu_debug\n lkdtm: use generic_file_llseek in debugfs\n net/wireless: use generic_file_llseek in debugfs\n drm: use noop_llseek\n" }, { "commit": "c37927d4359e81b85de644f8fb08878717cf5f3f", "tree": "25dabf2d905e1410819d1bdaba0bf5f779100d3c", "parents": [ "5704e44d283e907623e3775c1262f206a2c48cf3", "2a48fc0ab24241755dc93bfd4f01d68efab47f5a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:49:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:49:54 2010 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n block: autoconvert trivial BKL users to private mutex\n drivers: autoconvert trivial BKL users to private mutex\n ipmi: autoconvert trivial BKL users to private mutex\n mac: autoconvert trivial BKL users to private mutex\n mtd: autoconvert trivial BKL users to private mutex\n scsi: autoconvert trivial BKL users to private mutex\n\nFix up trivial conflicts (due to addition of private mutex right next to\ndeletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c\n" }, { "commit": "fa251f89903d73989e2f63e13d0eaed1e07ce0da", "tree": "3f7fe779941e3b6d67754dd7c44a32f48ea47c74", "parents": [ "dd3932eddf428571762596e17b65f5dc92ca361b", "cd07202cc8262e1669edff0d97715f3dd9260917" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Oct 19 09:13:04 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Oct 19 09:13:04 2010 +0200" }, "message": "Merge branch \u0027v2.6.36-rc8\u0027 into for-2.6.37/barrier\n\nConflicts:\n\tblock/blk-core.c\n\tdrivers/block/loop.c\n\tmm/swapfile.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "6038f373a3dc1f1c26496e60b6c40b164716f07e", "tree": "a0d3bbd026eea41b9fc36b8c722cbaf56cd9f825", "parents": [ "1ec5584e3edf9c4bf2c88c846534d19cf986ba11" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Aug 15 18:52:59 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Oct 15 15:53:27 2010 +0200" }, "message": "llseek: automatically add .llseek fop\n\nAll file_operations should get a .llseek operation so we can make\nnonseekable_open the default for future file operations without a\n.llseek pointer.\n\nThe three cases that we can automatically detect are no_llseek, seq_lseek\nand default_llseek. For cases where we can we can automatically prove that\nthe file offset is always ignored, we use noop_llseek, which maintains\nthe current behavior of not returning an error from a seek.\n\nNew drivers should normally not use noop_llseek but instead use no_llseek\nand call nonseekable_open at open time. Existing drivers can be converted\nto do the same when the maintainer knows for certain that no user code\nrelies on calling seek on the device file.\n\nThe generated code is often incorrectly indented and right now contains\ncomments that clarify for each added line why a specific variant was\nchosen. In the version that gets submitted upstream, the comments will\nbe gone and I will manually fix the indentation, because there does not\nseem to be a way to do that using coccinelle.\n\nSome amount of new code is currently sitting in linux-next that should get\nthe same modifications, which I will do at the end of the merge window.\n\nMany thanks to Julia Lawall for helping me learn to write a semantic\npatch that does all this.\n\n\u003d\u003d\u003d\u003d\u003d begin semantic patch \u003d\u003d\u003d\u003d\u003d\n// This adds an llseek\u003d method to all file operations,\n// as a preparation for making no_llseek the default.\n//\n// The rules are\n// - use no_llseek explicitly if we do nonseekable_open\n// - use seq_lseek for sequential files\n// - use default_llseek if we know we access f_pos\n// - use noop_llseek if we know we don\u0027t access f_pos,\n// but we still want to allow users to call lseek\n//\n@ open1 exists @\nidentifier nested_open;\n@@\nnested_open(...)\n{\n\u003c+...\nnonseekable_open(...)\n...+\u003e\n}\n\n@ open exists@\nidentifier open_f;\nidentifier i, f;\nidentifier open1.nested_open;\n@@\nint open_f(struct inode *i, struct file *f)\n{\n\u003c+...\n(\nnonseekable_open(...)\n|\nnested_open(...)\n)\n...+\u003e\n}\n\n@ read disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ read_no_fpos disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ write @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ write_no_fpos @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ fops0 @\nidentifier fops;\n@@\nstruct file_operations fops \u003d {\n ...\n};\n\n@ has_llseek depends on fops0 @\nidentifier fops0.fops;\nidentifier llseek_f;\n@@\nstruct file_operations fops \u003d {\n...\n .llseek \u003d llseek_f,\n...\n};\n\n@ has_read depends on fops0 @\nidentifier fops0.fops;\nidentifier read_f;\n@@\nstruct file_operations fops \u003d {\n...\n .read \u003d read_f,\n...\n};\n\n@ has_write depends on fops0 @\nidentifier fops0.fops;\nidentifier write_f;\n@@\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n...\n};\n\n@ has_open depends on fops0 @\nidentifier fops0.fops;\nidentifier open_f;\n@@\nstruct file_operations fops \u003d {\n...\n .open \u003d open_f,\n...\n};\n\n// use no_llseek if we call nonseekable_open\n////////////////////////////////////////////\n@ nonseekable1 depends on !has_llseek \u0026\u0026 has_open @\nidentifier fops0.fops;\nidentifier nso ~\u003d \"nonseekable_open\";\n@@\nstruct file_operations fops \u003d {\n... .open \u003d nso, ...\n+.llseek \u003d no_llseek, /* nonseekable */\n};\n\n@ nonseekable2 depends on !has_llseek @\nidentifier fops0.fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n... .open \u003d open_f, ...\n+.llseek \u003d no_llseek, /* open uses nonseekable */\n};\n\n// use seq_lseek for sequential files\n/////////////////////////////////////\n@ seq depends on !has_llseek @\nidentifier fops0.fops;\nidentifier sr ~\u003d \"seq_read\";\n@@\nstruct file_operations fops \u003d {\n... .read \u003d sr, ...\n+.llseek \u003d seq_lseek, /* we have seq_read */\n};\n\n// use default_llseek if there is a readdir\n///////////////////////////////////////////\n@ fops1 depends on !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier readdir_e;\n@@\n// any other fop is used that changes pos\nstruct file_operations fops \u003d {\n... .readdir \u003d readdir_e, ...\n+.llseek \u003d default_llseek, /* readdir is present */\n};\n\n// use default_llseek if at least one of read/write touches f_pos\n/////////////////////////////////////////////////////////////////\n@ fops2 depends on !fops1 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read.read_f;\n@@\n// read fops use offset\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d default_llseek, /* read accesses f_pos */\n};\n\n@ fops3 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+\t.llseek \u003d default_llseek, /* write accesses f_pos */\n};\n\n// Use noop_llseek if neither read nor write accesses f_pos\n///////////////////////////////////////////////////////////\n\n@ fops4 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !fops3 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\nidentifier write_no_fpos.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n .read \u003d read_f,\n...\n+.llseek \u003d noop_llseek, /* read and write both use no f_pos */\n};\n\n@ depends on has_write \u0026\u0026 !has_read \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write_no_fpos.write_f;\n@@\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+.llseek \u003d noop_llseek, /* write uses no f_pos */\n};\n\n@ depends on has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\n@@\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d noop_llseek, /* read uses no f_pos */\n};\n\n@ depends on !has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\n@@\nstruct file_operations fops \u003d {\n...\n+.llseek \u003d noop_llseek, /* no read or write fn */\n};\n\u003d\u003d\u003d\u003d\u003d End semantic patch \u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\n" }, { "commit": "2a48fc0ab24241755dc93bfd4f01d68efab47f5a", "tree": "fa9ae10ce89b26b7d8ae9ce24bdfda5e3007b763", "parents": [ "613655fa39ff6957754fa8ceb8559980920eb8ee" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Jun 02 14:28:52 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Oct 05 15:01:10 2010 +0200" }, "message": "block: autoconvert trivial BKL users to private mutex\n\nThe block device drivers have all gained new lock_kernel\ncalls from a recent pushdown, and some of the drivers\nwere already using the BKL before.\n\nThis turns the BKL into a set of per-driver mutexes.\nStill need to check whether this is safe to do.\n\nfile\u003d$1\nname\u003d$2\nif grep -q lock_kernel ${file} ; then\n if grep -q \u0027include.*linux.mutex.h\u0027 ${file} ; then\n sed -i \u0027/include.*\u003clinux\\/smp_lock.h\u003e/d\u0027 ${file}\n else\n sed -i \u0027s/include.*\u003clinux\\/smp_lock.h\u003e.*$/include \u003clinux\\/mutex.h\u003e/g\u0027 ${file}\n fi\n sed -i ${file} \\\n -e \"/^#include.*linux.mutex.h/,$ {\n 1,/^\\(static\\|int\\|long\\)/ {\n /^\\(static\\|int\\|long\\)/istatic DEFINE_MUTEX(${name}_mutex);\n\n} }\" \\\n -e \"s/\\(un\\)*lock_kernel\\\u003e[ ]*()/mutex_\\1lock(\\\u0026${name}_mutex)/g\" \\\n -e \u0027/[ ]*cycle_kernel_lock();/d\u0027\nelse\n sed -i -e \u0027/include.*\\\u003csmp_lock.h\\\u003e/d\u0027 ${file} \\\n -e \u0027/cycle_kernel_lock()/d\u0027\nfi\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "2262054e74b4b26ed56a8535c1259f6c6c2862a4", "tree": "fbcd0aa7879408b9676c2df6c7514e5d7428880a", "parents": [ "06b3a1d12f41b592972643f8b84015d6c03dc576" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Aug 15 08:38:38 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:25 2010 +0200" }, "message": "pcmcia: remove obsolete and wrong comments\n\nWhat\u0027s worse than no comment? A wrong comment.\n\nSeveral PCMCIA device drivers contained the same comments, which\nwere based on how the PCMCIA subsystem worked in the old days of 2.4.,\nand which were originally part of a \"dummy_cs\" driver. These comments\nno longer matched at all what is happening now, and therefore should\nbe removed.\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "2e9b981a7c63ee8278df6823f8389d69dad1a499", "tree": "7d88e2a03a3202ba26ce7dbcf6909e28d44f690c", "parents": [ "1cc745d1cdca8086b472a06671f0830fc0e98861" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sun Aug 08 11:36:26 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:24 2010 +0200" }, "message": "pcmcia: move driver name to struct pcmcia_driver\n\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "00990e7ce0b0e596fe41d9c64d6933ea70084003", "tree": "189e0dd92860feba84231c66955749574cac5d6d", "parents": [ "440eed43e2a95bb842488755683716814da10f2b" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 13:13:46 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:24 2010 +0200" }, "message": "pcmcia: use autoconfiguration feature for ioports and iomem\n\nWhen CONF_AUTO_SET_IO or CONF_AUTO_SET_IOMEM are set, the corresponding\nfields in struct pcmcia_device *p_dev-\u003eresource[0,1,2] are set\naccordinly. Drivers wishing to override certain settings may do so in\nthe callback function, but they no longer need to parse the CIS entries\nstored in cistpl_cftable_entry_t themselves.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: linux-bluetooth@vger.kernel.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "440eed43e2a95bb842488755683716814da10f2b", "tree": "45c49181a077f845cd366cfa7dc07f259fd01078", "parents": [ "9485ee14e143c7076e88deea1e87ca3eb0b2f94e" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 09:51:52 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:23 2010 +0200" }, "message": "pcmcia: introduce autoconfiguration feature\n\nIntroduce an autoconfiguration feature to set certain values in\npcmcia_loop_config(), instead of copying the same code over and over\nin each PCMCIA driver. At first, introduce the following options:\n\nCONF_AUTO_CHECK_VCC\tcheck or matching Vcc entry\nCONF_AUTO_SET_VPP\tset Vpp\nCONF_AUTO_AUDIO\t\tenable the speaker line\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "1ac71e5a35eebee60cdcf15b3980bd94498f037b", "tree": "22fa9342ccccce6a774af029ce51a526e55f8180", "parents": [ "7feabb6412ea23edd298c0fa90e5aa6733eb4a42" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 19:27:09 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:23 2010 +0200" }, "message": "pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device\n\npcmcia_enable_device() now replaces pcmcia_request_configuration().\nInstead of config_req_t, all necessary flags are either passed as\na parameter to pcmcia_enable_device(), or (in rare circumstances)\nset in struct pcmcia_device -\u003e flags.\n\nWith the last remaining user of include/pcmcia/cs.h gone, remove\nall references.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "7feabb6412ea23edd298c0fa90e5aa6733eb4a42", "tree": "bfafe961aeb5449a71fbb389172b3a6c68b56e7c", "parents": [ "37979e1546a790c44adbc7f27a85569944480ebc" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 18:35:47 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:22 2010 +0200" }, "message": "pcmcia: move config_{base,index,regs} to struct pcmcia_device\n\nSeveral drivers prefer to explicitly set config_{base,index,regs},\nformerly known as ConfigBase, ConfigIndex and Present. Instead of\npassing these values inside config_req_t, store it in struct\npcmcia_device.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "37979e1546a790c44adbc7f27a85569944480ebc", "tree": "18499b4d2890409c1cbe49cc1af97b57f4a2c906", "parents": [ "fc301101034c06bf56a7f71bf682c48909e401a4" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 16:33:23 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:22 2010 +0200" }, "message": "pcmcia: simplify IntType\n\nIntType was only set to INT_MEMORY (driver pcmciamtd) or INT_MEMORY_AND_IO\n(all other drivers). As this flags seems to relate to ioport access, make\nit conditional to the driver having requested IO port access. There are two\ndrivers which do not request IO ports, but did set INT_MEMORY_AND_IO:\nray_cs and b43. For those, we consistently only set INT_MEMORY in future.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Jiri Kosina \u003cjkosina@suse.cz\u003e\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "e8405f0f617856de0ceb7d04e65b663051451544", "tree": "06e9cd27419a40587bcec19b71010e52b7dfcba4", "parents": [ "fb49fa533f9d211994c33efb752ffa5b30033729" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Thu Jul 29 15:50:55 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Sep 29 17:20:21 2010 +0200" }, "message": "pcmcia: move Vpp setup to struct pcmcia_device\n\nSome drivers prefer to explicitly set Vpp. Instead of passing the\nvoltage inside config_req_t, store it in struct pcmcia_device.\n\nCC: linux-ide@vger.kernel.org\nCC: netdev@vger.kernel.org\nCC: linux-mtd@lists.infradead.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-serial@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: linux-scsi@vger.kernel.org\nAcked-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e (for drivers/bluetooth)\nTested-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "81cef8e38babd1dd07eb53fccc956620a1b4f32e", "tree": "a012ad63404b652379b8a0bed80825266a94eaad", "parents": [ "7d7dee96e1a7369eae67e5fe5c987785a1c11e40", "dbee032295dac88742734ee9988e08a0e4f2f732" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 19 11:06:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Sep 19 11:06:34 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n ide: Fix ordering of procfs registry.\n" }, { "commit": "dbee032295dac88742734ee9988e08a0e4f2f732", "tree": "75369269de5fe9362369592e8b4fe46be5340da8", "parents": [ "cd078af65d5c2f19c0f378062b07a0a79b000723" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Thu Sep 02 11:28:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 13 21:34:25 2010 -0700" }, "message": "ide: Fix ordering of procfs registry.\n\nWe must ensure that ide_proc_port_register_devices() occurs on an\ninterface before ide_proc_register_driver() executes for that\ninterfaces drives.\n\nTherefore defer the registry of the driver device objects backed by\nide_bus_type until after ide_proc_port_register_devices() has run\nand thus all of the drive-\u003eproc procfs directory pointers have been\nsetup.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4913efe456c987057e5d36a3f0a55422a9072cae", "tree": "295f04a7214e1933df3301dd42c12ff3f282a22c", "parents": [ "6958f145459ca7ad9715024de97445addacb8510" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 03 11:56:16 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Sep 10 12:35:36 2010 +0200" }, "message": "block: deprecate barrier and replace blk_queue_ordered() with blk_queue_flush()\n\nBarrier is deemed too heavy and will soon be replaced by FLUSH/FUA\nrequests. Deprecate barrier. All REQ_HARDBARRIERs are failed with\n-EOPNOTSUPP and blk_queue_ordered() is replaced with simpler\nblk_queue_flush().\n\nblk_queue_flush() takes combinations of REQ_FLUSH and FUA. If a\ndevice has write cache and can flush it, it should set REQ_FLUSH. If\nthe device can handle FUA writes, it should also set REQ_FUA.\n\nAll blk_queue_ordered() users are converted.\n\n* ORDERED_DRAIN is mapped to 0 which is the default value.\n* ORDERED_DRAIN_FLUSH is mapped to REQ_FLUSH.\n* ORDERED_DRAIN_FLUSH_FUA is mapped to REQ_FLUSH | REQ_FUA.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nCc: Chris Wright \u003cchrisw@sous-sol.org\u003e\nCc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Alasdair G Kergon \u003cagk@redhat.com\u003e\nCc: Pierre Ossman \u003cdrzeus@drzeus.cx\u003e\nCc: Stefan Weinhuber \u003cwein@de.ibm.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "0da2f50944976e890ccc9436ab88c0da87788d02", "tree": "d535494f58873f468b73aa39e21e2c0c116a8c62", "parents": [ "76be97c1fc945db08aae1f1b746012662d643e97" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Sep 03 11:56:16 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Sep 10 12:35:36 2010 +0200" }, "message": "ide: remove unnecessary blk_queue_flushing() test in do_ide_request()\n\nUnplugging from a request function doesn\u0027t really help much (it\u0027s\nalready in the request_fn) and soon block layer will be updated to mix\nbarrier sequence with other commands, so there\u0027s no need to treat\nqueue flushing any differently.\n\nide was the only user of blk_queue_flushing(). Remove it.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "08ff45ca60e4bc1cc27a71a9fe06886e870aa7d8", "tree": "e00a0f141cf5396317c1340ddebe396159c9122c", "parents": [ "415b54e37a5d0efa7ff5d4d12285b1e82d574c3e" ], "author": { "name": "Tao Ma", "email": "tao.ma@oracle.com", "time": "Thu Aug 19 12:02:21 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Aug 19 10:54:55 2010 +0200" }, "message": "Use kzalloc in idedisk_prep_fn.\n\nSigned-off-by: Tao Ma \u003ctao.ma@oracle.com\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "1a8bff5b404909436fcf03cac167a76ceaaa5547", "tree": "da700485559d6d5f3d762627aeb45c06a0d7af9a", "parents": [ "c8ba6c52e19c13c2b6fb9ca9e5188799c753914c" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:38 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:39 2010 +0930" }, "message": "ide: use module_param_named rather than module_param_call\n\nIt has the additional benefit of typechecking (in this case, an unsigned int).\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "cd078af65d5c2f19c0f378062b07a0a79b000723", "tree": "240c79f10333e3f2281e441ddca6924633654df1", "parents": [ "7d543d8468348c44010c7b4e6fdd23a398779668" ], "author": { "name": "Atsushi Nemoto", "email": "anemo@mba.ocn.ne.jp", "time": "Fri Jun 04 16:19:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:17:55 2010 -0700" }, "message": "tx493xide: use min_t() macro instead of min()\n\nThis fixes a warning (\"comparison of distinct pointer types lacks a\ncast\") introduced by the commit\n040f6b4f14adb2ca5babb84e9fb2ebc6661e0be2 (\"tx493xide: use -\u003epio_mode\nvalue to determine pair device speed\").\n\nSigned-off-by: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d543d8468348c44010c7b4e6fdd23a398779668", "tree": "8d38259d1d2d4a6a8fca966f4c134e75e50b3df1", "parents": [ "2a800b7bd926c739c07c1690579f03bbd6f1b5a3" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Jun 04 16:11:17 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:17:53 2010 -0700" }, "message": "drivers/ide: Use memdup_user\n\nUse memdup_user when user data is immediately copied into the\nallocated region.\n\nThe semantic patch that makes this change is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nposition p;\nidentifier l1,l2;\n@@\n\n- to \u003d \\(kmalloc@p\\|kzalloc@p\\)(size,flag);\n+ to \u003d memdup_user(from,size);\n if (\n- to\u003d\u003dNULL\n+ IS_ERR(to)\n || ...) {\n \u003c+... when !\u003d goto l1;\n- -ENOMEM\n+ PTR_ERR(to)\n ...+\u003e\n }\n- if (copy_from_user(to, from, size) !\u003d 0) {\n- \u003c+... when !\u003d goto l2;\n- -EFAULT\n- ...+\u003e\n- }\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a800b7bd926c739c07c1690579f03bbd6f1b5a3", "tree": "d632c198baccd6785c05b26d9d8d6367d7778df0", "parents": [ "110712828365ccafcc61a7f4db44c31ed4cf8793" ], "author": { "name": "Yann Dirson", "email": "ydirson@altern.org", "time": "Sun Jul 18 16:11:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:17:51 2010 -0700" }, "message": "via82cxxx: fix typo for VT6415 PCIE PATA IDE Host Controller support.\n\nWithout this fix, init of the via82cxxx driver causes a oops with a\nstack resembling the one below, and the boot blocks between init of\nUSB devices and launch of init (was easy to bisect by booting with\ninit\u003d/bin/sh).\n\n Pid: 279, comm: work_for_cpu Not tainted 2.6.34.1-00003-ga42ea77 #2\n Call Trace:\n [\u003cffffffff81045691\u003e] ? warn_slowpath_common+0x76/0x8c\n [\u003cffffffff810456f9\u003e] ? warn_slowpath_fmt+0x40/0x45\n [\u003cffffffff812eb5a1\u003e] ? printk+0x40/0x47\n [\u003cffffffff8108e1fd\u003e] ? enable_irq+0x3e/0x64\n [\u003cffffffffa0003900\u003e] ? ide_probe_port+0x55c/0x589 [ide_core]\n [\u003cffffffffa0003f22\u003e] ? ide_host_register+0x273/0x628 [ide_core]\n [\u003cffffffffa00083e3\u003e] ? ide_pci_init_two+0x4da/0x5c5 [ide_core]\n [\u003cffffffff8106117e\u003e] ? up+0xe/0x36\n [\u003cffffffff81045d7e\u003e] ? release_console_sem+0x17e/0x1ae\n [\u003cffffffff812d945b\u003e] ? klist_iter_exit+0x14/0x1e\n [\u003cffffffff8120ed23\u003e] ? bus_find_device+0x75/0x83\n [\u003cffffffffa0022832\u003e] ? via_init_one+0x269/0x28a [via82cxxx]\n [\u003cffffffffa00223a2\u003e] ? init_chipset_via82cxxx+0x0/0x1ea [via82cxxx]\n [\u003cffffffff81059f25\u003e] ? do_work_for_cpu+0x0/0x1b\n [\u003cffffffff81190c65\u003e] ? local_pci_probe+0x12/0x16\n [\u003cffffffff81059f30\u003e] ? do_work_for_cpu+0xb/0x1b\n [\u003cffffffff8105d0dd\u003e] ? kthread+0x75/0x7d\n [\u003cffffffff810097e4\u003e] ? kernel_thread_helper+0x4/0x10\n [\u003cffffffff8105d068\u003e] ? kthread+0x0/0x7d\n [\u003cffffffff810097e0\u003e] ? kernel_thread_helper+0x0/0x10\n ---[ end trace 89c8cb70379b5bda ]---\n\nThe typo was introduced in a354ae8747d0687093ce244e76b15b6174d2f098,\nand affects 2.6.33-rc4 and later.\n\nSigned-off-by: Yann Dirson \u003cydirson@altern.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "110712828365ccafcc61a7f4db44c31ed4cf8793", "tree": "f4c5014dab0cd1e66881eeb86286cacc0203e4fa", "parents": [ "45d7f32c7a43cbb9592886d38190e379e2eb2226" ], "author": { "name": "Borislav Petkov", "email": "bp@alien8.de", "time": "Mon Jul 05 21:23:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:17:49 2010 -0700" }, "message": "ide-cd: Do not access completed requests in the irq handler\n\nide_cd_error_cmd() can complete an erroneous request with leftover\nbuffers. Signal this with its return value so that the request is not\naccessed after its completion in the irq handler and we oops.\n\nCc: \u003cstable@kernel.org\u003e # 32.x 33.x 34.x\nSigned-off-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6e9624b8caec290d28b4c6d9ec75749df6372b87", "tree": "47225b544e1da82742795553dc4e8aa70c17afdc", "parents": [ "8a6cfeb6deca3a8fefd639d898b0d163c0b5d368" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Aug 07 18:25:34 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:25:34 2010 +0200" }, "message": "block: push down BKL into .open and .release\n\nThe open and release block_device_operations are currently\ncalled with the BKL held. In order to change that, we must\nfirst make sure that all drivers that currently rely\non this have no regressions.\n\nThis blindly pushes the BKL into all .open and .release\noperations for all block drivers to prepare for the\nnext step. The drivers can subsequently replace the BKL\nwith their own locks or remove it completely when it can\nbe shown that it is not needed.\n\nThe functions blkdev_get and blkdev_put are the only\nremaining users of the big kernel lock in the block\nlayer, besides a few uses in the ioctl code, none\nof which need to serialize with blkdev_{get,put}.\n\nMost of these two functions is also under the protection\nof bdev-\u003ebd_mutex, including the actual calls to\n-\u003eopen and -\u003erelease, and the common code does not\naccess any global data structures that need the BKL.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "8a6cfeb6deca3a8fefd639d898b0d163c0b5d368", "tree": "9a633ad48c3b1ada0519ee7bade0602f940037f6", "parents": [ "34484062445fe905bf02c72f87ddda21881acda3" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jul 08 10:18:46 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:25:00 2010 +0200" }, "message": "block: push down BKL into .locked_ioctl\n\nAs a preparation for the removal of the big kernel\nlock in the block layer, this removes the BKL\nfrom the common ioctl handling code, moving it\ninto every single driver still using it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "00fff26539bfe3fad21c164fc4002d9ede056fb0", "tree": "4909c8eed03133b1d46f689e465ed1f579b8e282", "parents": [ "afc23068103ccfbf1917eb2a007bc15ab5418cc9" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Sat Jul 03 17:45:40 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:24:15 2010 +0200" }, "message": "block: remove q-\u003eprepare_flush_fn completely\n\nThis removes q-\u003eprepare_flush_fn completely (changes the\nblk_queue_ordered API).\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "afc23068103ccfbf1917eb2a007bc15ab5418cc9", "tree": "57a4c920f07dc9447e08912ada3d3ab2e40ef31a", "parents": [ "dd40e456a40ebb87330b7fc694359ce52f1996aa" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Sat Jul 03 17:45:39 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:24:15 2010 +0200" }, "message": "ide: stop using q-\u003eprepare_flush_fn\n\nuse REQ_FLUSH flag instead.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "4c4762d10faf93167b84ee03e4b58dd62012b06f", "tree": "5819c7acb3e457885e77edf124196e62b09fd387", "parents": [ "15fa6e81650a167f82dc0d478f290f1cffa9183d" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Jun 19 17:26:47 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:22:29 2010 +0200" }, "message": "block: fix some more cmd_type cleanup fallout\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7b6d91daee5cac6402186ff224c3af39d79f4a0e", "tree": "b1518cf0b6c301178e0a320f80610cd5b3aa7625", "parents": [ "33659ebbae262228eef4e0fe990f393d1f0ed941" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Aug 07 18:20:39 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:20:39 2010 +0200" }, "message": "block: unify flags for struct bio and struct request\n\nRemove the current bio flags and reuse the request flags for the bio, too.\nThis allows to more easily trace the type of I/O from the filesystem\ndown to the block driver. There were two flags in the bio that were\nmissing in the requests: BIO_RW_UNPLUG and BIO_RW_AHEAD. Also I\u0027ve\nrenamed two request flags that had a superflous RW in them.\n\nNote that the flags are in bio.h despite having the REQ_ name - as\nblkdev.h includes bio.h that is the only way to go for now.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "33659ebbae262228eef4e0fe990f393d1f0ed941", "tree": "fcb537f09359c8dad3a6f6e16dc4319562dc42cc", "parents": [ "7e005f79791dcd58436c88ded4a7f5aed1b82147" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Aug 07 18:17:56 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:17:56 2010 +0200" }, "message": "block: remove wrappers for request type/flags\n\nRemove all the trivial wrappers for the cmd_type and cmd_flags fields in\nstruct requests. This allows much easier grepping for different request\ntypes instead of unwinding through macros.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "90abdc3b973229bae98dd96649d9f7106cc177a4", "tree": "5c1a7a131b65560dd73b5103118d8c7631bd76a4", "parents": [ "9a017a910346afd88ec2e065989903bf211a7d37" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 17:23:51 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:04:11 2010 +0200" }, "message": "pcmcia: do not use io_req_t when calling pcmcia_request_io()\n\nInstead of io_req_t, drivers are now requested to fill out\nstruct pcmcia_device *p_dev-\u003eresource[0,1] for up to two ioport\nranges. After a call to pcmcia_request_io(), the ports found there\nare reserved, after calling pcmcia_request_configuration(), they may\nbe used.\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nCC: Michael Buesch \u003cmb@bu3sch.de\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "9a017a910346afd88ec2e065989903bf211a7d37", "tree": "b407945c6e762f252bb81ae0fd64c745bba2ad11", "parents": [ "2ce4905e4da9f512b38f56a53ece9da2072dd164" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Sat Jul 24 15:58:54 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Tue Aug 03 09:03:59 2010 +0200" }, "message": "pcmcia: do not use io_req_t after call to pcmcia_request_io()\n\nAfter pcmcia_request_io(), do not make use of the values stored in\nio_req_t, but instead use those found in struct pcmcia_device-\u003eresource[].\n\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "ac8b422838046ffc26be4874a3cbae0d313f4209", "tree": "936c8fc9a45ca7a2973c878fc0e20bbae288e5f0", "parents": [ "ce3f9d71bd9c4268698109ad425625a2a8f51e22" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 21 22:38:13 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jul 30 21:07:39 2010 +0200" }, "message": "pcmcia: remove cs_types.h\n\nRemove cs_types.h which is no longer needed: Most definitions aren\u0027t\nused at all, a few can be made away with, and two remaining definitions\n(typedefs, unfortunatley) may be moved to more specific places.\n\nCC: linux-ide@vger.kernel.org\nCC: linux-usb@vger.kernel.org\nCC: laforge@gnumonks.org\nCC: linux-mtd@lists.infradead.org\nCC: alsa-devel@alsa-project.org\nCC: linux-serial@vger.kernel.org\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e (for drivers/bluetooth/)\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b", "tree": "c2c130a74be25b0b2dff992e1a195e2728bdaadd", "parents": [ "fd0961ff67727482bb20ca7e8ea97b83e9de2ddb", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "421f91d21ad6f799dc7b489bb33cc560ccc56f98", "tree": "aaf9f6385233fdf9277e634603156c89ede7f770", "parents": [ "65155b3708137fabee865dc4da822763c0c41208" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jun 11 12:17:00 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:05:05 2010 +0200" }, "message": "fix typos concerning \"initiali[zs]e\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "c2cdf6aba0dfcfb54be646ab630c1bccd180e890", "tree": "97bfd319f0ebe514ef821a080b74860fb9dbaa24", "parents": [ "79905ad50bcf025deb81382413719ed600734941" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:09:18 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 02 17:50:38 2010 +1000" }, "message": "powerpc/macio: Fix probing of macio devices by using the right of match table\n\nGrant patches added an of mach table to struct device_driver. However,\nwhile he changed the macio device code to use that, he left the match\ntable pointer in struct macio_driver and didn\u0027t update drivers to use\nthe \"new\" one, thus breaking the probing.\n\nThis completes the change by moving all drivers to setup the \"new\"\none, removing all traces of the old one, and while at it (since it\nchanges the exact same locations), I also remove two other duplicates\nfrom struct driver which are the name and owner fields.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9aed2302655854586069d90e0d59ce3a0e12809d", "tree": "7d5314f1f7b60891cfe8adb8be4fd6fdbacfae0b", "parents": [ "a24a6b22254bca8d54be6c8b7d8730d09f1058cc" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Dec 08 20:12:20 2009 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed May 26 19:51:09 2010 +0200" }, "message": "m68k: amiga - Amiga Gayle IDE platform device conversion\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "7e125f7b9cbfce4101191b8076d606c517a73066", "tree": "ded140947b146cc7177519cd23cf81912de32687", "parents": [ "064e297c324fff9b62226aae5dc468ebb272433c", "a9ddabc52ce3757a4331d6c1e8bf4065333cc51b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:05:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:05:29 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n cmd640: fix kernel oops in test_irq() method\n pdc202xx_old: ignore \"FIFO empty\" bit in test_irq() method\n pdc202xx_old: wire test_irq() method for PDC2026x\n IDE: pass IRQ flags to the IDE core\n ide: fix comment typo in ide.h\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ee9a3607fb03e804ddf624544105f4e34260c380", "tree": "ce41b6e0fa10982a306f6c142a92dbf3c9961284", "parents": [ "b492e95be0ae672922f4734acf3f5d35c30be948", "d515e86e639890b33a09390d062b0831664f04a2" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-2.6.35\n\nConflicts:\n\tfs/ext3/fsync.c\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "c3e33e043f5e9c583aa59d5591a614b2a8243d3a", "tree": "fe8fef91dafb670fad1f433ae48514472b8d23e5", "parents": [ "56bca01738733709bef076e2e97bbd01e5659f24" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat May 15 20:09:29 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 20:01:02 2010 +0200" }, "message": "block,ide: simplify bdops-\u003eset_capacity() to -\u003eunlock_native_capacity()\n\nbdops-\u003eset_capacity() is unnecessarily generic. All that\u0027s required\nis a simple one way notification to lower level driver telling it to\ntry to unlock native capacity. There\u0027s no reason to pass in target\ncapacity or return the new capacity. The former is always the\ninherent native capacity and the latter can be handled via the usual\ndevice resize / revalidation path. In fact, the current API is always\nused that way.\n\nReplace -\u003eset_capacity() with -\u003eunlock_native_capacity() which take\nonly @disk and doesn\u0027t return anything. IDE which is the only current\nuser of the API is converted accordingly.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a9ddabc52ce3757a4331d6c1e8bf4065333cc51b", "tree": "3ed67e857fe0b729aed9b466ea5827e9c8e0114a", "parents": [ "f693be4d8a00431b53a59d74aefdb3f7ae92f662" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Tue May 11 00:08:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 11 00:08:03 2010 -0700" }, "message": "cmd640: fix kernel oops in test_irq() method\n\nWhen implementing the test_iqr() method, I forgot that this driver is not an\nordinary PCI driver and also needs to support VLB variant of the chip. Moreover,\n\u0027hwif-\u003edev\u0027 should be NULL, potentially causing oops in pci_read_config_byte().\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "ded6a1a341cb38c4cfeb09d3d01ffe16b5c804b3" }