commit c32511e2718618f0b53479eb36e07439aa363a74 Author: Linus Torvalds Date: Tue Jul 12 21:46:46 2005 -0700 Linux 2.6.13-rc3 Yeah, this time hopefully I'm not confusing the version numbers. The last release was -rc2, _this_ is -rc3. commit 0eeca28300df110bd6ed54b31193c83b87921443 Author: Robert Love Date: Tue Jul 12 17:06:03 2005 -0400 [PATCH] inotify inotify is intended to correct the deficiencies of dnotify, particularly its inability to scale and its terrible user interface: * dnotify requires the opening of one fd per each directory that you intend to watch. This quickly results in too many open files and pins removable media, preventing unmount. * dnotify is directory-based. You only learn about changes to directories. Sure, a change to a file in a directory affects the directory, but you are then forced to keep a cache of stat structures. * dnotify's interface to user-space is awful. Signals? inotify provides a more usable, simple, powerful solution to file change notification: * inotify's interface is a system call that returns a fd, not SIGIO. You get a single fd, which is select()-able. * inotify has an event that says "the filesystem that the item you were watching is on was unmounted." * inotify can watch directories or files. Inotify is currently used by Beagle (a desktop search infrastructure), Gamin (a FAM replacement), and other projects. See Documentation/filesystems/inotify.txt. Signed-off-by: Robert Love Cc: John McCutchan Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd4c625c061c2a38568d0add3478f59172455159 Author: Linus Torvalds Date: Tue Jul 12 20:21:28 2005 -0700 reiserfs: run scripts/Lindent on reiserfs code This was a pure indentation change, using: scripts/Lindent fs/reiserfs/*.c include/linux/reiserfs_*.h to make reiserfs match the regular Linux indentation style. As Jeff Mahoney writes: The ReiserFS code is a mix of a number of different coding styles, sometimes different even from line-to-line. Since the code has been relatively stable for quite some time and there are few outstanding patches to be applied, it is time to reformat the code to conform to the Linux style standard outlined in Documentation/CodingStyle. This patch contains the result of running scripts/Lindent against fs/reiserfs/*.c and include/linux/reiserfs_*.h. There are places where the code can be made to look better, but I'd rather keep those patches separate so that there isn't a subtle by-hand hand accident in the middle of a huge patch. To be clear: This patch is reformatting *only*. A number of patches may follow that continue to make the code more consistent with the Linux coding style. Hans wasn't particularly enthusiastic about these patches, but said he wouldn't really oppose them either. Signed-off-by: Linus Torvalds commit 7fa94c8868edfef8cb6a201fcc9a5078b7b961da Author: Jeff Mahoney Date: Tue Jul 12 19:19:30 2005 -0400 [PATCH] reiserfs: fix up case where indent misreads the code indent(1) doesn't know how to handle the "do not compile" error. It results in the item_ops array declaration being indented a tab stop in when it should not be. This patch replaces it with a #error that describes why it's failing. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit d5e404c10a98fc2979643476851e9cbdb1944812 Author: Alasdair G Kergon Date: Tue Jul 12 15:53:05 2005 -0700 [PATCH] device-mapper snapshots: Handle origin extension Handle writes to a snapshot-origin device that has been extended since the snapshot was taken. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93c534aefb906824d71ea779ed0c7f1573843f4e Author: Alasdair G Kergon Date: Tue Jul 12 15:53:05 2005 -0700 [PATCH] device-mapper: Fix dm_swap_table error cases Fix dm_swap_table() __bind error cases: a missing unlock, and EINVAL preferable to EPERM. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3cd4f6b275da0f594797b73f721a4185335478f Author: Alasdair G Kergon Date: Tue Jul 12 15:53:04 2005 -0700 [PATCH] device-mapper multipath: Fix pg initialisation races Prevent more than one priority group initialisation function from being outstanding at once. Otherwise the completion functions interfere with each other. Also, reloading the table could reference a freed pointer. Only reset queue_io in pg_init_complete if another pg_init isn't required. Skip process_queued_ios if the queue is empty so that we only trigger a pg_init if there's I/O. Signed-off-by: Lars Marowsky-Bree Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 436d41087d047b61f8ab0604dc74fff3240a8933 Author: Alasdair G Kergon Date: Tue Jul 12 15:53:03 2005 -0700 [PATCH] device-mapper multipath: Avoid possible suspension deadlock To avoid deadlock when suspending a multipath device after all its paths have failed, stop queueing any I/O that is about to fail *before* calling freeze_bdev instead of after. Instead of setting a multipath 'suspended' flag which would have to be reset if an error occurs during the process, save the previous queueing state and leave userspace to restore if it wishes. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a044d016896d2717694003f00d31a98194077511 Author: Alasdair G Kergon Date: Tue Jul 12 15:53:02 2005 -0700 [PATCH] device-mapper multipath: Flush workqueue when destroying The multipath destructor must flush its workqueue. Otherwise items that reference the destroyed object could remain. From: "goggin, edward" Signed-off-by: Lars Marowsky-Bree Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6a80ea8ed44de0b19c42d41928be37a186a3f41 Author: Alasdair G Kergon Date: Tue Jul 12 15:53:01 2005 -0700 [PATCH] device-mapper multipath: Barriers not supported dm multipath will report barriers as not supported with this patch. Signed-off-by: Lars Marowsky-Bree Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f603ed319d5120e883e64ac5967b2fc848fc43b Merge: 55ee3b8365fd5d301b9076eea739146f2b91e82c 5028770a42e7bc4d15791a44c28f0ad539323807 Author: Linus Torvalds Date: Tue Jul 12 16:04:50 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6 commit 55ee3b8365fd5d301b9076eea739146f2b91e82c Author: Michael Krufky Date: Tue Jul 12 13:59:08 2005 -0700 [PATCH] v4l: broken hybrid dvb inclusion Always include dvb frontend code for hybrid cx88 and saa7134 boards. Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 833e9a1abe8cdfc037964d3240d57bb8ff94bff0 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:59:07 2005 -0700 [PATCH] v4l: TV EEPROM - Eliminated unused code. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af9eeed2d78cb9c672bdc750133506670713fdf8 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:59:06 2005 -0700 [PATCH] v4l: tuner-3026 - replace obsolete ioctl value - obsolete TUNER_SET_TVFREQ changed to VIDIOCSFREQ. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 330a115ae46e7d7b5fe2d4e506ba8ae2e0027143 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:59:01 2005 -0700 [PATCH] v4l: SAA7134 Update - Corrected all cards marked as 7135 cards to 7133. - Add new card support for Compro VideoMate TV Gold+II. - Add new card support for Kworld Xpert TV PVR7134 - Add new card support for Typhoon DVB-T Cardbus. - Changes to comply with CodingStyle: // comments converted to /* */ - Remove irq2_mask field from saa7134_dev structure. - Collect all the bits needed in saa7134_hwinit2() instead. - Distinguish the different variants of the Medion MD7134 modules via eeprom - moved Philips FMD1216 radio specific setup to saa7134-core.c - Fix kernel compile error with CONFIG_MODULES=n - Cleanup tuner private calls. - Some Indent fixes. Signed-off-by: Michael Tokarev Signed-off-by: Michael Krufky Signed-off-by: Hannibal Signed-off-by: Elshin Roman Signed-off-by: Hermann Pitton Signed-off-by: Juergen Orschiedt Signed-off-by: Hartmut Hackmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85369df350b138f26eac779da33de0960635ca4d Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:59 2005 -0700 [PATCH] v4l: MXB fix to correct tuner ioctl - driver command adapted to use new control (TUNER_SET_TYPE_ADDR, instead of TUNER_SET_TYPE) Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1455050f04084161c8a9425008e3b9b5f5c4c2a3 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:57 2005 -0700 [PATCH] v4l: drivers/media/video/Kconfig - Removed obsolete option. Current code needs multi tuner. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7ce3cc67052de63a29bad90110640b687d12058 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:55 2005 -0700 [PATCH] v4l: I2C Tuner - Fixed a trouble on tuner-core that generates erros on computers with more than one TV card. - Rename tuner structures fields. - Tail spaces removed. - I2C cleanups and converged to a basic reference structure. - Removed unused structures. - Fix setting frequency on tda8290. - Added code for TEA5767 autodetection. - Standby mode support implemented. It is used to disable a non used tuner. Currenlty implemented on tea5767. - New macro: set_type disables other tuner when changing mode. - Some cleanups. - Use 50 kHz step when tunning radio for most tuners to improve precision. Signed-off-by: Fabien Perrot Signed-off-by: Michael Krufky Signed-off-By: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebe4c6fa535b0410e58e9c8352320896d07e2efb Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:53 2005 -0700 [PATCH] v4l: I2C Miscelaneous - Removed unused structures. - CodingStyle rules applied to comments. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60acbc99e82753b0baa64834435caf81eabc2501 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:52 2005 -0700 [PATCH] v4l: I2C Infrared Remote Control - Removed unused structures. - CodingStyle rules applied to comments. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f8434a620383eec1115e73fdb18c53e049b26b9 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:51 2005 -0700 [PATCH] v4l: I2C BT832 - Removed unused structures. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db036a07ac42fbc410b14ae69f0c5440a8a417cb Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:49 2005 -0700 [PATCH] v4l: Documentation - Card definitions updated. - Tail spaces removed. - Mark all 7135 cards as 7133. - Correct info about sync byte for MPEG-2 transport stream packets. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: hermann pitton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86ddd96fcd479ec4b718abaa661e5884f9dc9a33 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:47 2005 -0700 [PATCH] v4l: SAA7134 hybrid DVB - Add new Typhoon DVB-T Cardbus. - DVB-T support for MD7134 cardbus and the PCI variants - initial DVB-T support for Lifeview Flydvb-t duo - DVB-T support for Philips TOUGH reference design - Don't turn off the xtal output of tda8274/75 in sleep mode - Let Kconfig decide whether to include frontend-specific code in saa7134-dvb. - Removed unused structures. Signed-off-by: Juergen Orschiedt Signed-off-by: Michael Krufky Signed-off-by: Hartmut Hackmann Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41ef7c1ed48cb273c7b7a9ffd48a262a22f84483 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:44 2005 -0700 [PATCH] v4l: CX88 Update - Removed unused structures. - Removed BTTV version check. - Some debug structs moved to their own .c file and converted to static - Comment changed to express better when attach_inform is running - set_freq removed from set_mode at tuner-core.c. - I2C cleanups and converged to a basic reference structure. - Rename tuner structures fields. - It calls VIDIOC_G_FREQUENCY to get tuner freq from tuner. - added missing contrast offset value, set to 0. - Let Kconfig decide whether to include frontend-specific code. Signed-Off-By: Nickolay V. Shmyrev Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa9846a8c5965636fbade8655ae0ce1f9a655bd4 Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:42 2005 -0700 [PATCH] v4l: BTTV update - use DMA_32BIT_MASK. - Rename tuner structures fields. - Tail spaces removed. - I2C cleanups and converged to a basic reference structure. - Removed unused structures. - Removed BTTV version check. Signed-off-by: Signed-off-by: Michael Krufky Signed-Off-By: Nickolay V. Shmyrev Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de9c634270df3e27675a3c0e95545d2b3f754e3f Author: Mauro Carvalho Chehab Date: Tue Jul 12 13:58:41 2005 -0700 [PATCH] v4l: BTTV input Changes to comply with CodingStyle: // comments converted to /* */ Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6dfa37888298e8369f197883ae5f058fbd98a70 Author: Johannes Stezenbach Date: Tue Jul 12 13:58:40 2005 -0700 [PATCH] dvb: dst: printk -> dprintk - stop log spamming when running femon (printk -> dprintk) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27b05fd22f8a1f9afd0377817b1811cfc95f8b7b Author: Julian Scheel Date: Tue Jul 12 13:58:39 2005 -0700 [PATCH] dvb: fix kobject names (no slashes) The / in the driver name (budget dvb /w video in) is not a valid character for device names - removed it, now it works! Same for ttusb-budget. Signed-off-by: Patrick Boettcher Signed-off-by: Julian Scheel Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8df3d46077e63ab87f954eb6e827689cdfe97155 Author: Patrick Boettcher Date: Tue Jul 12 13:58:38 2005 -0700 [PATCH] dvb: usb: fix some typos corrected some typos. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ba006be9b5a8f14f32c530d19fcd4e633aadf8 Author: Michael Krufky Date: Tue Jul 12 13:58:37 2005 -0700 [PATCH] dvb: LGDT3302 QAM256 initialization fix - Initialize all non mutually exclusive variables without regard to the mode selected. - Do a software reset each time the parameters are set, regardless of whether anything changes. This may allow an application to recover from a hung condition. - Improved error reporting. - Removed $Id:$ Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67bc4eb0b1140a4bf364f2dcca152be659ed9057 Author: Randy Dunlap Date: Tue Jul 12 13:58:36 2005 -0700 [PATCH] hardirq uses preempt hardirq.h uses preempt_count() from preempt.h Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2ac953d7c5c8ddbd01dfa0428b92497a69ad6ef Author: Olaf Hering Date: Tue Jul 12 13:58:35 2005 -0700 [PATCH] MAINTAINERS: irda-users@lists.sourceforge.net is subscribers only Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc75a24582f60a70e2b95fda94ff66f577b7a0db Author: Albert Herranz Date: Tue Jul 12 13:58:34 2005 -0700 [PATCH] kexec-ppc: fix for ksysfs crash_notes The following patch prevents the crash dump helper code found within kexec from breaking ppc which still lacks crash dump functionality. ksysfs crash_notes attribute handling was left under CONFIG_KEXEC for simplicity although it is not strictly kexec related. We provide here a dummy definition for crash_notes on ppc. Signed-off-by: Albert Herranz Cc: Eric Biederman Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41e2e8bec2da8d680a03aa4bee9a09fac499c05f Author: Adrian Bunk Date: Tue Jul 12 13:58:33 2005 -0700 [PATCH] Documentation/kernel-parameters.txt: fix a typo Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e498c1080ae794a8dc788152002fb39994ae78b Author: Yoichi Yuasa Date: Tue Jul 12 13:58:32 2005 -0700 [PATCH] TB0219: add PCI IRQ initialization This patch adds PCI IRQ initialization to TB0219 driver. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01e77d31d11a767c9da665f46e075756aef4fc4f Author: Adrian Bunk Date: Tue Jul 12 13:58:32 2005 -0700 [PATCH] IBM_ASM Kconfig corrections This patch contains the following fixes: - IBM_ASM must depend on PCI - remove useless "default n" - correct the URL to further information Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 542d1c88bd7f73e2e59d41b12e4a9041deea89e4 Author: Andrew Morton Date: Tue Jul 12 13:58:31 2005 -0700 [PATCH] tlb.h warning fix free_pages_and_swap_cache() and free_page_and_swap_cache() use release_pages() and page_cache_release() respectively, so make sure that we have the declarations in scope. Cc: Olaf Hering Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7da6844cf7bc44dcda548a0a0aebf85f3a1c1485 Author: Brian King Date: Tue Jul 12 13:58:30 2005 -0700 [PATCH] cdev: cdev_put oops While fixing an oops in the st driver in a dirty release path, I encountered an oops in cdev_put for cdevs allocated using cdev_alloc. If cdev_del is called when the cdev kobject still has an open user, when the last cdev_put is called, the cdev_put will call kobject_put, which will end up ultimately releasing the cdev in cdev_dynamic_release. Patch fixes the oops by preventing cdev_put from accessing freed memory. Signed-off-by: Brian King Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50a5223428bbe77bc0f312100c950b6f4520ba34 Author: Jan Kara Date: Tue Jul 12 13:58:29 2005 -0700 [PATCH] ext2: fix mount options parting Restore old set of ext2 mount options when remounting of a filesystem fails. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08c6a96fd77836856c090ebb39beadc81cb8484d Author: Jan Kara Date: Tue Jul 12 13:58:28 2005 -0700 [PATCH] ext3: fix options parsing Fix a problem with ext3 mount option parsing. When remount of a filesystem fails, old options are now restored. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5323125031799a7fd8602ce150c3902aedfdcba6 Author: Roland McGrath Date: Tue Jul 12 13:58:27 2005 -0700 [PATCH] reset real_timer target on exec leader change When a noninitial thread does exec, it becomes the new group leader. If there is a ITIMER_REAL timer running, it points at the old group leader and when it fires it can follow a stale pointer. The timer data needs to be reset to point at the exec'ing thread that is becoming the group leader. This has to synchronize with any concurrent firing of the timer to make sure that it_real_fn can never run when the data points to a thread that might have been reaped already. Signed-off-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c888d531823f8ce2853fb717ebefbcca9acdcd0 Author: Nishanth Aravamudan Date: Tue Jul 12 13:58:26 2005 -0700 [PATCH] xtensa: use ssleep() instead of schedule_timeout() Replace schedule_timeout() with ssleep() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 813e6783647489a8481d256944b7fd75ff79e035 Author: Chris Zankel Date: Tue Jul 12 13:58:25 2005 -0700 [PATCH] xtensa: remove old syscalls This patch fixes some minor bugs introduced by the previous patch (remove old syscalls). Both patches remove the obsolete syscalls. The changes in this patch were suggested by Arnd Bergmann. The vmlinux.lds.S changes are required for the latest gcc/binutils. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c40504e87e28c52258458a53fefcd63f58e11a42 Author: Benjamin LaHaise Date: Tue Jul 12 13:58:22 2005 -0700 [PATCH] uml: tlb flushing fix This patch fixes a fairly serious tlb flushing bug that makes aio use under uml very unreliable -- SEGVs, Oops and panic()s occur as a result of stale tlb entires being used by uml when aio switches mms due to the fact that uml does not implement the activate_mm() hook. This patch introduces a simple but correct approach (read: hammer) for implementing activate_mm() in uml by doing a force_flush_all() if the new mm is different from old. With this patch in place, uml is able to succeed at the aio test case that was randomly faulting for me before. Cc: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8b8a9da525c592f129ace454c4d82a80b122827a Author: Paolo 'Blaisorblade' Giarrusso Date: Tue Jul 12 13:58:20 2005 -0700 [PATCH] uml:remove user_constants.h on clean make clean ARCH=um does not remove the generated file arch/um/include/user_constants.h, fix this. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 138d402793b84dc47bf13b0a6636d26c880d746e Author: Andrew Morton Date: Tue Jul 12 13:58:19 2005 -0700 [PATCH] alpha: pgprot_uncached() comment Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 082ff0a9991dcea958785115fbba6dddd0dc280a Author: Geert Uytterhoeven Date: Tue Jul 12 13:58:18 2005 -0700 [PATCH] mm/filemap_xip.c compilation fix mm/filemap_xip.c: In function `__xip_unmap': mm/filemap_xip.c:194: request for member `pte' in something not a structure or union Apparently pte_pfn() takes a pte_t, not a pointer to a pte_t. From looking at asm/page.h, it seems to be the same on ia32 or ppc (iff STRICT_MM_TYPECHECKS is enabled, which is disabled by default on ppc). Acked-by: Carsten Otte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0a90b4970d667e9ae9df538710f12b8e78e442 Author: Dominik Brodowski Date: Tue Jul 12 13:58:17 2005 -0700 [PATCH] yenta: allocate resource fixes The current CardBus window allocation code in yenta_socket is unable to handle the transparent PCI-bridge handling update in 2.6.13. We need to check _all_ resources of a given type to find the best one suitable for CardBus windows, not just the first one. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 278798357d4a8658067dc9ac399d8ffba8389f03 Author: Dominik Brodowski Date: Tue Jul 12 13:58:16 2005 -0700 [PATCH] yenta: same resources in same structs drivers/pci/setup-bus.c enumerates the CardBus windows (bus->resources[]) Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6fd718808df873b5d216d5827ac57ec39820238 Author: Dominik Brodowski Date: Tue Jul 12 13:58:15 2005 -0700 [PATCH] pcmcia: Documentation update Update PCMCIA driver changes for patches merged in 2.6.13 Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 862104e56329babf0b9571281e9516fe6259dd17 Author: Dominik Brodowski Date: Tue Jul 12 13:58:15 2005 -0700 [PATCH] yenta: fix parent resource determination If the CardBus windows were pre-configured and the CardBus bridge is behind a transparent PCI-PCI bridge, pci_find_parent_resource() might return a different resource than the real parent if it is called before the window is determined. Therefore, move that call around. Also fix return of value in void function. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e2f3b70e60172f5ed7c0933b8d8a35654c1c031 Author: Dominik Brodowski Date: Tue Jul 12 13:58:14 2005 -0700 [PATCH] pcmcia: fix pcmcia-cs compilation Fix pcmcia-cs compilation with recent pcmcia kernel changes. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d312ceda567ab91acd756cde95ac5fbc6b40ed40 Author: Andrew Morton Date: Tue Jul 12 13:58:13 2005 -0700 [PATCH] x86_64: section alignment fix This is the second time this has happened: inserting a new section requires that we adjust the arithmetic which is used to calculate the vsyscall page's offset. Cc: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4120db47198d21d8cd3b2cdbbe1ea6118a50bcd4 Author: Artem B. Bityuckiy Date: Tue Jul 12 13:58:12 2005 -0700 [PATCH] bugfix: two read_inode() calls without clear_inode() call between Bug symptoms ~~~~~~~~~~~~ For the same inode VFS calls read_inode() twice and doesn't call clear_inode() between the two read_inode() invocations. Bug description ~~~~~~~~~~~~~~~ Suppose we have an inode which has zero reference count but is still in the inode cache. Suppose kswapd invokes shrink_icache_memory() to free some RAM. In prune_icache() inodes are removed from i_hash. prune_icache () is then going to call clear_inode(), but drops the inode_lock spinlock before this. If in this moment another task calls iget() for an inode which was just removed from i_hash by prune_icache(), then iget() invokes read_inode() for this inode, because it is *already removed* from i_hash. The end result is: we call iget(#N) then iput(#N); inode #N has zero i_count now and is in the inode cache; kswapd starts. kswapd removes the inode #N from i_hash ans is preempted; we call iget(#N) again; read_inode() is invoked as the result; but we expect clear_inode() before. Fix ~~~~~~~ To fix the bug I remove inodes from i_hash later, when clear_inode() is actually called. I remove them from i_hash under spinlock protection. Since the i_state is set to I_FREEING, it is safe to do this. The others will sleep waiting for the inode state change. I also postpone removing inodes from i_sb_list. It is not compulsory to do so but I do it for readability reasons. Inodes are added/removed to the lists together everywhere in the code and there is no point to change this rule. This is harmless because the only user of i_sb_list which somehow may interfere with me (invalidate_list()) is excluded by the iprune_sem mutex. The same race is possible in invalidate_list() so I do the same for it. Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 168a9fd6a1bf91041adf9909f6c72cf747f0ca8c Author: Miklos Szeredi Date: Tue Jul 12 13:58:10 2005 -0700 [PATCH] __wait_on_freeing_inode fix This patch fixes queer behavior in __wait_on_freeing_inode(). If I_LOCK was not set it called yield(), effectively busy waiting for the removal of the inode from the hash. This change was introduced within "[PATCH] eliminate inode waitqueue hashtable" Changeset 1.1938.166.16 last october by wli. The solution is to restore the old behavior, of unconditionally waiting on the waitqueue. It doesn't matter if I_LOCK is not set initally, the task will go to sleep, and wake up when wake_up_inode() is called from generic_delete_inode() after removing the inode from the hash chain. Comment is also updated to better reflect current behavior. This condition is very hard to trigger normally (simultaneous clear_inode() with iget()) so probably only heavy stress testing can reveal any change of behavior. Signed-off-by: Miklos Szeredi Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b6bfcdb116f2cc2cab921fcac6d39d4022952d2 Author: Hugh Dickins Date: Tue Jul 12 13:58:09 2005 -0700 [PATCH] lower VM_DONTCOPY total_vm dup_mmap of a VM_DONTCOPY vma forgot to lower the child's total_vm. (But no way does this account for the recent report of total_vm seen too low.) Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70d1d47c47c4643af357cb44d0d891c1b765f2ab Author: Matt Mackall Date: Tue Jul 12 13:58:09 2005 -0700 [PATCH] quiet ide-cd warning This shuts up a potential uninitialized variable warning. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4645df1035b34be2d431d6a10b08e1c06bcd3361 Author: Dave Jones Date: Tue Jul 12 13:58:08 2005 -0700 [PATCH] aacraid: swapped kmalloc args. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d53d9f16ea95a91ad4aa114809dcde486ca4000d Author: Andrew Morton Date: Tue Jul 12 13:58:07 2005 -0700 [PATCH] name_to_dev_t warning fix kernel/power/disk.c needs a declaration of name_to_dev_t() in scope. mount.h seems like an appropriate choice. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22a4427972af371fddb49c0184a93851ad51070d Merge: 9f02d6b7b43d46a74dd385f06090104ecd0fb807 ede7fbdf526c314850c9f32dd8da1753bf8d0ad5 Author: Linus Torvalds Date: Tue Jul 12 15:54:36 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 commit 5028770a42e7bc4d15791a44c28f0ad539323807 Merge: 9f02d6b7b43d46a74dd385f06090104ecd0fb807 d8683a0cb5d09cb7f19feefa708424a84577e68f Author: Len Brown Date: Tue Jul 12 17:21:56 2005 -0400 [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... Signed-off-by: Len Brown commit 9f02d6b7b43d46a74dd385f06090104ecd0fb807 Merge: 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 c12a828982ee27e0d9f742177016896d6c3a5acb Author: Linus Torvalds Date: Tue Jul 12 13:17:42 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 Merge: 2824bd250f0be1551747cc3ed5ae07facc285b57 f4637b55ba960d9987a836617271659e9b7b0de8 Author: Linus Torvalds Date: Tue Jul 12 13:16:40 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit f4637b55ba960d9987a836617271659e9b7b0de8 Author: Tommy Christensen Date: Tue Jul 12 12:13:49 2005 -0700 [VLAN]: Fix early vlan adding leads to not functional device OK, I can see what's happening here. eth0 doesn't detect link-up until after a few seconds, so when the vlan interface is opened immediately after eth0 has been opened, it inherits the link-down state. Subsequently the vlan interface is never properly activated and are thus unable to transmit any packets. dev->state bits are not supposed to be manipulated directly. Something similar is probably needed for the netif_device_present() bit, although I don't know how this is meant to work for a virtual device. Signed-off-by: David S. Miller commit c12a828982ee27e0d9f742177016896d6c3a5acb Author: Andrew Morton Date: Tue Jul 12 12:09:43 2005 -0700 [SPARC64]: Fix SMP build failure. arch/sparc64/kernel/smp.c:48: error: parse error before "__attribute__" arch/sparc64/kernel/smp.c:49: error: parse error before "__attribute__" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit ab611487d8ada506e511d2b8f22fb8e7be9939b9 Author: Alexey Dobriyan Date: Tue Jul 12 12:08:43 2005 -0700 [NET]: __be'ify *_type_trans() tr_type_trans(), hippi_type_trans() left as-is. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 84531c24f27b02daa8e54e2bb6dc74a730fdf0a5 Author: Phil Oester Date: Tue Jul 12 11:57:52 2005 -0700 [NETFILTER]: Revert nf_reset change Revert the nf_reset change that caused so much trouble, drop conntrack references manually before packets are queued to packet sockets. Signed-off-by: Phil Oester Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2824bd250f0be1551747cc3ed5ae07facc285b57 Author: Michael Hund Date: Mon Jun 27 22:44:22 2005 +0200 [PATCH] USB: add ldusb driver The following driver provides complete interrupt-in and interrupt-out reports (raw data) to a user program. Until now it uses the HIDIOCGDEVINFO ioctl call, because I don't know better :-(. Perhaps, it will be ok for you - and I will be happy, if you assign 8 minor numbers. I have tested it in several environments and it works very well for me. However, it has a problem with two or more devices at the same hub, if the two or more devices need 1 ms interrupt-in transfers. Unfortunately more than one interrupt-in transfer every ms isn't possible (ehci driver?). This is why the min_interrupt_in_interval and min_interrupt_out_interval are increased to 2 ms (see the corresponding module parameters). This way, I can use two devices simultaneously at the same hub. Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman commit 83ef344a7539aa55a787790bc036f0bf3466e191 Author: brian@murphy.dk Date: Wed Jun 29 16:53:29 2005 -0700 [PATCH] USB: fix usb reference count bug in cdc-acm driver This increases the reference count on the usb cdc acm control interface which is referred to by the tty interface provided by the driver. This allows the deferred removal of the tty after the physical device is disconnected if the tty is held open at the time of disconnection. Signed-off-by: brian@murphy.dk Signed-off-by: Greg Kroah-Hartman commit a3fdf4ebe016ba756de3ca29a2a6117e9acd721c Author: brian@murphy.dk Date: Wed Jun 29 16:53:29 2005 -0700 [PATCH] USB: export usb_get_intf() and usb_put_intf() Export usb_get_intf and usb_put_intf so that modules can increase usb interface reference counts. Signed-off-by: brian@murphy.dk Signed-off-by: Greg Kroah-Hartman commit 00ab997dd24fff82900665449f859e23a78ad5f4 Author: david-b@pacbell.net Date: Wed Jun 29 07:04:14 2005 -0700 [PATCH] USB: another cdc descriptor This adds another CDC descriptor type to ; the main claim to fame for this is that some Motorola phones include it. It's not currently needed by any driver code; included for completeness. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit edfd6aee1f073ae645bd3e60ef96090fc9f0957b Author: david-b@pacbell.net Date: Wed Jun 29 07:03:10 2005 -0700 [PATCH] USB: fix ohci merge glitch A patch re-organizing some parts of root hub initialization deleted the code initializing the bus-neutral reboot/shutdown notifier for OHCI. This patch just restores that deleted code. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b404a5b02abf84812e5333bda201af464925d7a6 Author: david-b@pacbell.net Date: Wed Jun 29 06:59:14 2005 -0700 [PATCH] USB: ohci-omap pm updates The recent "pm_message_t" changes removed functionality from the Linux PM framework. This patch removes it from the OMAP OHCI too, removing the distinction between (previous) PM_SUSPEND_MEM and PM_SUSPEND_DISK state transitions ... now the only suspend semantics supportable are what was previously PM_SUSPEND_DISK (4) and is now "PMSG_SUSPEND" (3). From: Todd Poynor Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1d7beee3d4b4ae7faa881ef05ff5d94a125ed8a6 Author: david-b@pacbell.net Date: Wed Jun 29 07:00:56 2005 -0700 [PATCH] USB: omap_udc tweaks Minor OMAP updates that somehow got dropped from previous patches. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit e828264ee797d40b1df99fe88c6acfc0f36df639 Author: Ian Campbell Date: Wed Jun 29 10:20:29 2005 +0100 [PATCH] USB: gadget/ether build fixes. I also needed the following on 2.6.13-rc1 without CONFIG_USB_ETH_RNDIS, symbol fs_status_desc isn't available in that case on PXA255. This builds both with and without ETH_RNDIS, but I haven't actually tested either. Signed-off-by: Ian Campbell Signed-off-by: Greg Kroah-Hartman commit 05f33400307cfe9d89dbeca659731b9055fefbf8 Author: Ian Campbell Date: Wed Jun 29 10:15:32 2005 +0100 [PATCH] USB: gadget/ether fixes Signed-off-by: Ian Campbell Signed-off-by: Greg Kroah-Hartman commit b9df978f1974fea373741367b5d79a2ed3b7dcf9 Author: Luca Risolia Date: Sat Jun 25 16:30:24 2005 +0200 [PATCH] USB: SN9C10x driver updates SN9C10x driver updates. Changes: + new, - removed, * cleanup, @ bugfix @ Remove bad get_ctrl()'s * Documentation updates + Add 0x0c45/0x602d to the list of SN9C10x based devices + Add support for OV7630 image sensors Signed-off-by: Luca Risolia Signed-off-by: Greg Kroah-Hartman commit 8fd6db47b90c7ecac32e3211f771849e148bdb07 Author: Michael Hund Date: Mon Jun 27 22:44:22 2005 +0200 [PATCH] USB: add LD devices to hid blacklist below you will find one patch to hid-core.c, which lets usbhid ignore our HID devices. It would be nice, if you can apply it. Signed-off-by: Michael Hund Signed-off-by: Greg Kroah-Hartman commit b2134bcd2e1bf989e0566dd1b0e59a792722b671 Author: KAMBAROV, ZAUR Date: Fri Jun 24 22:20:35 2005 -0700 [PATCH] USB: coverity: (desc->bitmap)[] overrun fix The length of the array desc->bitmap is 3, and not 4: Definitions involved: In drivers/usb/core/hcd.h 464 #define bitmap DeviceRemovable In drivers/usb/host/ohci-hub.c 395 struct usb_hub_descriptor *desc In drivers/usb/core/hub.h 130 struct usb_hub_descriptor { 131 __u8 bDescLength; 132 __u8 bDescriptorType; 133 __u8 bNbrPorts; 134 __u16 wHubCharacteristics; 135 __u8 bPwrOn2PwrGood; 136 __u8 bHubContrCurrent; 137 /* add 1 bit for hub status change; round to bytes */ 138 __u8 DeviceRemovable[(USB_MAXCHILDREN + 1 + 7) / 8]; 139 __u8 PortPwrCtrlMask[(USB_MAXCHILDREN + 1 + 7) / 8]; 140 } __attribute__ ((packed)); In include/linux/usb.h 306 #define USB_MAXCHILDREN (16) This defect was found automatically by Coverity Prevent, a static analysis tool. (akpm: this code should be shot. Field `bitmap' doesn't exist in struct usb_hub_descriptor. And this .c file is #included in drivers/usb/host/ohci-hcd.c, and someone somewhere #defines `bitmap' to `DeviceRemovable'. >From a maintainability POV it would be better to memset the whole array beforehand - I changed the patch to do that) Signed-off-by: Zaur Kambarov Cc: Signed-off-by: Greg Kroah-Hartman commit 99f83c9c9ac994c844ecf3e64e848c2f8dd7dfe0 Author: Michael Downey Date: Mon Jun 27 11:48:26 2005 -0600 [PATCH] USB: add driver for Keyspan Digital Remote This driver is a basic keypress input driver for the Keyspan Digital Remote with part number UIA-11. Currently there is an older remote with part number UIA-10 which isn't supported by this driver. Support for the older UIA-10 could be added but a binary file is required to be download to the device, and I don't have that file. I also don't have a UIA-10 device so I wouldn't be able to test any of the changes. Signed-off-by: Michael Downey Signed-off-by: Greg Kroah-Hartman commit 30e695986679ac2d2354fc1634e8cb931bb47785 Author: Andrew Morton Date: Sun Jun 26 17:18:46 2005 -0700 [PATCH] USB: net2280 warning fix drivers/usb/gadget/net2280.c: In function 'show_registers': drivers/usb/gadget/net2280.c:1501: warning: assignment discards qualifiers from pointer target type Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 5db539e49fc7471e23bf3c94ca304f008cb7b7f3 Author: Olav Kongas Date: Thu Jun 23 20:25:36 2005 +0300 [PATCH] USB: Fix kmalloc's flags type in USB Greg, This patch fixes the kmalloc() flags argument type in USB subsystem; hopefully all of its occurences. The patch was made against patch-2.6.12-git2 from Jun 20. Cleanup of flags for kmalloc() in USB subsystem. Signed-off-by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit 17f8bb7312fa9b00f80c3c0f8d5a5d698eb97bbd Author: Olav Kongas Date: Thu Jun 23 20:12:24 2005 +0300 [PATCH] USB: isp116x-hcd cleanup Sorry that it took so long. Here comes a cleanup patch that addresses the remarks by Alexey Dobriyan about gregkh-usb-usb-isp116x-hcd-add.patch EXCEPT the remark about the typecasting of mem_flags argument for kcalloc; this will be addressed in a later patch. OlavCleanup of isp116x-hcd. Signed off by: Olav Kongas Signed-off-by: Greg Kroah-Hartman commit ae0d6cceb20eec57e7196c22999c62c465ffd5bf Author: Pete Zaitcev Date: Sat Jun 25 14:32:59 2005 -0700 [PATCH] USB: Patch to make usbmon to print control setup packets Make usbmon to print Setup packets of Control transfers. This is useful when debugging enumeration issues. This is a change to the trace format which is not fully compatible. A parser has to look at the data length word now. If that word is a character like 's', read setup packet before proceeding with data. I decided not to bump the API tag for this because not many such parsers exist at this point. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ead99eb00190a274e3b3666ecd431be12c2b7888 Author: Thomas Winischhofer Date: Fri Jun 24 18:44:20 2005 +0200 [PATCH] USB: SiS USB Makefile fixes although 2.6.12 now contains the sisusb driver, it failes to build this driver due to a missing patch of the Makefile. From: Thomas Winischhofer Signed-off-by: Greg Kroah-Hartman commit 1a7aad15ff93be104c8e0851a43b94f8ccd92225 Author: Duncan Sands Date: Thu Jun 23 09:37:56 2005 +0200 [PATCH] USB ATM: fix line resync logic We map states 0x00 and 0x10 to the ATM_PHY_SIG_LOST flag. The current logic fails to resync the line if we get state 0x10 followed by 0x00, since we only resync the line when the state is 0x00 and the flag changed. Doubly fixed by (1) always resyncing the line when the state is 0x00 even if the state didn't change, and (2) keeping track of the last state, not just the flag. We do (2) as well as (1) in order to get better log messages. This is a tweaked version of the original patch by Aurelio Arroyo. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit cd5c08fb7b0d960b7cd48bc977feee7b3bd8b046 Author: Duncan Sands Date: Thu Jun 23 09:23:10 2005 +0200 [PATCH] USB ATM: robustify poll throttling No functional change, but less likely to break in the future. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 322a95bc8eba889d2f9d7222936d682c9aad8294 Author: Duncan Sands Date: Thu Jun 23 09:20:50 2005 +0200 [PATCH] USB ATM: line speed measured in Kb not Kib Spotted by David Woodhouse. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 16966f2ab7db7366855d1267071a3138ae127ff6 Author: Greg Kroah-Hartman Date: Wed Jun 29 16:53:29 2005 -0700 [PATCH] USB: fix ftdi_sio compiler warnings Signed-off-by: Greg Kroah-Hartman commit 7e33ae67815372a93e8e77624fd47e39a986415d Author: Ian Abbott Date: Mon Jun 20 17:10:19 2005 +0100 [PATCH] USB ftdi_sio: remove redundant TIOCMBIS and TIOCMBIC code ftdi_sio: Remove redundant handling of TIOCMBIS and TIOCMBIC ioctls as they are handled in the tty layer and never reach this driver. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 8f977e4201fcc0bd512eb01e775894e0a9c34a39 Author: Ian Abbott Date: Mon Jun 20 16:45:42 2005 +0100 [PATCH] USB ftdi_sio: reduce device id table clutter ftdi_sio: Use a single usb_device_id table and detect the type of chip programatically. The table also flags devices requiring special initialization. The patch makes the driver about 10K smaller and makes it easier to add new device IDs. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 9c8d61783e5bb5e29744b6481a1c67c6e4e8e135 Author: akpm@osdl.org Date: Mon Jun 20 14:29:58 2005 -0700 [PATCH] USB: khubd: use kthread API Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit e8116e84b56f8fa4f091b967a045f47c55095c68 Author: Phil Dibowitz Date: Wed Jun 22 22:47:13 2005 -0700 [PATCH] USB Storage: Remove unneeded SC/P This patch removes an unneeded subclass and protocol from the 07af/0005/100 entry in unsual_devs.h as reported by Alfred Ganz . Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit cf5910bbae81b95bdf120e01fd365ad7b939b143 Author: Greg Kroah-Hartman Date: Wed Jun 29 16:53:29 2005 -0700 [PATCH] USB: add bMaxPacketSize0 attribute to sysfs For some reason this was not there... Signed-off-by: Greg Kroah-Hartman commit d8683a0cb5d09cb7f19feefa708424a84577e68f Author: Len Brown Date: Sun Jul 3 16:42:23 2005 -0400 [ACPI] increase MAX_IO_APICS to 64 on i386 x86_64 was already 128 http://bugzilla.kernel.org/show_bug.cgi?id=3754 Signed-off-by: Len Brown commit 02df8b9385c21fdba165bd380f60eca1d3b0578b Author: Venkatesh Pallipadi Date: Fri Apr 15 15:07:10 2005 -0400 [ACPI] enable C2 and C3 idle power states on SMP http://bugzilla.kernel.org/show_bug.cgi?id=4401 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 6a2e9b738cb5c929df73b6acabdd8f9a4e9a0416 Author: Sam Ravnborg Date: Mon Jul 11 21:13:56 2005 -0700 [NET]: move config options out to individual protocols Move the protocol specific config options out to the specific protocols. With this change net/Kconfig now starts to become readable and serve as a good basis for further re-structuring. The menu structure is left almost intact, except that indention is fixed in most cases. Most visible are the INET changes where several "depends on INET" are replaced with a single ifdef INET / endif pair. Several new files were created to accomplish this change - they are small but serve the purpose that config options are now distributed out where they belongs. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 17e9c78a75ce9eacd61200f9e1f1924012e28846 Author: Luming Yu Date: Fri Apr 22 23:07:10 2005 -0400 [ACPI] EC GPE-disabled issue http://bugzilla.kernel.org/show_bug.cgi?id=3851 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit a27ac38efd6dc6dccebfc9bcc475ab4aa5fc4a56 Author: Len Brown Date: Fri Apr 5 00:07:45 2019 -0500 [ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build Signed-off-by: Len Brown commit 590275ce72c48fdbddea057bc9ee379c1fd851ef Author: Jesse Barnes Date: Mon Apr 18 23:52:17 2005 -0400 [ACPI] cleanup: delete !IA64_SGI_SN from acpi/Kconfig Signed-off-by: Jesse Barnes Signed-off-by: Len Brown commit 6c4fa56033c11ad5c5929bf3edd1505d3d8a8c0b Author: Venkatesh Pallipadi Date: Mon Apr 18 23:06:47 2005 -0400 [ACPI] fix C1 patch for IA64 http://bugzilla.kernel.org/show_bug.cgi?id=4233 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit ef7b06cd905424aea7c31f27fef622e84e75e650 Author: David Shaohua Li Date: Mon Apr 18 22:59:23 2005 -0400 [ACPI] quiet dmesg related to ACPI PM of PCI devices DBG("No ACPI bus support for %s\n", dev->bus_id); http://bugzilla.kernel.org/show_bug.cgi?id=4277 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 44f6c01242da4e162f28d8e1216a8c7a91174605 Author: Robert Moore Date: Mon Apr 18 22:49:35 2005 -0400 ACPICA 20050408 from Bob Moore Fixed three cases in the interpreter where an "index" argument to an ASL function was still (internally) 32 bits instead of the required 64 bits. This was the Index argument to the Index, Mid, and Match operators. The "strupr" function is now permanently local (acpi_ut_strupr), since this is not a POSIX-defined function and not present in most kernel-level C libraries. References to the C library strupr function have been removed from the headers. Completed the deployment of static functions/prototypes. All prototypes with the static attribute have been moved from the headers to the owning C file. ACPICA 20050329 from Bob Moore An error is now generated if an attempt is made to create a Buffer Field of length zero (A CreateField with a length operand of zero.) The interpreter now issues a warning whenever executable code at the module level is detected during ACPI table load. This will give some idea of the prevalence of this type of code. Implemented support for references to named objects (other than control methods) within package objects. Enhanced package object output for the debug object. Package objects are now completely dumped, showing all elements. Enhanced miscellaneous object output for the debug object. Any object can now be written to the debug object (for example, a device object can be written, and the type of the object will be displayed.) The "static" qualifier has been added to all local functions across the core subsystem. The number of "long" lines (> 80 chars) within the source has been significantly reduced, by about 1/3. Cleaned up all header files to ensure that all CA/iASL functions are prototyped (even static functions) and the formatting is consistent. Two new header files have been added, acopcode.h and acnames.h. Removed several obsolete functions that were no longer used. Signed-off-by: Len Brown commit ebb6e1a6122fd6b7c96470cfd4ce0f04150e5084 Author: Len Brown Date: Thu Apr 14 23:12:56 2005 -0400 [ACPI] Deprecate /proc/acpi/sleep in favor of /sys/power/state Signed-off-by: Len Brown commit 9d9437759eb6fdb68f7b82cbee20b0fb711d9f0d Author: Nickolai Zeldovich Date: Fri Apr 8 23:37:34 2005 -0400 [ACPI] S3 resume -- use lgdtl, not lgdt From: Nickolai Zeldovich Signed-off-by: Len Brown commit d5950b4355049092739bea97d1bdc14433126cc5 Author: Sam Ravnborg Date: Mon Jul 11 21:03:49 2005 -0700 [NET]: add a top-level Networking menu to *config Create a new top-level menu named "Networking" thus moving net related options and protocol selection way from the drivers menu and up on the top-level where they belong. To implement this all architectures has to source "net/Kconfig" before drivers/*/Kconfig in their Kconfig file. This change has been implemented for all architectures. Device drivers for ordinary NIC's are still to be found in the Device Drivers section, but Bluetooth, IrDA and ax25 are located with their corresponding menu entries under the new networking menu item. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit c9c3e457de24cca2ca688fa397d93a241f472048 Author: David Shaohua Li Date: Fri Apr 1 00:07:31 2005 -0500 [ACPI] PNPACPI vs sound IRQ http://bugme.osdl.org/show_bug.cgi?id=4016 Written-by: David Shaohua Li Acked-by: Adam Belay Signed-off-by: Len Brown commit acf05f4b7f558051ea0028e8e617144123650272 Author: Venkatesh Pallipadi Date: Thu Mar 31 23:23:15 2005 -0500 [ACPI] update /proc/acpi/processor/*/power even if only C1 support Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 0b7f22aab4e960c75e82ad696ef852f9b0015e7d Author: Olaf Kirch Date: Mon Jul 11 21:01:42 2005 -0700 [IPV4]: Prevent oops when printing martian source In some cases, we may be generating packets with a source address that qualifies as martian. This can happen when we're in the middle of setting up the network, and netfilter decides to reject a packet with an RST. The IPv4 routing code would try to print a warning and oops, because locally generated packets do not have a valid skb->mac.raw pointer at this point. Signed-off-by: David S. Miller commit 55e59c511cea3c6c721971467c707e9955922bc2 Author: Ashok Raj Date: Thu Mar 31 22:51:10 2005 -0500 [ACPI] Evaluate CPEI Processor Override flag ACPI 3.0 added a Correctable Platform Error Interrupt (CPEI) Processor Overide flag to MADT.Platform_Interrupt_Source. Record the processor that was provided as hint from ACPI. Signed-off-by: Ashok Raj Signed-off-by: Len Brown commit 6940fabaa35b893163b7043d0d1dc5d715f9e1ca Author: Keiichiro Tokunaga Date: Wed Mar 30 23:15:47 2005 -0500 [ACPI] hotplug Processor consideration in acpi_bus_add() Signed-off-by: Keiichiro Tokunaga Signed-off-by: Len Brown commit af9debd461d10fe582c9c0e80eafa69f698331ed Author: Julian Anastasov Date: Mon Jul 11 20:59:57 2005 -0700 [IPVS]: Add and reorder bh locks after moving to keventd. An addition to the last ipvs changes that move update_defense_level/si_meminfo to keventd: - ip_vs_random_dropentry now runs in process context and should use _bh locks to protect from softirqs - update_defense_level still needs _bh locks after si_meminfo is called, for the same purpose Signed-off-by: Julian Anastasov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8de7a63b69a263b7549599be882d7aa15397f8b3 Author: Andrew Morton Date: Wed Mar 30 22:53:30 2005 -0500 [ACPI] fix debug-mode build warning in acpi/hotkey.c drivers/acpi/hotkey.c: In function `create_polling_proc': drivers/acpi/hotkey.c:334: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit f5b8adb4f5767415b7b00e32e4766a052e2ed4cc Author: Jesper Juhl Date: Mon Jul 11 20:59:03 2005 -0700 [NET]: Trivial spelling fix patch for net/Kconfig Signed-off-by: Jesper Juhl Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d1dd0c23916bd781de27bc5ec1c295064e9ce9cc Author: Paulo Marques Date: Wed Mar 30 22:39:49 2005 -0500 [ACPI] fix kmalloc size bug in acpi/video.c acpi_video_device_find_cap() used &p instead of *p when calculating storage size, thus allocating only 4 or 8 bytes instead of 12... Also, kfree(NULL) is legal, so remove some unneeded checks. From: Paulo Marques Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7334571f724df7a19f48cc974e991e00afde1e2f Author: Adrian Bunk Date: Wed Mar 30 22:31:35 2005 -0500 [ACPI] fix potential NULL dereference in acpi/video.c Found-by: Adrian Bunk Signed-off-by: Len Brown commit 3182cd84f0e132558bbe106c070405ae49f1f0e3 Author: Alexey Dobriyan Date: Mon Jul 11 20:57:47 2005 -0700 [SCTP]: __nocast annotations Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit f4224153098c1103db592b28f304beeb9c02481b Author: Panagiotis Issaris Date: Wed Mar 30 22:15:36 2005 -0500 [ACPI] check for kmalloc failure in toshiba_acpi.c Signed-off-by: Panagiotis Issaris Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 83ea7445221651dc43cf8d22f81089e0cbccf22b Author: Andrew Morton Date: Wed Mar 30 22:12:13 2005 -0500 [ACPI] fix build warning Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit f165b10f4a9aac7fee9b11a125de20a1712be128 Author: Greg Kroah-Hartman Date: Wed Mar 30 21:23:19 2005 -0500 cleanup: remove unnecessary initializer on static pointers Suggested-by: Greg KH Signed-off-by: Len Brown commit b008b8d7092053fc1f036cfc54dc11740cc424ed Author: Matthieu Castet Date: Fri Mar 25 12:03:15 2005 -0500 [ACPI] PNPACPI parse error http://bugzilla.kernel.org/show_bug.cgi?id=3912 Written-by: matthieu castet Acked-by: Shaohua Li Signed-off-by: Len Brown commit a406d9e63e1d7088aad22565449de2e109300e5c Author: Len Brown Date: Wed Mar 23 16:16:03 2005 -0500 [ACPI] gut acpi_pci_choose_state() to avoid conflict with pending pm_message_t re-definition. Signed-off-by: Len Brown commit fa9cd547e097df4966b8bd5c94aeed953e32b14d Author: Luming Yu Date: Sat Mar 19 01:54:47 2005 -0500 [ACPI] fix EC access width http://bugzilla.kernel.org/show_bug.cgi?id=4346 Written-by: David Shaohua Li and Luming Yu Signed-off-by: Len Brown commit 451566f45a2e6cd10ba56e7220a9dd84ba3ef550 Author: Dmitry Torokhov Date: Sat Mar 19 01:10:05 2005 -0500 [ACPI] Enable EC Burst Mode Fixes several Embedded Controller issues, including button failure and battery status AE_TIME failure. http://bugzilla.kernel.org/show_bug.cgi?id=3851 Based on patch by: Andi Kleen Signed-off-by: Dmitry Torokhov Signed-off-by: Luming Yu Signed-off-by: Len Brown commit b913100d7304ea9596d8d85ab5f3ae04bd2b0ddb Author: David Shaohua Li Date: Sat Mar 19 00:16:18 2005 -0500 [ACPI] pci_set_power_state() now calls platform_pci_set_power_state() and ACPI can answer http://bugzilla.kernel.org/show_bug.cgi?id=4277 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 0f64474b8f7f1f7f3af5b24ef997baa35f923509 Author: David Shaohua Li Date: Sat Mar 19 00:15:48 2005 -0500 [ACPI] PCI can now get suspend state from firmware pci_choose_state() can now call platform_pci_choose_state() and ACPI can answer http://bugzilla.kernel.org/show_bug.cgi?id=4277 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 84df749f364209c9623304b7a94ddb954dc343bb Author: David Shaohua Li Date: Fri Mar 18 18:53:36 2005 -0500 [ACPI] Bind ACPI and PCI devices http://bugzilla.kernel.org/show_bug.cgi?id=4277 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 4e10d12a3d88c88fba3258809aa42d14fd8cf1d1 Author: David Shaohua Li Date: Fri Mar 18 18:45:35 2005 -0500 [ACPI] Bind PCI devices with ACPI devices Implement the framework for binding physical devices with ACPI devices. A physical bus like PCI bus should create a 'acpi_bus_type', with: .find_device: For device which has parent such as normal PCI devices. .find_bridge: It's for special devices, such as PCI root bridge or IDE controller. Such devices generally haven't a parent or ->bus. We use the special method to get an ACPI handle. Uses new field in struct device: firmware_data http://bugzilla.kernel.org/show_bug.cgi?id=4277 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit fb9802fa59b196d7f90bb3c2e33c555c6bdc4c54 Author: Luming Yu Date: Fri Mar 18 18:03:45 2005 -0500 [ACPI] generic Hot Key support See Documentation/acpi-hotkey.txt Use cmdline "acpi_specific_hotkey" to enable legacy platform specific drivers. http://bugzilla.kernel.org/show_bug.cgi?id=3887 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit d58da590451cf6ae75379a2ebf96d3afb8d810d8 Author: David Shaohua Li Date: Fri Mar 18 16:43:54 2005 -0500 [ACPI] S3 Suspend to RAM: fix driver suspend/resume methods Drivers should do this: .suspend() pci_disable_device() .resume() pci_enable_device() http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 362b06bb70b5a5779b2e852e0f2bdb437061106e Author: David Shaohua Li Date: Fri Mar 18 16:30:29 2005 -0500 [ACPI] S3 Suspend to RAM: interrupt resume fix Delete PCI Interrupt Link Device .resume method -- it is the device driver's job to request interrupts, not the Link's job to remember what the devices want. This addresses the issue of attempting to run the ACPI interpreter too early in resume, when interrupts are still disabled. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit 5ae947ecc9c1c23834201e5321684a5cb68bdd3f Author: David Shaohua Li Date: Fri Mar 18 16:27:13 2005 -0500 [ACPI] Suspend to RAM fix Free some RAM before entering S3 so that upon resume we can be sure early allocations will succeed. http://bugzilla.kernel.org/show_bug.cgi?id=3469 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit e2a5b420f716cd1a46674b1a90389612eced916f Author: Alexey Starikovskiy Date: Fri Mar 18 16:20:46 2005 -0500 [ACPI] ACPI poweroff fix Register an "acpi" system device to be notified of shutdown preparation. This depends on CONFIG_PM http://bugzilla.kernel.org/show_bug.cgi?id=4041 Signed-off-by: Alexey Starikovskiy Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit be91492ca871e58f61b517cfba541095bb60001c Author: Len Brown Date: Fri Mar 18 16:00:29 2005 -0500 [ACPI] CONFIG_ACPI now depends on CONFIG_PM Signed-off-by: Len Brown commit bd4698dad3023ae137b366c736e29ca6eaf3b9f7 Author: Alexey Starikovskiy Date: Fri Mar 18 15:35:22 2005 -0500 [ACPI] Allow simultaneous Fixed Feature and Control Method buttons delete /proc/acpi/button http://bugzilla.kernel.org/show_bug.cgi?id=1920 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 45b1b196677b8009ab6cdc4b656265f1d7015c1b Author: Keiichiro Tokunaga Date: Wed Mar 2 00:00:00 2005 -0500 [ACPI] update CONFIG_ACPI_CONTAINER Kconfig help Signed-off-by: Keiichiro Tokunaga Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7ac3db59fd4410405ce55e2a25c397aec440d8da Merge: 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 328f314a89fd24e50fdf22c81efb2a468fdf25b5 Author: Linus Torvalds Date: Mon Jul 11 16:32:40 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit ede7fbdf526c314850c9f32dd8da1753bf8d0ad5 Author: Jean Delvare Date: Sat Jul 2 18:52:48 2005 +0200 [PATCH] I2C: Move hwmon drivers (3/3) Part 3: Move the drivers documentation, plus two general documentation files. Note that the patch "adds trailing whitespace", because it does move the files as-is, and some files happen to have trailing whitespace. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 8d5d45fb14680326f833295f2316a4ec5e357220 Author: Jean Delvare Date: Sat Jul 2 18:20:26 2005 +0200 [PATCH] I2C: Move hwmon drivers (2/3) Part 2: Move the driver files themselves. Note that the patch "adds trailing whitespace", because it does move the files as-is, and some files happen to have trailing whitespace. From: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 63522f7fdb624adef20cb9d90c7effcd5b6301b2 Author: David S. Miller Date: Mon Jul 11 14:29:11 2005 -0700 [NETLINK]: Reserve NETLINK_NETFILTER. Signed-off-by: David S. Miller commit ad2f931dcb41bcfae38cc77d78b7821dfef83cf2 Author: Jean Delvare Date: Sat Jul 2 18:15:49 2005 +0200 [PATCH] I2C: Move hwmon drivers (1/3) Part 1: Configuration files and Makefiles. From: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0e65f82814e9828d3ff54988de9e7c0b36794daa Author: Evgeniy Polyakov Date: Thu Jun 30 22:52:38 2005 +0400 [PATCH] w1: fix CRC calculation on bigendian platforms. In the 2.6.13-rc1 code the "rn" structure is in the wrong-endianness when passed to w1_attach_slave_device(). This causes problems like the family and crc being swapped around. Signed-off-by: Roger Blofeld Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 80efa8c72006a1c04004f8fb07b22073348e4bf2 Author: Adrian Bunk Date: Fri Jul 1 00:17:27 2005 +0200 [PATCH] I2C: SENSORS_ATXP1 must select I2C_SENSOR On Thu, Jun 30, 2005 at 11:47:09PM +0200, Sebastian Pigulak wrote: > I've tried patching linux-2.6.13-RC1 with patch-2.6.13-rc1-git2 and > building atxp1(it allows Vcore voltage changing) into the kernel. > Unfortunately, the kernel compilation stops with: > > LD init/built-in.o > LD vmlinux > drivers/built-in.o(.text+0x92298): In function `atxp1_detect': > : undefined reference to `i2c_which_vrm' > drivers/built-in.o(.text+0x921ae): In function `atxp1_attach_adapter': > : undefined reference to `i2c_detect' > make: *** [vmlinux] B??d 1 > ==> ERROR: Build Failed. Aborting... > > Could someone have a look at the module and possibly fix it up? SENSORS_ATXP1 must select I2C_SENSOR. Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 1d772e2587da3c8b0fb8610fcc1c91fd82f87e52 Author: Jean Delvare Date: Sat Jun 25 11:37:40 2005 +0200 [PATCH] I2C: Clarify the usage of i2c-dev.h Upon suggestion by Nils Roeder, here is an update to the i2c documentation to clarify which header files user-space applications relying on the i2c-dev interface should include. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a68e2f4895070f3a449bfe5ae1174b73cc900642 Author: Jan Veldeman Date: Fri Jul 1 16:20:24 2005 +0200 [PATCH] I2C: Documentation fix Fix documentation to match code in include/linux/i2c-dev.h Signed-off-by: Jan Veldeman Signed-off-by: Greg Kroah-Hartman commit 61f5809d3ebce9d5433b8696048e91405b681023 Author: david-b@pacbell.net Date: Wed Jun 29 07:14:06 2005 -0700 [PATCH] I2C: minor I2C doc cleanups The I2C stack has long had "id" fields, of rather dubious utility, in many data structures. This removes mention of one of them from the documentation about how to write an I2C driver, so that only drivers that really need to use them (probably old/legacy code) will have any reason to use this field. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2db32767874fe53faff4f80de878ca19927efc1f Author: Jean Delvare Date: Thu Jun 23 23:43:00 2005 +0200 [PATCH] I2C: drop bogus eeprom comment This simple patch drops an out-of-date comment in the eeprom i2c chip driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a0920e10438e9fe8b22aba607083347c84458ed8 Author: Mark M. Hoffman Date: Tue Jun 28 00:21:30 2005 -0400 [PATCH] i2c: make better use of IDR in i2c-core This patch uses the already existing IDR mechanism to simplify and improve the i2c_get_adapter function in i2c-core. Signed-off-by: Mark M. Hoffman Signed-off-by: Greg Kroah-Hartman commit 5da69ba42aa42a479c0f5d8cb8351ebb6b51c12e Author: Jean Delvare Date: Fri Jul 1 14:28:15 2005 +0200 [PATCH] I2C: m41t00: fix incorrect kfree Here is a simple path fixing an incorrect kfree in the m41t00 i2c chip driver. The current code happens to work by accident, but the freed pointer isn't the one which was allocated in the first place, which could cause problems later. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2146fec20c38d926f0d88413977f941f42a14588 Author: Jean Delvare Date: Thu Jun 23 23:41:39 2005 +0200 [PATCH] I2C: max6875 Kconfig update Here is a proposed Kconfig update for the new max6875 i2c chip driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 089bd86632769051f15cd7387eebe126d18f151f Author: Jean Delvare Date: Thu Jun 23 23:37:53 2005 +0200 [PATCH] I2C: max6875 documentation update Here is a proposed documentation update for the new max6875 i2c chip driver. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9ab1ee2ab7d65979c0f14a60ee1f29f8988f5811 Author: Jean Delvare Date: Fri Jun 24 21:14:16 2005 +0200 [PATCH] I2C: New max6875 driver may corrupt EEPROMs After a careful code analysis on the new max6875 driver (drivers/i2c/chips/max6875.c), I have come to the conclusion that this driver may cause EEPROM corruptions if used on random systems. The EEPROM part of the MAX6875 chip is accessed using rather uncommon I2C sequences. What is seen by the MAX6875 as reads can be seen by a standard EEPROM (24C02) as writes. If you check the detection method used by the driver, you'll find that the first SMBus command it will send on the bus is i2c_smbus_write_byte_data(client, 0x80, 0x40). For the MAX6875 it makes an internal pointer point to a specific offset of the EEPROM waiting for a subsequent read command, so it's not an actual data write operation, but for a standard EEPROM, this instead means writing value 0x40 to offset 0x80. Blame Philips and Intel for the obscure protocol. Since the MAX6875 and the standard, common 24C02 EEPROMs share two I2C addresses (0x50 and 0x52), loading the max6875 driver on a system with standard EEPROMs at either address will trigger a write on these EEPROMs, which will lead to their corruption if they happen not to be write protected. This kind of EEPROMs can be found on memory modules (SPD), ethernet adapters (MAC address), laptops (proprietary data) and displays (EDID/DDC). Most of these are hopefully write-protected, but not all of them. For this reason, I would recommend that the max6875 driver be neutralized, in a way that nobody can corrupt his/her EEPROMs by just loading the driver. This means either deleting the driver completely, or not listing any default address for it. I'd like this to be done before 2.6.13-rc1 is released. Additionally, the max6875 driver lacks the 24RF08 corruption preventer present in the eeprom driver, which means that loading this driver in a system with such a chip would corrupt it as well. Here is a proposed quick patch addressing the issue, although I wouldn't mind a complete removal if it makes everyone feel safer. I think Ben has plans to replace this driver by a much simplified one anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 541e6a02768404efb06bd1ea5f33d614732f41fc Author: Jean Delvare Date: Thu Jun 23 22:18:08 2005 +0200 [PATCH] I2C: Strip trailing whitespace from strings Here is a simple patch originally from Denis Vlasenko, which strips a useless trailing whitespace from 8 strings in 4 i2c drivers. Please apply, thanks. From: Denis Vlasenko Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 65fc50e50ff9f8b82c3756eccd7e7db6a267ffe9 Author: david-b@pacbell.net Date: Wed Jun 29 07:13:00 2005 -0700 [PATCH] I2C: minor TPS6501x cleanups This includes various small cleanups and fixes to the TPS 6501x driver that came mostly from review feedback by Jean Delvare; thanks Jean! Also some goofy whitespace gets fixed. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6328c0e163abfce679b1beffb166f72900bf0a22 Author: Denis Vlasenko Date: Wed Jun 22 10:25:13 2005 +0300 [PATCH] I2C: Coding style cleanups to via686a On Wednesday 22 June 2005 08:17, Greg KH wrote: > [PATCH] I2C: Coding style cleanups to via686a > > The via686a hardware monitoring driver has infamous coding style at the > moment. I'd like to clean up the mess before I start working on other > changes to this driver. Is the following patch acceptable? No code > change, only coding style (indentation, alignments, trailing white > space, a few parentheses and a typo). > > Signed-off-by: Jean Delvare > Signed-off-by: Greg Kroah-Hartman Nice. You missed some. This one is on top of your patch: Signed-off-by: Greg Kroah-Hartman commit 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 Merge: a8400986fb0bff251ac4dd9e2188cf0b59443d3f 3b5cc09033f49d004006acf44e5b05036bd46a85 Author: Linus Torvalds Date: Mon Jul 11 14:08:08 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 328f314a89fd24e50fdf22c81efb2a468fdf25b5 Author: David S. Miller Date: Mon Jul 11 13:44:56 2005 -0700 [SPARC64]: Add missing asm-sparc64/seccomp.h file. Signed-off-by: David S. Miller commit 3b5cc09033f49d004006acf44e5b05036bd46a85 Author: Kenji Kaneshige Date: Sun Jul 10 21:49:00 2005 -0700 [IA64] assign_irq_vector() should not panic Current assign_irq_vector() will panic if interrupt vectors is running out. But I think how to handle the case of lack of interrupt vectors should be handled by the caller of this function. For example, some PCI devices can raise the interrupt signal via both MSI and I/O APIC. So even if the driver for these device fails to allocate a vector for MSI, the driver still has a chance to use I/O APIC based interrupt. But currently there is no chance for these driver to use I/O APIC based interrupt because kernel will panic when assign_irq_vector() fails to allocate interrupt vector. The following patch changes assign_irq_vector() for ia64 to return -ENOSPC on error instead of panic (as i386 and x86_64 versions do). Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit 699139279d29e36e39d353b0536b510dab2e5ffa Author: Nishanth Aravamudan Date: Fri Jul 8 17:10:00 2005 -0700 [IA64] use msleep_interruptible() instead of schedule_timeout Description: Replace schedule_timeout() with msleep_interruptible() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Acked-by: Dean Nelson Signed-off-by: Tony Luck commit a8400986fb0bff251ac4dd9e2188cf0b59443d3f Author: Miles Bader Date: Mon Jul 11 18:24:50 2005 +0900 [PATCH] v850: Update mmu.h header to match implementation changes Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 623cdf4a04a9856f93e32e7716ed8196f6d5ee3b Author: Miles Bader Date: Mon Jul 11 18:24:50 2005 +0900 [PATCH] v850: Update checksum.h to match changed function signatures Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 200d481f28be4522464bb849dd0eb5f8cb6be781 Merge: f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c 97f927a4d7dbccde0a854a62c3ea54d90bae8679 Author: Linus Torvalds Date: Mon Jul 11 10:18:18 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6 commit f43a64c5e1a65d12b9b53a35ed2d5db441fcb64c Merge: 5c23804a0941a111752fdacefe0bea2db1b4d93f f7ceba360cce9af3fbc4e5a5b1bd40b570b7021c Author: Linus Torvalds Date: Mon Jul 11 10:09:59 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit d0feafbf14ebe860136b8ad84cce42b34defb323 Author: Olaf Hering Date: Sun Jul 10 12:35:00 2005 -0700 [IA64] remove linux/version.h include from arch/ia64 changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. Signed-off-by: Olaf Hering Signed-off-by: Tony Luck commit e7578c08a4dee36fe01fb38805f325689e642eb0 Merge: 763b3917e779c9c25d56fc71a796774185cd6ce2 5c23804a0941a111752fdacefe0bea2db1b4d93f Author: Tony Luck Date: Mon Jul 11 09:43:11 2005 -0700 Auto merge with /home/aegl/GIT/linus commit f7ceba360cce9af3fbc4e5a5b1bd40b570b7021c Author: David S. Miller Date: Sun Jul 10 19:29:45 2005 -0700 [SPARC64]: Add syscall auditing support. Signed-off-by: David S. Miller commit 8d8a64796fdee4e20355c6c12c9cc630a2e7494d Author: David S. Miller Date: Sun Jul 10 16:55:48 2005 -0700 [SPARC64]: Pass regs and entry/exit boolean to syscall_trace() Also fix a bug in 32-bit syscall tracing. We forgot to update this code when we moved over to the convention that all 32-bit syscall arguments are zero extended by default. Signed-off-by: David S. Miller commit bb49bcda15f1bc1a52c7f887db278447f332eaa7 Author: David S. Miller Date: Sun Jul 10 16:49:28 2005 -0700 [SPARC64]: Add SECCOMP support. Signed-off-by: David S. Miller commit af166d15c3ad4d501a0c4fb5b4547bb2ba205918 Author: David S. Miller Date: Sun Jul 10 15:56:40 2005 -0700 [SPARC64]: Kill ancient and unused SYSCALL_TRACING debugging code. Signed-off-by: David S. Miller commit d369ddd2fc00fc3f46e9052d1017cbf407e3cdf7 Author: David S. Miller Date: Sun Jul 10 15:45:11 2005 -0700 [SPARC64]: Add __read_mostly support. Signed-off-by: David S. Miller commit 9126dfde9e5efd76f9d4246819bdc7ea66de3af0 Author: David S. Miller Date: Sun Jul 10 15:11:45 2005 -0700 [SPARC]: Add ioprio system call support. Signed-off-by: David S. Miller commit 5c23804a0941a111752fdacefe0bea2db1b4d93f Merge: 58c853c6eabe93ab5e5daf7150fbb4e562acbb79 ec6bced6c7b92904f5ead39c9c1b8dc734e6eff0 Author: Linus Torvalds Date: Sun Jul 10 12:57:49 2005 -0700 Merge master.kernel.org:~rmk/linux-2.6-arm.git commit 58c853c6eabe93ab5e5daf7150fbb4e562acbb79 Author: Stephen Rothwell Date: Sun Jul 10 23:12:01 2005 +1000 [PATCH] remove asm-xtensa/ipc.h Now that sys_ipc has been removed from xtensa, asm/ipc.h is no longer needed for that architecture. Not tested, but obviously correct. This file is included only from arch code and this patch also removes the only inclusion. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 1934b8b6561ee7804b0a671b48cf642fcd936b2c Author: Ben Collins Date: Sat Jul 9 20:01:23 2005 -0400 [PATCH] Sync up ieee-1394 Lots of this patch is trivial code cleanups (static vars were being intialized to 0, etc). There's also some fixes for ISO transmits (max buffer handling). Aswell, we have a few fixes to disable IRM capabilites correctly. We've also disabled, by default some generally unused EXPORT symbols for the sake of cleanliness in the kernel. However, instead of removing them completely, we felt it necessary to have a config option that allowed them to be enabled for the many projects outside of the main kernel tree that use our API for driver development. The primary reason for this patch is to revert a MODE6->MODE10 RBC conversion patch from the SCSI maintainers. The new conversions handled directly in the scsi layer do not seem to work for SBP2. This patch reverts to our old working code so that users can enjoy using Firewire disks and dvd drives again. We are working with the SCSI maintainers to resolve this issue outside of the main kernel tree. We'll merge the patch once the SCSI layer's handling of the MODE10 conversion is working for us. Signed-off-by: Linus Torvalds commit ec6bced6c7b92904f5ead39c9c1b8dc734e6eff0 Author: Tony Lindgren Date: Sun Jul 10 19:58:20 2005 +0100 [PATCH] ARM: 2803/1: OMAP update 11/11: Add cpufreq support Patch from Tony Lindgren This patch adds minimal cpufreq support for OMAP taking advantage of the clock framework. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit d3b83419117c8f7fd762b488b67393b94fa94762 Author: Tony Lindgren Date: Sun Jul 10 19:58:19 2005 +0100 [PATCH] ARM: 2805/1: OMAP update 10/11: Update H2 defconfig Patch from Tony Lindgren This patch updates H2 defconfig. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit bb13b5fdba16d5b30fe97f3d167bb138b978b71c Author: Tony Lindgren Date: Sun Jul 10 19:58:18 2005 +0100 [PATCH] ARM: 2804/1: OMAP update 9/11: Update OMAP arch files Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific arch files with the linux-omap tree. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit d48af15ea7227d633ddd5002223c2b122b1032e1 Author: Tony Lindgren Date: Sun Jul 10 19:58:17 2005 +0100 [PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch files Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific arch files with the linux-omap tree. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 5e1c5ff4783e0ddd241580c9996390508722190e Author: Tony Lindgren Date: Sun Jul 10 19:58:15 2005 +0100 [PATCH] ARM: 2812/1: OMAP update 7c/11: Move arch-omap to plat-omap Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b91585560b59fd3ef4e20ca6f7d35aefda193774 Author: Tony Lindgren Date: Sun Jul 10 19:58:14 2005 +0100 [PATCH] ARM: 2809/1: OMAP update 7b/11: Move arch-omap to plat-omap Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 60906a8a4e07eb179a2ed90dda23fa36972c6336 Author: Tony Lindgren Date: Sun Jul 10 19:58:13 2005 +0100 [PATCH] ARM: 2807/1: OMAP update 7a/11: Move arch-omap to plat-omap Patch from Tony Lindgren This patch move common OMAP code from arch-omap to plat-omap directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit f577ffd75c02b6087d5bf5ca89f806b10f2a0246 Author: Tony Lindgren Date: Sun Jul 10 19:58:12 2005 +0100 [PATCH] ARM: 2801/1: OMAP update 6/11: Split OMAP1 common code into id, io and serial Patch from Tony Lindgren This patch by Juha Yrjölä and other OMAP developers splits OMAP1 specific common code into OMAP1 id, io, and serial code in mach-omap1 directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit dbdf9cedfcc81202360763530412d746d798b7b6 Author: Tony Lindgren Date: Sun Jul 10 19:58:11 2005 +0100 [PATCH] ARM: 2806/1: OMAP update 5/11: Move board files into mach-omap1 directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 board files into mach-omap1 directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 6f3e14163e066a6f43a54098a12185f25400fd68 Author: Tony Lindgren Date: Sun Jul 10 19:58:10 2005 +0100 [PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 specific LED code into mach-omap1 directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 3b59b6beb423267e8fe2ef3596d98aba0b910341 Author: Tony Lindgren Date: Sun Jul 10 19:58:09 2005 +0100 [PATCH] ARM: 2800/1: OMAP update 3/11: Move OMAP1 core code into mach-omap1 directory Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers moves OMAP1 specific IRQ, time, and FPGA code into mach-omap1 directory. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit b288f75ffa6f26f720d0c69fcd09b4ee7122e17b Author: Tony Lindgren Date: Sun Jul 10 19:58:08 2005 +0100 [PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2 Patch from Tony Lindgren This patch by Paul Mundt and other OMAP developers modifies ARM specific Kconfig to allow sharing code between OMAP1 and OMAP2 architectures. In order to share code between OMAP1 and OMAP2, all OMAP1 specific code is moved into mach-omap1 directory in the following patch. A new mach-omap2 directory will be added later on. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit af973d2aff6008bc7500277eb5a523db579731c6 Author: Tony Lindgren Date: Sun Jul 10 19:58:06 2005 +0100 [PATCH] ARM: 2797/1: OMAP update 1/11: Update include files Patch from Tony Lindgren This patch by various OMAP developers syncs the OMAP specific include files with the linux-omap tree. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 8107338bf9d0367d0b3f42730906b83532b6786f Author: Deepak Saxena Date: Sun Jul 10 19:44:55 2005 +0100 [PATCH] ARM: 2796/1: Fix ARMv5[TEJ] check in MMU initalization Patch from Deepak Saxena The code in mm-armv.c checks for the condition (cpu_architecture()<= ARMv5) in a few places but should be checking for ARMv5TEJ as the MMU is shared across all v5 variations. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 4bebdab7eb11ee533ff843f4f1fec9975666e64e Author: Lennert Buytenhek Date: Sun Jul 10 19:44:54 2005 +0100 [PATCH] ARM: 2795/1: update ixp2000 defconfigs Patch from Lennert Buytenhek Update the ixp2000 defconfigs from 2.6.12-git6 to 2.6.13-rc2. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 28187f2ce39eb2158c35a46696af03cdfd14310a Author: Lennert Buytenhek Date: Sun Jul 10 19:44:53 2005 +0100 [PATCH] ARM: 2793/1: platform serial support for ixp2000 Patch from Lennert Buytenhek This patch converts the ixp2000 serial port over to a platform serial device. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f179bc77d09b9087bfc559d0368bba350342ac76 Author: Dave Airlie Date: Sun Jul 10 12:46:19 2005 +1000 drm: fix stupid missing semicolon. I fixed this in one git tree but that wasn't the one I pushed... Signed-off-by: Dave Airlie commit 0109fd37046de64e8459f8c4f4706df9ac7cc82c Merge: cc14cf46da215a9df1c0a4388763a68769ef9e53 850eb83a6a21b086624b227653ce90ad927ba423 Author: Linus Torvalds Date: Sat Jul 9 09:59:23 2005 -0700 Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 commit cc14cf46da215a9df1c0a4388763a68769ef9e53 Merge: 4cda1fd78781c31e2a3d9dd87ee05d39cb76b3f9 8ca7c1df08210fd35fccf1559837c92baaa4da8f Author: Linus Torvalds Date: Sat Jul 9 09:58:47 2005 -0700 Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 commit 4cda1fd78781c31e2a3d9dd87ee05d39cb76b3f9 Merge: bb6b82381063f54613842decdf948cbfa631842e 717cb906bd43a9ac00631d600adda5c6546843a6 Author: Linus Torvalds Date: Sat Jul 9 09:58:01 2005 -0700 Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 commit bb6b82381063f54613842decdf948cbfa631842e Merge: 79af02c2538d54ff0dcd3f43646f506207f2ee62 a6524813e032fb33bd1de807a98f8453414335e4 Author: Linus Torvalds Date: Sat Jul 9 09:29:09 2005 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 79af02c2538d54ff0dcd3f43646f506207f2ee62 Author: David S. Miller Date: Fri Jul 8 21:47:49 2005 -0700 [SCTP]: Use struct list_head for chunk lists, not sk_buff_head. Signed-off-by: David S. Miller commit 9c05989bb2264f0fa4fc95f81d2c4e6aa2eaa24d Author: David S. Miller Date: Fri Jul 8 21:44:39 2005 -0700 [IPV6]: Fix warning in ip6_mc_msfilter. Signed-off-by: David S. Miller commit 84b42baef775b0e3415ccece17cf694f50326d01 Author: David L Stevens Date: Fri Jul 8 17:48:38 2005 -0700 [IPV4]: fix IPv4 leave-group group matching This patch fixes the multicast group matching for IP_DROP_MEMBERSHIP, similar to the IP_ADD_MEMBERSHIP fix in a prior patch. Groups are identifiedby and including the interface address in the match will fail if a leave-group is done by address when the join was done by index, or if different addresses on the same interface are used in the join and leave. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 9951f036fe8a4e6b21962559c64ff13b290ff01a Author: David L Stevens Date: Fri Jul 8 17:47:28 2005 -0700 [IPV4]: (INCLUDE,empty)/leave-group equivalence for full-state MSF APIs & errno fix 1) Adds (INCLUDE, empty)/leave-group equivalence to the full-state multicast source filter APIs (IPv4 and IPv6) 2) Fixes an incorrect errno in the IPv6 leave-group (ENOENT should be EADDRNOTAVAIL) Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 917f2f105ea4bbba8604e3ed55233eebda7afe6a Author: David L Stevens Date: Fri Jul 8 17:45:16 2005 -0700 [IPV4]: multicast API "join" issues 1) In the full-state API when imsf_numsrc == 0 errno should be "0", but returns EADDRNOTAVAIL 2) An illegal filter mode change errno should be EINVAL, but returns EADDRNOTAVAIL 3) Trying to do an any-source option without IP_ADD_MEMBERSHIP errno should be EINVAL, but returns EADDRNOTAVAIL 4) Adds comments for the less obvious error return values Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 8cdaaa15da58806ac3c75d96c40aef9e31445a25 Author: David L Stevens Date: Fri Jul 8 17:39:23 2005 -0700 [IPV4]: multicast API "join" issues 1) Changes IP_ADD_SOURCE_MEMBERSHIP and MCAST_JOIN_SOURCE_GROUP to ignore EADDRINUSE errors on a "courtesy join" -- prior membership or not is ok for these. 2) Adds "leave group" equivalence of (INCLUDE, empty) filters in the delta-based API. Without this, mixing delta-based API calls that end in an (INCLUDE, empty) filter would not allow a subsequent regular IP_ADD_MEMBERSHIP. It also frees socket buffer memory that isn't needed for both the multicast group record and source filter. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit ca9b907d140a5f249250d19f956129dbbbf84f73 Author: David L Stevens Date: Fri Jul 8 17:38:07 2005 -0700 [IPV4]: multicast API "join" issues This patch corrects a few problems with the IP_ADD_MEMBERSHIP socket option: 1) The existing code makes an attempt at reference counting joins when using the ip_mreqn/imr_ifindex interface. Joining the same group on the same socket is an error, whatever the API. This leads to unexpected results when mixing ip_mreqn by index with ip_mreqn by address, ip_mreq, or other API's. For example, ip_mreq followed by ip_mreqn of the same group will "work" while the same two reversed will not. Fixed to always return EADDRINUSE on a duplicate join and removed the (now unused) reference count in ip_mc_socklist. 2) The group-search list in ip_mc_join_group() is comparing a full ip_mreqn structure and all of it must match for it to find the group. This doesn't correctly match a group that was joined with ip_mreq or ip_mreqn with an address (with or without an index). It also doesn't match groups that are joined by different addresses on the same interface. All of these are the same multicast group, which is identified by group address and interface index. Fixed the check to correctly match groups so we don't get duplicate group entries on the ip_mc_socklist. 3) The old code allocates a multicast address before searching for duplicates requiring it to free in various error cases. This patch moves the allocate until after the search and igmp_max_memberships check, so never a need to allocate, then free an entry. Signed-off-by: David L Stevens Signed-off-by: David S. Miller commit 4c866aa798bc6de0a1d45495229e9f13c35b55c2 Author: Alexey Kuznetsov Date: Fri Jul 8 17:34:46 2005 -0700 [IPV4]: Apply sysctl_icmp_echo_ignore_broadcasts to ICMP_TIMESTAMP as well. This was the full intention of the original code. Signed-off-by: David S. Miller commit a6524813e032fb33bd1de807a98f8453414335e4 Author: David S. Miller Date: Fri Jul 8 15:21:51 2005 -0700 [SPARC64]: Support CONFIG_HZ Signed-off-by: David S. Miller commit 86a76caf8705e3524e15f343f3c4806939a06dc8 Author: Victor Fusco Date: Fri Jul 8 14:57:47 2005 -0700 [NET]: Fix sparse warnings From: Victor Fusco Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco Signed-off-by: Domen Puncer Signed-off-by: David S. Miller commit b03efcfb2180289718991bb984044ce6c5b7d1b0 Author: David S. Miller Date: Fri Jul 8 14:57:23 2005 -0700 [NET]: Transform skb_queue_len() binary tests into skb_queue_empty() This is part of the grand scheme to eliminate the qlen member of skb_queue_head, and subsequently remove the 'list' member of sk_buff. Most users of skb_queue_len() want to know if the queue is empty or not, and that's trivially done with skb_queue_empty() which doesn't use the skb_queue_head->qlen member and instead uses the queue list emptyness as the test. Signed-off-by: David S. Miller commit dcc83a028552ac34538db52d82446d1da6ea8c22 Author: David S. Miller Date: Fri Jul 8 13:33:10 2005 -0700 [SPARC64]: Typo in dtlb_backend.S, _PAGE_SZ4M --> _PAGE_SZ4MB Noticed by Eddie C. Dost Signed-off-by: David S. Miller commit 763b3917e779c9c25d56fc71a796774185cd6ce2 Author: H. J. Lu Date: Fri Jul 8 12:25:00 2005 -0700 [IA64] Fix a typo in arch/ia64/kernel/entry.S Both 2.4 and 2.6 kernels need this patch for the next binutils. Signed-off-by: Tony Luck commit 88c3cdfdde3cf87e1831265ea4246430bef34fc9 Merge: 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 a92b7b80579fe68fe229892815c750f6652eb6a9 Author: Tony Luck Date: Fri Jul 8 08:52:42 2005 -0700 Auto merge with /home/aegl/GIT/linus commit a92b7b80579fe68fe229892815c750f6652eb6a9 Author: Chris Wright Date: Thu Jul 7 18:12:23 2005 -0700 [PATCH] Add MAINTAINERS entry for audit subsystem I've been asked about this a couple times, and there's no info in MAINTAINERS file. Add MAINTAINERS entry for audit subsystem. Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit d88854f08961d26f3a63cfae7972188d26a128e4 Author: Alasdair G Kergon Date: Thu Jul 7 17:59:34 2005 -0700 [PATCH] device-mapper: dm-raid1: Limit bios to size of mirror region Set the target's split_io field when building a dm-mirror device so incoming bios won't span the mirror's internal regions. Without this, regions can be accessed while not holding correct locks and data corruption is possible. Reported-By: "Zhao Qian" From: Kevin Corry Signed-Off-By: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 374a6cf281771b23e263efd31fdc896924394dba Author: Pavel Machek Date: Thu Jul 7 17:59:33 2005 -0700 [PATCH] video doc: one more system where video works with S3 One more system where video works with S3. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 316240f66a64c95e373d52dc401d882d77a594ee Author: Hirokazu Takata Date: Thu Jul 7 17:59:32 2005 -0700 [PATCH] m32r: framebuffer device support This patch is for supporting Epson s1d13xxx framebuffer device for m32r. # Sorry, a little bigger. The Epson s1d13806 is already supported by 2.6.12 kernel, and its driver is placed as drivers/video/s1d13xxxfb.c. For the m32r, a header file include/asm-m32r/s1d13806.h was prepared for several m32r target platforms. It was originally generated by an Epson tool S1D13806CFG.EXE, and modified manually for the m32r platforms. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e34ac862ee6644378bfe6ea65c2e0dda4545513d Author: NeilBrown Date: Thu Jul 7 17:59:30 2005 -0700 [PATCH] nfsd4: fix fh_expire_type After discussion at the recent NFSv4 bake-a-thon, I realized that my assumption that NFS4_FH_PERSISTENT required filehandles to persist was a misreading of the spec. This also fixes an interoperability problem with the Solaris client. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c4cd222ee329025840bc2f8cebf71d36c62440c Author: NeilBrown Date: Thu Jul 7 17:59:27 2005 -0700 [PATCH] nfsd4: check lock type against openmode. We shouldn't be allowing, e.g., write locks on files not open for read. To enforce this, we add a pointer from the lock stateid back to the open stateid it came from, so that the check will continue to be correct even after the open is upgraded or downgraded. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a4f98bbf481cb9f755005ac569ceb5303e1b69f Author: NeilBrown Date: Thu Jul 7 17:59:26 2005 -0700 [PATCH] nfsd4: clean up nfs4_preprocess_seqid_op As long as we're here, do some miscellaneous cleanup. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f8816512fcfde986326a2eb0f5a58e463d9904d8 Author: NeilBrown Date: Thu Jul 7 17:59:25 2005 -0700 [PATCH] nfsd4: clarify close_lru handling The handling of close_lru in preprocess_stateid_op was a source of some confusion here recently. Try to make the logic a little clearer, by renaming find_openstateowner_id to make its purpose clearer and untangling some unnecessarily complicated goto's. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52fd004e296ac07cde820af9e3139d47dda03cf8 Author: NeilBrown Date: Thu Jul 7 17:59:24 2005 -0700 [PATCH] nfsd4: renew lease on seqid modifying operations nfs4_preprocess_seqid_op is called by NFSv4 operations that imply an implicit renewal of the client lease. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b700949b781480819e53bdc38a53f053226dd75e Author: NeilBrown Date: Thu Jul 7 17:59:23 2005 -0700 [PATCH] nfsd4: return better error on io incompatible with open mode from RFC 3530: "Share reservations are established by OPEN operations and by their nature are mandatory in that when the OPEN denies READ or WRITE operations, that denial results in such operations being rejected with error NFS4ERR_LOCKED." (Note that share_denied is really only a legal error for OPEN.) Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 444c2c07c2d7a6936d1381d381ab80e3f5541427 Author: NeilBrown Date: Thu Jul 7 17:59:22 2005 -0700 [PATCH] nfsd4: always update stateid on open An OPEN from the same client/open stateowner requires a stateid update because of the share/deny access update. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e66770cd7b0c36f28a2f6eb0957c0575ac8b3787 Author: NeilBrown Date: Thu Jul 7 17:59:21 2005 -0700 [PATCH] nfsd4: relax new lock seqid check We're insisting that the lock sequence id field passed in the open_to_lockowner struct always be zero. This is probably thanks to the sentence in rfc3530: "The first request issued for any given lock_owner is issued with a sequence number of zero." But there doesn't seem to be any problem with allowing initial sequence numbers other than zero. And currently this is causing lock reclaims from the Linux client to fail. In the spirit of "be liberal in what you accept, conservative in what you send", we'll relax the check (and patch the Linux client as well). Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fb64cee34f5dc743f697041717cafda8a94b5ac Author: NeilBrown Date: Thu Jul 7 17:59:20 2005 -0700 [PATCH] nfsd4: seqid comments Add some comments on the use of so_seqid, in an attempt to avoid some of the confusion outlined in the previous patch.... Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd9aac523b812d58e644fde5e59f5697fb9e3822 Author: NeilBrown Date: Thu Jul 7 17:59:19 2005 -0700 [PATCH] nfsd4: fix open_reclaim seqid The sequence number we store in the sequence id is the last one we received from the client. So on the next operation we'll check that the client gives us the next higher number. We increment sequence id's at the last moment, in encode, so that we're sure of knowing the right error return. (The decision to increment the sequence id depends on the exact error returned.) However on the *first* use of a sequence number, if we set the sequence number to the one received from the client and then let the increment happen on encode, we'll be left with a sequence number one to high. For that reason, ENCODE_SEQID_OP_TAIL only increments the sequence id on *confirmed* stateowners. This creates a problem for open reclaims, which are confirmed on first use. Therefore the open reclaim code, as a special exception, *decrements* the sequence id, cancelling out the undesired increment on encode. But this prevents the sequence id from ever being incremented in the case where multiple reclaims are sent with the same openowner. Yuch! We could add another exception to the open reclaim code, decrementing the sequence id only if this is the first use of the open owner. But it's simpler by far to modify the meaning of the op_seqid field: instead of representing the previous value sent by the client, we take op_seqid, after encoding, to represent the *next* sequence id that we expect from the client. This eliminates the need for special-case handling of the first use of a stateowner. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 893f87701c9e5bd5610dfbb3f8bf1135f86d85cb Author: NeilBrown Date: Thu Jul 7 17:59:17 2005 -0700 [PATCH] nfsd4: comment indentation Yeah, it's trivial, but this drives me up the wall.... Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 375151773125f56b7f6d798d914ea469256b330b Author: NeilBrown Date: Thu Jul 7 17:59:16 2005 -0700 [PATCH] nfsd4: stop overusing RECLAIM_BAD A misreading of the spec lead us to convert all errors on open and lock reclaims to RECLAIM_BAD. This causes problems--for example, a reboot within the grace period could lead to reclaims with stale stateid's, and we'd like to return STALE errors in those cases. What rfc3530 actually says about RECLAIM_BAD: "The reclaim provided by the client does not match any of the server's state consistency checks and is bad." I'm assuming that "state consistency checks" refers to checks for consistency with the state recorded to stable storage, and that the error should be reserved for that case. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dd395dc76071a06eea39839cc946c1241af3650 Author: NeilBrown Date: Thu Jul 7 17:59:15 2005 -0700 [PATCH] nfsd4: ERR_GRACE should bump seqid on lock A GRACE or NOGRACE response to a lock request should also bump the sequence id. So we delay the handling of grace period errors till after we've found the relevant owner. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b648330a1d741d5df8a5076b2a0a2519c69c8f41 Author: NeilBrown Date: Thu Jul 7 17:59:15 2005 -0700 [PATCH] nfsd4: ERR_GRACE should bump seqid on open The GRACE and NOGRACE errors should bump the sequence id on open. So we delay the handling of these errors until nfsd4_process_open2, at which point we've set the open owner, so the encode routine will be able to bump the sequence id. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fa822e452084032b8495ca0d8e0199329847815 Author: NeilBrown Date: Thu Jul 7 17:59:14 2005 -0700 [PATCH] nfsd4: fix release_lockowner We oops in list_for_each_entry(), because release_stateowner frees something on the list we're traversing. Signed-off-by: Andy Adamson Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67be431350941765e211eeed237c12def3aaba70 Author: NeilBrown Date: Thu Jul 7 17:59:13 2005 -0700 [PATCH] nfsd4: prevent multiple unlinks of recovery directories Make sure we don't try to delete client recovery directories multiple times; fixes some spurious error messages. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdc5524e8a257b1c91dd8e4cdfbab979f4e17a60 Author: NeilBrown Date: Thu Jul 7 17:59:12 2005 -0700 [PATCH] nfsd4: lookup_one_len takes i_sem Oops, this lookup_one_len needs the i_sem. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6ccbbb8865101d83c2e716f08feae1da1c48584 Author: NeilBrown Date: Thu Jul 7 17:59:11 2005 -0700 [PATCH] nfsd4: fix sync'ing of recovery directory We need to fsync the recovery directory after writing to it, but we weren't doing this correctly. (For example, we weren't taking the i_sem when calling ->fsync().) Just reuse the existing nfsd fsync code instead. Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 463090294e1e460cf97f5ade376d4b1e62bc5263 Author: NeilBrown Date: Thu Jul 7 17:59:10 2005 -0700 [PATCH] nfsd4: reboot recovery fix We need to remove the recovery directory here too. (This chunk just got lost somehow in the process of commuting the reboot recovery patches past the other patches.) Signed-off-by: J. Bruce Fields Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89b39f5d8d701ddd93546b3d8edbefa5d568529d Author: Dominik Brodowski Date: Thu Jul 7 17:59:09 2005 -0700 [PATCH] yenta: don't depend on CardBus As a follow-up, we can allow the yenta-driver to be limited to PCMCIA operation. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5bc6b68a103a6f4055890b5127ddca3a322751b0 Author: Russell King Date: Thu Jul 7 17:59:07 2005 -0700 [PATCH] yenta: no CardBus if IRQ fails If probing for the correct interrupt fails on yenta bridges, the driver falls back to polling for interrupt actions. However, CardBus cards cannot be used then. Signed-off-by: Russell King Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4230dfc9c3f708f4765736b862aa313aa97e3c2e Author: Dominik Brodowski Date: Thu Jul 7 17:59:06 2005 -0700 [PATCH] pcmcia: update MAINTAINERS entry PCMCIA/CardBus is handled by a team of developers at the specified mailing list. Additional developers wanting to help are most welcome. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 44670d2b50efd2443c3810239d6ea3fd02f8ef64 Author: Dominik Brodowski Date: Thu Jul 7 17:59:05 2005 -0700 [PATCH] pcmcia: remove references to pcmcia/version.h As a follow-up, remove the inclusion of pcmcia/version.h in many files. Signed-off-by: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ffe6e280f792790c39f241e7e3c5d2ef8da1b94 Author: Pavel Roskin Date: Thu Jul 7 17:59:04 2005 -0700 [PATCH] pcmcia: remove client services version (fix) One correction is needed. Changes are not needed for drivers/scsi/pcmcia/nsp_cs.c because it uses versioning in the compatibility part, which is never used in 2.6 kernels. The only right thing we could to that compatibility code would be to remove it throughout the file, but that would be a separate patch. Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-o