commit 49fdf6785fd660e18a1eb4588928f47e9fa29a9a Merge: b70a6b2... 43a49cb... Author: Linus Torvalds Date: Mon Oct 27 11:41:51 2008 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: libata: fix NCQ devices behind port multipliers scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map commit 43a49cbdf31e812c0d8f553d433b09b421f5d52c Author: Jens Axboe Date: Mon Oct 27 19:23:06 2008 +0100 libata: fix NCQ devices behind port multipliers For devices behind sata port multipliers, we have to make sure that they share a tag map since all tags for that PMP must be unique. Signed-off-by: Jens Axboe commit 3070f69b66b7ab2f02d8a2500edae07039c38508 Author: Jens Axboe Date: Mon Oct 27 19:20:59 2008 +0100 scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map Right now callers have to check whether scsi_host->bqt is already set up, it's much cleaner to just have scsi_init_shared_tag_map() does this check on its own. Signed-off-by: Jens Axboe commit b70a6b27ed4cbb9ea7a4e1abc080ed65692ecb9b Merge: 1d63e72... 3a63913... Author: Linus Torvalds Date: Mon Oct 27 09:54:23 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (33 commits) MIPS: lemote/lm2e: Added io_map_base to pci controller MIPS: TXx9: Make firmware parameter passing more robust MIPS: Markeins: Remove unnecessary define and cleanup comments, etc. MIPS: Markeins: Extract ll_emma2rh_* functions MIPS: Markeins: Remove runtime debug prints MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base MIPS: EMMA2RH: Remove emma2rh_sw_irq_base MIPS: EMMA2RH: Remove emma2rh_irq_base global variable MIPS: EMMA2RH: Remove emma2rh_sync on read operation MIPS: EMMA: Move to dir MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/ MIPS: EMMA: Kconfig reorganization MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors MIPS: RB532: Disable the right device MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling MIPS: Fix KGDB build error INPUT: sgi_btns: Add license specification MIPS: IP22: ip22-int.c header file weeding. ... commit 1d63e726408dfdb3e10ed8f00c383b30ebb333d3 Merge: 31390d0... cd1f70fd... Author: Linus Torvalds Date: Mon Oct 27 09:37:16 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fw-sbp2: fix races firewire: fw-sbp2: delay first login to avoid retries firewire: fw-ohci: initialization failure path fixes firewire: fw-ohci: don't leak dma memory on module removal firewire: fix struct fw_node memory leak firewire: Survive more than 256 bus resets commit 31390d0fde1ac9cf47002729660ffd7cd2ae1d75 Merge: 6634160... 0a9b863... Author: Linus Torvalds Date: Mon Oct 27 09:36:33 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) ALSA: hda - Restore default pin configs for realtek codecs sound: use a common working email address pci: use pci_ioremap_bar() in sound/ commit 3a63913f607832a2629545467e715a40ec930c32 Author: Zhang Le Date: Mon Oct 27 23:33:24 2008 +0000 MIPS: lemote/lm2e: Added io_map_base to pci controller Signed-off-by: Zhang Le Signed-off-by: Ralf Baechle commit 97b0511ce125b0cb95d73b198c1bdbb3cebc4de2 Author: Geert Uytterhoeven Date: Mon Oct 27 15:25:49 2008 +0100 MIPS: TXx9: Make firmware parameter passing more robust When booting Linux on a txx9 board with VxWorks boot loader, it crashes in prom_getenv(), as VxWorks doesn't pass firmware parameters in a0-a3 (in my case, the actual leftover values in these registers were 0x80002000, 0x80001fe0, 0x2000, and 0x20). Make the parsing of argc, argv, and envp a bit more robust by checking if argc is a number below CKSEG0, and argv/envp point to CKSEG0. Signed-off-by: Geert Uytterhoeven Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit d1a8e2a6da5bea09452495748891a4ea9e42035e Author: Shinya Kuribayashi Date: Fri Oct 24 01:36:33 2008 +0900 MIPS: Markeins: Remove unnecessary define and cleanup comments, etc. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 49618d652b2fe9c63808c7a2cc7089aa594cf521 Author: Shinya Kuribayashi Date: Fri Oct 24 01:35:59 2008 +0900 MIPS: Markeins: Extract ll_emma2rh_* functions These functions are completely ineffective. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit a9c2aa17a8b8b7a813d31e66da5d31cfdd006f4b Author: Shinya Kuribayashi Date: Fri Oct 24 01:33:10 2008 +0900 MIPS: Markeins: Remove runtime debug prints Remove runtime db_* macros as we don't need them any more. In general, such helpers are useful for initial porting, but once approved, they are not indispensable. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 9ae9fd79af28d6488e97311a3b60379b59ff4c90 Author: Shinya Kuribayashi Date: Fri Oct 24 01:32:40 2008 +0900 MIPS: EMMA: Fold arch/mips/emma/{common,markeins}/irq*.c into markeins/irq.c Current EMMA2RH irq code is mess. Before cleaning it up, gather them in one place as a first step. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit fcb3cfe7f087fb27c35be911791883fb725055b1 Author: Shinya Kuribayashi Date: Fri Oct 24 01:32:11 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_gpio_irq_base Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 68ed1ca9120506b2a0f80e4542deea24f89081ab Author: Shinya Kuribayashi Date: Fri Oct 24 01:31:43 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_sw_irq_base Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 9b6c04bc9726edf2655dd69d2e40c0ae4f07e525 Author: Shinya Kuribayashi Date: Fri Oct 24 01:31:16 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_irq_base global variable Let's use immediate value, instead. This also saves memory footprint, and probably a little bit faster. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 27bd804582d9a45cad8304e703c9de65ddd67bc5 Author: Shinya Kuribayashi Date: Fri Oct 24 01:30:48 2008 +0900 MIPS: EMMA2RH: Remove emma2rh_sync on read operation It's totally a waste of CPU cycles. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit d91f2cbe698cf70b50099343dac1ec8061bfd045 Author: Shinya Kuribayashi Date: Fri Oct 24 01:30:20 2008 +0900 MIPS: EMMA: Move to dir We'll put all EMMA related headers there in the future. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit f27655e34171b0ae9ea5a0aadae894e817f0f875 Author: Shinya Kuribayashi Date: Fri Oct 24 01:29:16 2008 +0900 MIPS: EMMA: Move arch/mips/emma2rh/ into arch/mips/emma/ git mv arch/mips/{emma2rh,emma} and fixups Makefiles. We'll put all NEC EMMA series based machines there in the future. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit cd741b604b94a4d5bebf2672626ffec7de44652c Author: Shinya Kuribayashi Date: Fri Oct 24 06:00:01 2008 +0900 MIPS: EMMA: Kconfig reorganization - Move EMMA related stuff into arch/mips/emma/Kconfig - Create CONFIG_SOC_EMMA* to handle more EMMA SoCs effectively - Rename CONFIG_MARKEINS into CONFIG_NEC_MARKEINS Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit 542c1020ac1cbc2f50934086ad893384a2cbd233 Author: Shinya Kuribayashi Date: Fri Oct 24 01:27:57 2008 +0900 MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors We already have sufficient infrastructure to support VR5500 and VR5500A series processors. Here's a Makefile support to make it selectable by ports, and enable it for NEC EMMA2RH Markeins board. This patch also fixes a confused target help, and adds 1Gb PageMask bits supported by VR5500 and its variants. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle commit bc4c4e832a203f66959e5eb2ecc56b0b9525173e Author: Phil Sutter Date: Mon Oct 27 02:29:57 2008 +0100 MIPS: RB532: Disable the right device Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit edb6310aaa0dfc3da303a4ba6dff9dce3fbaa8d3 Author: Daniel Laird Date: Mon Jun 16 15:49:21 2008 +0100 MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel The following patch add support for the NXP PNX833x SOC. More specifically it adds support for the STB222/5 variant. It fixes the vectored interrupt issue. Signed-off-by: daniel.j.laird Signed-off-by: Jason Wessel Signed-off-by: Ralf Baechle commit 537fa37c8606793b9998c35de0abfcb7d549a3f2 Author: Geert Uytterhoeven Date: Thu Oct 23 16:43:13 2008 +0200 MIPS: TXx9: CONFIG_TOSHIBA_RBTX4939 spelling Fix a typo in the comment for the TOSHIBA_RBTX4939 config option Signed-off-by: Geert Uytterhoeven Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f6a3176a18b724154e7beede0e10da56e47abe2b Author: Yoichi Yuasa Date: Sat Oct 25 17:30:35 2008 +0900 MIPS: Fix KGDB build error In file included from include/linux/ptrace.h:49, from arch/mips/kernel/kgdb.c:25: /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:123: error: expected declaration specifiers or '...' before '__s64' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:124: error: expected declaration specifiers or '...' before '__s64' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:126: error: expected declaration specifiers or '...' before '__u32' /home/yuasa/src/linux/test/mips/linux/arch/mips/include/asm/ptrace.h:127: error: expected declaration specifiers or '...' before '__u32' make[1]: *** [arch/mips/kernel/kgdb.o] Error 1 Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 4c2bdcdc62e7a07bd0786fd2048e4ac97ae74e6e Author: Dmitri Vorobiev Date: Sat Oct 25 01:46:57 2008 +0300 INPUT: sgi_btns: Add license specification The SGI Volume Button interface driver uses GPL-only symbols platform_driver_unregister and platform_driver_register, but lacks license specification. Thus, when compiled as a module, this driver cannot be installed. This patch fixes this by adding the MODULE_LICENSE() specification. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 2f123e503dccde75550a0384982d5070d41b8a52 Author: Ralf Baechle Date: Sat Oct 25 15:51:48 2008 +0100 MIPS: IP22: ip22-int.c header file weeding. Signed-off-by: Ralf Baechle commit 14823ccbf8c3209a84a544e846feaf886cb59be9 Author: Dmitri Vorobiev Date: Sat Oct 25 01:46:56 2008 +0300 MIPS: IP22: Small cleanups The following functions disable_local1_irq() disable_local2_irq() disable_local3_irq() are needlessly defined global, so make them static. While at it, fix a whitespace error in the same file. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 1ba5a1767416cfa4fa37096e160e764c56e1460a Author: Atsushi Nemoto Date: Tue Oct 21 00:01:06 2008 +0900 MIPS: RBTX4939: Add smc91x support Add smc91x platform device to RBTX4939 board and some hacks for big endian. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bc89b2bdefa5f56133d0b19a220880d4ada62560 Author: Atsushi Nemoto Date: Mon Oct 20 23:28:50 2008 +0900 MIPS: TXx9: 7 segment LED support Add sysfs interface for 7 segment LED and implement access routine for RBTX4939. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f591eb1e6896e26675e91a319cc93f3800dbaad4 Author: Manuel Lauss Date: Tue Oct 21 08:59:14 2008 +0200 MIPS: Alchemy: Wire up SD controller on DB/PB1200 boards. Add au1xmmc platform data for PB1200/DB1200 boards and wire up the 2 SD controllers for them. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit fa36b04386422951a7c73f9210403d1a2eaffe92 Author: Florian Fainelli Date: Fri Oct 24 19:53:55 2008 +0200 MIPS: RB532: Set gpio interrupt status and level for CompactFlash This patch sets the correct interrupt status and level in order to get the CompactFlash adapter working. Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 052ac71c4b85e5ce7e70d4f9b3555caa647d884a Author: Adrian Bunk Date: Sun Oct 12 16:01:35 2008 +0300 MIPS: RB532: Fix build error mips/pci/fixup-rc32434.c must #include This patch fixes the following compile error caused by commit 606a083b1e1a357cb66454e4581b80f1a67d8368 (MIPS: RB532: Cleanup the headers again): <-- snip --> ... CC arch/mips/pci/fixup-rc32434.o arch/mips/pci/fixup-rc32434.c: In function 'pcibios_map_irq': arch/mips/pci/fixup-rc32434.c:46: error: 'GROUP4_IRQ_BASE' undeclared (first use in this function) arch/mips/pci/fixup-rc32434.c:46: error: (Each undeclared identifier is reported only once arch/mips/pci/fixup-rc32434.c:46: error: for each function it appears in.) make[2]: *** [arch/mips/pci/fixup-rc32434.o] Error 1 <-- snip --> A virtually identical patch was also submitted by Yoichi Yuasa . Signed-off-by: Adrian Bunk Acked-by: Florian Fainelli Signed-off-by: Ralf Baechle commit c944013518cc3ba407057e9ee910d0258c0a47dd Author: David Daney Date: Fri Oct 24 09:31:13 2008 -0700 MIPS: Fix KGDB build error is exported to userland so can't include , so replace the C99 types with their basic C type equivalents. Bug originally reported and initial patch by Yoichi Yuasa . Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit fb498e2570eedc6c9c3d165e370624dfc3aed97b Author: Atsushi Nemoto Date: Sat Oct 25 01:17:23 2008 +0900 MIPS: Set ENOSYS to errno on illegal system call number for syscall(2) Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit bda8229bdd087167f463ad5e74299987924f8137 Author: Atsushi Nemoto Date: Sat Oct 25 01:17:22 2008 +0900 MIPS: Set positive error number to errno on illegal_syscall Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 7920c4d658ff2b0f7b8acf3bd7c700875c2bc163 Author: Ralf Baechle Date: Sat Oct 18 13:23:10 2008 +0100 MIPS: SMP: Don't reenable interrupts in stop_this_cpu; use WAIT instruction. Noticed by Anirban Sinha ; patch by me. Signed-off-by: Ralf Baechle commit f67ae98352284d7ac1e03f3a872e33c68ea35a5b Author: David Daney Date: Fri Oct 17 17:48:53 2008 -0700 MIPS: Don't unmap the memory for dma_sync*. We were getting away with this for so long only because the only platform with a non-empty plat_unmap_dma_mem() doesn't call dma_sync_sg_for_cpu() and dma_sync_sg_for_device() from its commonly used drivers. Signed-off-by: David Daney Signed-off-by: Ralf Baechle commit b517531ce53794f2a2eae1fff1d1216b9db4da9f Author: Zhaolei Date: Fri Oct 17 19:12:35 2008 +0800 MIPS: Fix debugfs_create_*'s error checking method for mips/kernel/ debugfs_create_*() returns NULL on error. Make its callers return -ENODEV on error. Signed-off-by: Zhao Lei Acked-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit ecab1f4479abb88d739bc1aac5545e8399fbad66 Author: Zhaolei Date: Fri Oct 17 19:12:30 2008 +0800 MIPS: Fix debugfs_create_*'s error checking method for arch/mips/math-emu/ debugfs_create_*() returns NULL on error. Make its caller debugfs_fpuemu return -ENODEV on error. Signed-off-by: Zhao Lei Signed-off-by: Ralf Baechle commit 0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 Merge: bfd4e66... c3e5203... e044c39... 2f1e593... 2f5ad54... Author: Takashi Iwai Date: Mon Oct 27 17:08:11 2008 +0100 Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus commit c3e5203bed1999df716e3c7119f6749523eb952f Author: Cliff Cai Date: Mon Oct 27 17:09:25 2008 +0800 ALSA: ASoC: Blackfin: update SPORT0 port selector (v2) - Setting the TFS pin selector for SPORT 0 based on whether the selected port id F or G. If the port is F then no conflict should exist for the TFS. When Port G is selected and EMAC then there is a conflict between the PHY interrupt line and TFS. Current settings prevent the conflict by ignoring the TFS pin when Port G is selected. This allows both ssm2602 using Port G and EMAC concurrently. - some code cleanup Signed-off-by: Cliff Cai Signed-off-by: Bryan Wu Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit e044c39ae258678d6ebb09fccb2a0fdf7ec51847 Author: Takashi Iwai Date: Mon Oct 27 16:56:24 2008 +0100 ALSA: hda - Restore default pin configs for realtek codecs Some machines have broken BIOS resume that doesn't restore the default pin configuration properly, which results in a wrong detection of HP pin. This causes a silent speaker output due to missing HP detection. Related bug: Novell bug#406101 https://bugzilla.novell.com/show_bug.cgi?id=406101 This patch fixes the issue by saving/restoring the default pin configs by the driver itself. Signed-off-by: Takashi Iwai commit 6634160abfdbac39bd5ebda516b15b078a0f598e Merge: 526719b... 8b5f12d... Author: Linus Torvalds Date: Mon Oct 27 08:41:13 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: syncookies: fix inclusion of tcp options in syn-ack libertas: free sk_buff with kfree_skb btsdio: free sk_buff with kfree_skb Phonet: do not reply to indication reset packets Phonet: include generic link-layer header size in MAX_PHONET_HEADER commit 526719ba51e7d7bd31f7af9ab04b015b70096685 Author: Alan Cox Date: Mon Oct 27 15:19:48 2008 +0000 Switch to a valid email address... Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 77122d0b5d1fb2276b1fe7bce6366f22b2f96606 Author: Alan Cox Date: Mon Oct 27 15:10:23 2008 +0000 Tidy up addresses in random drivers Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b9b54aa2a60dcd9c06b76f6610e1b466bc93e3cd Author: Eric Miao Date: Mon Oct 27 17:48:50 2008 +0800 leds: da903x: fix the building failure of incomplete type of 'work' The leds-da903x LED driver was missing the proper #include of linux/workqueue.h, but happened to compile on ARM due to implied includes through other header files. We do need the explict include on other architectures (reported at least for x86-64). Reported-tested-and-acked-by: Jean Delvare Signed-off-by: Eric Miao Signed-off-by: Linus Torvalds commit 2f1e593d4209d0194f9639c5d11aa91171435963 Author: Alan Cox Date: Mon Oct 27 15:21:19 2008 +0000 sound: use a common working email address Signed-off-by: Alan Cox Signed-off-by: Takashi Iwai commit 8b5f12d04b2e93842f3dda01f029842047bf3f81 Author: Florian Westphal Date: Sun Oct 26 23:10:12 2008 -0700 syncookies: fix inclusion of tcp options in syn-ack David Miller noticed that commit 33ad798c924b4a1afad3593f2796d465040aadd5 '(tcp: options clean up') did not move the req->cookie_ts check. This essentially disabled commit 4dfc2817025965a2fc78a18c50f540736a6b5c24 '[Syncookies]: Add support for TCP options via timestamps.'. This restores the original logic. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit b700a98c70401c2a48e509b91b47f58a883806bc Author: Sergio Luis Date: Sun Oct 26 23:09:27 2008 -0700 libertas: free sk_buff with kfree_skb free sk_buff with kfree_skb, instead of kree Signed-off-by: Sergio Luis Signed-off-by: David S. Miller commit cbfd24a75f98fe731547d3bc995f3a1f1fed6b20 Author: Sergio Luis Date: Sun Oct 26 23:08:48 2008 -0700 btsdio: free sk_buff with kfree_skb free sk_buff with kfree_skb, instead of kree Signed-off-by: Sergio Luis Signed-off-by: David S. Miller commit c3a90c788b743303c4d824780a3a7271693fb64a Author: Remi Denis-Courmont Date: Sun Oct 26 23:07:25 2008 -0700 Phonet: do not reply to indication reset packets This fixes a potential error packet loop. Signed-off-by: Remi Denis-Courmont Signed-off-by: David S. Miller commit e214a8cc7a81f20ed7cb4f6373cf15048556bbac Author: Remi Denis-Courmont Date: Sun Oct 26 23:06:31 2008 -0700 Phonet: include generic link-layer header size in MAX_PHONET_HEADER This fixes an OOPS in hard_header if a Phonet address is assigned to a non-Phonet network interface. Signed-off-by: Remi Denis-Courmont Signed-off-by: David S. Miller commit f8d56f1771e4867acc461146764b4feeb5245669 Merge: 3d6eadc... 92850bb... Author: Linus Torvalds Date: Sun Oct 26 16:42:18 2008 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: allow extended partitions on md devices. md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state md: use sysfs_notify_dirent to notify changes to md/array_state commit 3d6eadcb5008beca1b289983ffd7771d1e947bac Merge: a483ab1... 2a0bd75... Author: Linus Torvalds Date: Sun Oct 26 16:40:59 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - add support for Elantech touchpads Input: i8042 - add Blue FB5601 to noloop exception table commit a483ab1dddf86a0e8924e94cf838eed602602b39 Merge: eba966a... 9c36645... Author: Linus Torvalds Date: Sun Oct 26 16:37:37 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: Make WM8400 depend on I2C until SPI is submitted mfd: add missing Kconfig entry for da903x commit eba966a4e780199e31e8fd1d21bc9d187b1c9eaf Merge: ecc96e7... ae5d82c... Author: Linus Torvalds Date: Sun Oct 26 16:35:41 2008 -0700 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: uwb: build UWB before USB/WUSB commit ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 Merge: a1a739c... cc6e0bb... Author: Linus Torvalds Date: Sun Oct 26 16:34:14 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Add support for Sony Vaio VGX-TP1E HID: fix lock imbalance in hiddev HID: fix lock imbalance in hidraw HID: fix hidbus/appletouch device binding regression HID: add hid_type to general hid struct HID: quirk for OLED devices present in ASUS G50/G70/G71 HID: Remove "default m" for Thrustmaster and Zeroplus HID: fix hidraw_exit section mismatch HID: add support for another Gyration remote control Revert "HID: Invert HWHEEL mappings for some Logitech mice" commit a1a739c56ad031b8bf8b3804f568ac88899f8dd7 Author: Randy Dunlap Date: Sat Oct 25 17:24:36 2008 -0700 docbooks: fix fatal filename errors Fix docbook fatal errors (file location changed): docproc: lin2628-rc1/include/asm-x86/io_32.h: No such file or directory make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1 docproc: lin2628-rc1/include/asm-x86/atomic_32.h: No such file or directory make[1]: *** [Documentation/DocBook/kernel-api.xml] Error 1 docproc: lin2628-rc1/include/asm-x86/mca_dma.h: No such file or directory make[1]: *** [Documentation/DocBook/mcabook.xml] Error 1 Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 890c78c2d681a8dc89c78eb9177990cad3a77dc3 Author: Randy Dunlap Date: Sat Oct 25 17:06:43 2008 -0700 kernel-doc: allow more whitespace in macros Allow macros that are annotated with kernel-doc to contain whitespace between the '#' and "define". It's valid and being used, so allow it. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 7eea5b897eb6bbb79d7e6e398f4fbb61fcee57c7 Merge: 0173a32... 9fb3c5c... Author: Linus Torvalds Date: Sun Oct 26 16:29:12 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: leds-hp-disk: fix build warning ACPI: Oops in ACPI with git latest ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y. toshiba_acpi: always call input_sync() after input_report_switch() ACPI: Always report a sync event after a lid state change ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined i7300_idle: Cleanup based review comments i7300_idle: Disable ioat channel only on platforms where ile driver can load commit cd1f70fdb4823c97328a1f151f328eb36fafd579 Author: Jay Fenlason Date: Fri Oct 24 15:26:20 2008 -0400 firewire: fw-sbp2: fix races 1: There is a small race between queue_delayed_work() and its corresponding kref_get(). Do the kref_get first, and _put it again if the queue_delayed_work() failed, so there is no chance of the kref going to zero while the work is scheduled. 2: An SBP2_LOGOUT_REQUEST could be sent out with a login_id full of garbage. Initialize it to an invalid value so we can tell if we ever got a valid login_id. 3: The node ID and generation may have changed but the new values may not yet have been recorded in lu and tgt when the final logout is attempted. Use the latest values from the device in sbp2_release_target(). Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 0dcfeb7e3c8695c5aa3677dda8efb9bef2e7e64d Author: Stefan Richter Date: Wed Oct 22 00:28:36 2008 +0200 firewire: fw-sbp2: delay first login to avoid retries This optimizes firewire-sbp2's device probe for the case that the local node and the SBP-2 node were discovered at the same time. In this case, fw-core's bus management work and fw-sbp2's login and SCSI probe work are scheduled in parallel (in the globally shared workqueue and in fw-sbp2's workqueue, respectively). The bus reset from fw-core may then disturb and extremely delay the login and SCSI probe because the latter fails with several command timeouts and retries and has to be retried from scratch. We avoid this particular situation of sbp2_login() and fw_card_bm_work() running in parallel by delaying the first sbp2_login() a little bit. This is meant to be a short-term fix for https://bugzilla.redhat.com/show_bug.cgi?id=466679. In the long run, the SCSI probe, i.e. fw-sbp2's call of __scsi_add_device(), should be parallelized with sbp2_reconnect(). Problem reported and fix tested and confirmed by Alex Kanavin. Signed-off-by: Stefan Richter commit 7007a0765e33bf89182e069e35ec6009fa54f610 Author: Stefan Richter Date: Sun Oct 26 09:50:31 2008 +0100 firewire: fw-ohci: initialization failure path fixes Fix leaks when pci_probe fails. Simplify error log strings. Signed-off-by: Stefan Richter commit a55709ba9d27053471f9fca8ee76b41ecefc14cd Author: Jay Fenlason Date: Wed Oct 22 15:59:42 2008 -0400 firewire: fw-ohci: don't leak dma memory on module removal The transmit and receive context dma memory was not being freed on module removal. Neither was the config rom memory. Fix that. The ab->next assignment is pure paranoia. Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 77e557191701afa55ae7320d42ad6458a2ad292e Author: Jay Fenlason Date: Thu Oct 16 18:00:15 2008 -0400 firewire: fix struct fw_node memory leak With the bus_resets patch applied, it is easy to see this memory leak by repeatedly resetting the firewire bus while running slabtop in another window. Just watch kmalloc-32 grow and grow... Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter commit 4f9740d4f5a17fa6a1b097fa3ccdfb7246660307 Author: Jay Fenlason Date: Thu Oct 16 15:51:59 2008 -0400 firewire: Survive more than 256 bus resets The "color" is used during the topology building after a bus reset, hovever in "struct fw_node"s it is stored in a u8, but in struct fw_card it is stored in an int. When the value wraps in one struct, but not the other, disaster strikes. Signed-off-by: Jay Fenlason Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10922. Signed-off-by: Stefan Richter commit 9fb3c5ca3dabe06758c35f790c68e273ed749e19 Merge: 438f8de... f371be6... Author: Len Brown Date: Sat Oct 25 04:07:44 2008 -0400 Merge branch 'i7300_idle' into release commit 438f8de46bc261b35d84771ae9992cfff3ff4dd8 Author: Len Brown Date: Sat Oct 25 03:52:16 2008 -0400 leds-hp-disk: fix build warning drivers/leds/leds-hp-disk.c:59: warning: passing argument 4 of ‘acpi_evaluate_integer’ from incompatible pointer type Signed-off-by: Len Brown commit f8123381bae8d581d81f24b55719db3d9a6a262c Author: Rafael J. Wysocki Date: Fri Oct 24 21:50:31 2008 +0200 ACPI: Oops in ACPI with git latest ACPI Warning (nseval-0168): Insufficient arguments - method [_OSC] needs 5, found 4 [20080926] ACPI Warning (nspredef-0252): \_SB_.PCI0._OSC: Parameter count mismatch - ASL declared 5, expected 4 [20080926] ACPI Error (nspredef-0163): \_SB_.PCI0._OSC: Missing expected return value [20080926] BUG: unable to handle kernel NULL pointer dereference at 00000000 IP: [] acpi_run_osc+0xa1/0x170 Signed-off-by: Rafael J. Wysocki Tested-by: James Bottomley Signed-off-by: Len Brown commit 92daa7b53b76984565dfdfda5d9c679884121fb2 Author: Rafael J. Wysocki Date: Thu Oct 23 21:46:43 2008 +0200 ACPI suspend: build fix for ACPI_SLEEP=n && XEN_SAVE_RESTORE=y. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit cab08969188e2da09923fe9c4a99ec9b934b0708 Author: Len Brown Date: Fri Oct 24 15:39:47 2008 -0400 toshiba_acpi: always call input_sync() after input_report_switch() Signed-off-by: Len Brown commit df316e939100e789b3c5d4d102619ccf5834bd00 Author: Guillem Jover Date: Fri Oct 24 00:28:33 2008 +0300 ACPI: Always report a sync event after a lid state change Currently not always an EV_SYN event is reported to userland after the EV_SW SW_LID event has been sent. This is easy to verify by using “input-events” from input-utils and just closing and opening the lid. Signed-off-by: Guillem Jover Signed-off-by: Len Brown commit 16be87ea170ae6cfaa9f47f79d14f7577d8cb420 Author: Miao Xie Date: Fri Oct 24 17:22:04 2008 +0800 ACPI: cpufreq, processor: fix compile error in drivers/acpi/processor_perflib.c When trying to build 2.6.28-rc1 on ia64, make aborts with: CC drivers/acpi/processor_perflib.o drivers/acpi/processor_perflib.c:41:28: error: asm/cpufeature.h: No such file or directory drivers/acpi/processor_perflib.c: In function ‘acpi_processor_get_performance_info’: drivers/acpi/processor_perflib.c:364: error: implicit declaration of function ‘boot_cpu_has’ drivers/acpi/processor_perflib.c:364: error: ‘X86_FEATURE_EST’ undeclared (first use in this function) drivers/acpi/processor_perflib.c:364: error: (Each undeclared identifier is reported only once drivers/acpi/processor_perflib.c:364: error: for each function it appears in.) make[2]: *** [drivers/acpi/processor_perflib.o] Error 1 make[1]: *** [drivers/acpi] Error 2 make: *** [drivers] Error 2 this patch fix it. Signed-off-by: Miao Xie Acked-by: Thomas Renninger Signed-off-by: Len Brown commit f371be6352cdde3df2253b76acb979480e93ce4f Author: Venki Pallipadi Date: Thu Oct 23 15:39:06 2008 -0700 i7300_idle: Fix compile warning CONFIG_I7300_IDLE_IOAT_CHANNEL not defined When I7300_idle driver is not configured, there is a compile time warning about IDLE_IOAT_CHANNEL not defined. Fix it. Reported-by: Suresh Siddha Reported-by: Arjan van de Ven Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 33093e186c8f80b443fafb1d347a140bdd2b86c6 Author: Venki Pallipadi Date: Wed Oct 22 16:51:03 2008 -0700 i7300_idle: Cleanup based review comments Cleanup of i7300 idle driver based on review comments from Randy Dunlap, Andi Kleen and Len Brown. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 3ad0b02e4c1d5feba44b8ff48dccd1ba61a826b0 Author: Venki Pallipadi Date: Wed Oct 22 16:34:52 2008 -0700 i7300_idle: Disable ioat channel only on platforms where ile driver can load Based on input from Andi Kleen: share the platform detection code with ioat_dma and disable the channel in dma engine only for specific platforms. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 9c366452e0b2df06f3ce0aabc6a53c94c595cd00 Author: Mark Brown Date: Fri Oct 24 17:16:11 2008 +0200 mfd: Make WM8400 depend on I2C until SPI is submitted Otherwise we could build in WM8400 but not I2C. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 8e2eaabfd9f7d375a1bb202e644ce2dcc0659592 Author: Samuel Ortiz Date: Fri Oct 24 17:10:05 2008 +0200 mfd: add missing Kconfig entry for da903x This one was accidentally left out during the rc1 mfd merge. Signed-off-by: Samuel Ortiz commit ae5d82cb8d600989338bbda5ea38f5c0ff47175a Author: David Vrabel Date: Fri Oct 24 16:46:22 2008 +0100 uwb: build UWB before USB/WUSB The WHCI-HCD driver in drivers/usb/host/ depends on the umc driver in drivers/uwb/. Signed-off-by: David Vrabel commit cc6e0bbb47f02fd36cd55b3189c0c79079096ab8 Author: Jiri Kosina Date: Thu Oct 23 12:58:38 2008 +0200 HID: Add support for Sony Vaio VGX-TP1E The Sony Vaio VGX-TP1E multimedia PC has a wireless keyboard with a touchpad. The mouse pointer is wrongly declared as constant non-data variable, which make HID code to completely ignore all the "Pointer" usages. Fix the report descriptor before it enters the parser to contain touchpad pointer description that is correctly parsable (declaring data rather than constant). Reported-by: Stefan Hundhammer Signed-off-by: Jiri Kosina commit eb9910894d7857c273e049b297fd6251e5ecc43e Author: Jiri Slaby Date: Thu Oct 23 01:47:34 2008 +0200 HID: fix lock imbalance in hiddev Don't forget to unlock_kernel() in hiddev_ioctl_usage(). Added in 7961df16819085b8a357720d89d0239036e6af2a (HID: Switch hiddev to unlocked_ioctl). Corresponing sparse warning: drivers/hid/usbhid/hiddev.c:515:10: warning: context imbalance in 'hiddev_ioctl_usage': wrong count at exit drivers/hid/usbhid/hiddev.c:515:10: context 'kernel_lock': wanted 0, got 1 Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 0f2c5945a917e776ccd394f0e1924e9502c2795f Author: Jiri Slaby Date: Thu Oct 23 01:47:30 2008 +0200 HID: fix lock imbalance in hidraw Add omitted unlock_kernel() to hidraw_ioctl(). Added in 979c407e3b89b606e810fa494ef316896eadbfad (HID: Push down BKL into ioctl handler in hidraw). Corresponing sparse warning: drivers/hid/hidraw.c:267:9: warning: context imbalance in 'hidraw_ioctl': wrong count at exit drivers/hid/hidraw.c:267:9: context 'kernel_lock': wanted 0, got 1 Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit b4d8e4736c94e78fd846dca0c95a3a0710582584 Author: Jiri Slaby Date: Wed Oct 22 14:47:18 2008 +0200 HID: fix hidbus/appletouch device binding regression The appletouch mouse devices are grabbed by the hid bus and not released even if apple driver says ENODEV (as expected) -- these are composite USB devices, for which we only ignore the mouse interface. This is currently not handled by hidbus code properly. Move the ignoring one level upper to forbid the hid layer to grab the device. Reported-by: Justin Mattock Reported-by: Steven Noonan Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit a73a63701f8f23e70674b3c5e367a0a726c18468 Author: Jiri Slaby Date: Wed Oct 22 14:45:11 2008 +0200 HID: add hid_type to general hid struct Add type to the hid structure to distinguish to which device type (now only mouse) we are talking to. Needed for per device type ignore list support. Note: this patch leaves the type as unknown for bluetooth devices, there is not support for this in the hidp code. Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 2f5ad54ea6e2e38156bfb889964deee991f3087a Author: Arjan van de Ven Date: Sun Sep 28 16:20:09 2008 -0700 pci: use pci_ioremap_bar() in sound/ Use the newly introduced pci_ioremap_bar() function in sound/. pci_ioremap_bar() just takes a pci device and a bar number, with the goal of making it really hard to get wrong, while also having a central place to stick sanity checks. Signed-off-by: Arjan van de Ven Signed-off-by: Takashi Iwai commit 92850bbd71228730c80efd491e7427650188d359 Author: NeilBrown Date: Tue Oct 21 13:25:32 2008 +1100 md: allow extended partitions on md devices. The new extended partition support provides a much nicer was to have partitions on md devices that the 'mdp' alternate major. We cannot really get rid of 'mdp' at this time, but we can enable extended partitions as that will probably make life easier for sysadmins. Signed-off-by: NeilBrown commit 3c0ee63a64a20351ed6c16ec797e1f8c850741ea Author: NeilBrown Date: Tue Oct 21 13:25:28 2008 +1100 md: use sysfs_notify_dirent to notify changes to md/dev-xxx/state The 'state' file for a device reports, for example, when the device has failed. Changes should be reported to userspace ASAP without the possibility of blocking on low-memory. sysfs_notify does have that possibility (as it takes a mutex which can be held across a kmalloc) so use sysfs_notify_dirent instead. Signed-off-by: NeilBrown commit b62b75905d571c29262a6c38cf9e5f089c203871 Author: NeilBrown Date: Tue Oct 21 13:25:21 2008 +1100 md: use sysfs_notify_dirent to notify changes to md/array_state Now that we have sysfs_notify_dirent, use it to notify changes to md/array_state. As sysfs_notify_dirent can be called in atomic context, we can remove the delayed notify and the MD_NOTIFY_ARRAY_STATE flag. Signed-off-by: NeilBrown commit ac2d98998c32fcdc8d8919b7a4536a7945fd0422 Author: Jiri Kosina Date: Mon Oct 20 12:37:43 2008 +0200 HID: quirk for OLED devices present in ASUS G50/G70/G71 The new revision of OLED device (0x0b05/0x175b) found in ASUS G50/G70/G71 should be ignored the same way we currently do for 0x1726, so that asus_oled driver can make use of the device. Reported-by: Costin Grigoras Signed-off-by: Jiri Kosina commit 550cb3c3c1fa48171c6358b8641bd01119f5386f Author: Andi Kleen Date: Sun Oct 19 20:34:31 2008 +0200 HID: Remove "default m" for Thrustmaster and Zeroplus No reason at all to make these obscure drivers default m Signed-off-by: Andi Kleen Signed-off-by: Jiri Kosina commit 140ae3eb6feb6ae96ba1ff073049beb985ea00e8 Author: Jiri Slaby Date: Fri Oct 17 18:04:48 2008 +0200 HID: fix hidraw_exit section mismatch hidraw_exit() marked as __exit is called from __init function from HID core. Remove the section placement from that function. Reported-by: Geert Uytterhoeven Signed-off-by: Jiri Slaby Signed-off-by: Jiri Kosina commit 1e093206734568e780c2717da1c89b97e9471954 Author: Jiri Kosina Date: Fri Oct 17 11:52:23 2008 +0200 HID: add support for another Gyration remote control There is a slightly different Gyration remote control, which requires the quirks we already have in place for the 0x0002 PID, plus KEY_MEDIA mapping is different. Reported-by: Marc Randolph Signed-off-by: Jiri Kosina commit 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a Author: Dan Nicholson Date: Fri Oct 17 11:29:46 2008 +0200 Revert "HID: Invert HWHEEL mappings for some Logitech mice" This reverts commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f. It turned out to be correct in the first place: a positive value should be sent when the wheel is moved to the right, and a negative value when moved to the left. This is the behavior expected by the Xorg evdev driver. I must have had a remapping somewhere else in my system when originally testing this. Testing on another system shows that the unpatched kernel is correct. Here is a bug report from Mandriva that brought the problem to my attention: https://qa.mandriva.com/show_bug.cgi?id=44309#c19 Signed-off-by: Dan Nicholson Signed-off-by: Jiri Kosina commit 2a0bd75e5e687a9c34921e942c18477ea7ec2d63 Author: Arjan Opmeer Date: Thu Oct 16 22:10:19 2008 -0400 Input: psmouse - add support for Elantech touchpads This is version 5 of the driver. Relative mode support has been dropped (users wishing to use touchpad in relative mode can use standard PS/2 protocol emulation done in hardware). The driver supports both original version of Elantech protocol and the newer one used by touchpads installed in EeePC. Signed-off-by: Arjan Opmeer Signed-off-by: Dmitry Torokhov commit 2c6f2cb83b239b7d45da9246cafd27ee615ee35b Author: Stefan Bader Date: Thu Oct 16 22:00:56 2008 -0400 Input: i8042 - add Blue FB5601 to noloop exception table Signed-off-by: Stefan Bader Signed-off-by: Dmitry Torokhov