ChangeSet@1.1750, 2004-03-16 20:53:43-08:00, ak@suse.de [PATCH] Fix memory corruption on hyperthreaded x86-64 machines Fix memory corruption in the HT init on x86-64 recently introduced by me. Fix from from Suresh B. Siddha. ChangeSet@1.1749, 2004-03-16 20:53:34-08:00, chyang@clusterfs.com [PATCH] Make intermezzo work again - Chen Yang's fix to work with NGROUPS - Chen Yang's fix to handle file deletion - Remove TCGETS handling and return -ENOTTY for unknown ioctl code. - Removed InterMezzo from BROKEN state ChangeSet@1.1748, 2004-03-16 18:54:46-08:00, anton@samba.org [PATCH] fix ppc rtas compile The proc_rtas_init call in procfs was removed (replaced with an initcall) but the prototype was still hiding. Kill it. ChangeSet@1.1747, 2004-03-16 16:47:04-08:00, B.Zolnierkiewicz@elka.pw.edu.pl [PATCH] hpt366.c: DMA timeout fix for HPT374 From: Andre Hedrick Tested on Epox 8K9A3+ and 4PCA3+ by Tomi Orava . ChangeSet@1.1746, 2004-03-16 16:46:50-08:00, B.Zolnierkiewicz@elka.pw.edu.pl [PATCH] ATI IXP IDE support It was tested by a few people and has been in -mm since 2.6.4-rc2-mm1. ChangeSet@1.1745, 2004-03-16 16:46:39-08:00, B.Zolnierkiewicz@elka.pw.edu.pl [PATCH] remove dead "hdXlun=" kernel parameter ChangeSet@1.1744, 2004-03-16 16:46:25-08:00, B.Zolnierkiewicz@elka.pw.edu.pl [PATCH] ide-scsi.c: fix ATAPI multi-lun support ATAPI multi-lun support has been broken for a long time. It used to be that "(drive->id->last_id & 0x7) + 1" was used as shost->max_lun and the "hdXlun=" kernel parameter could be used to override this value. However it was far from optimal: - people played with "hdXlun=" and then complained about multiple instances of the same device (most ATAPI drives respond to each LUN) - probably some devices return 7 not 0 in id->last_id (=> 7 x same device) This patch from Willem Riede fixes it w/o need for "hdXlun=" option. It was tested by Willem on ATAPI PD/CD drive. ChangeSet@1.1743, 2004-03-16 16:38:36-08:00, rusty@rustcorp.com.au [PATCH] wait_task_inactive should not return on preempt wait_task_inactive is now only used in two non-time-critical places: the ptrace code to guarantee a schedule and kthread_bind so we can change the thread CPU. Unfortunately with preempt, the code as stands has a race: we might return because the thread is preempted, not because it actually reached schedule(). The ptrace code (probably) doesn't care, but the kthread code does. This patch simplifies the (now over-optimized) code, and does a yield() for the preemption case. ChangeSet@1.1742, 2004-03-16 14:57:47-08:00, greg@kroah.com Merge kroah.com:/home/greg/linux/BK/bleed-2.6 into kroah.com:/home/greg/linux/BK/usb-2.6 ChangeSet@1.1741, 2004-03-16 14:44:49-08:00, katzj@redhat.com [PATCH] Fix blkpg ioctl32 handling Simple obvious patch so that all calls to blkpg from the non-native environment don't get -EINVAL ChangeSet@1.1733.1.2, 2004-03-16 16:02:01-05:00, jgarzik@redhat.com [blk carmel] call del_gendisk(), if disk is 'up', at cleanup time ChangeSet@1.1735.2.1, 2004-03-16 12:44:45-08:00, torvalds@ppc970.osdl.org Remove bogus linux/irq.h include that fails build on ARM. Verified to not break anything on x86 either. ChangeSet@1.1733.3.1, 2004-03-16 15:15:18-05:00, jgarzik@redhat.com [netdrvr natsemi] Fix RX DMA mapping RX skbs are always considered maximally sized, until actual reception of the RX frame occurs. So, update this driver to always map and unmap a maximally sized skb. This fixes this driver on several non-x86 platforms. ChangeSet@1.1736, 2004-03-16 14:02:51-06:00, shaggy@austin.ibm.com JFS: zero new log pages, etc. ChangeSet@1.1733.2.2, 2004-03-16 11:28:52-08:00, greg@kroah.com [PATCH] USB: replace kobject with kref in usb-serial core. This saves some memory and is easier to understand what is happening. ChangeSet@1.1665.1.1, 2004-03-16 10:22:41-08:00, bjorn_helgaas@hp.com [PATCH] ia64: fix up DMA API breakage in generic build We also need the following patch to build the generic_defconfig after the DMA API change: http://linux.bkbits.net:8080/linux-2.5/cset@405490e15inT3T0H2x887j9SaMkYRQ ChangeSet@1.1733.2.1, 2004-03-16 10:14:07-08:00, greg@kroah.com Merge kroah.com:/home/linux/BK/bleed-2.6 into kroah.com:/home/linux/BK/usb-2.6 ChangeSet@1.1733.1.1, 2004-03-16 12:30:29-05:00, jgarzik@redhat.com [blk carmel] add copyright statement and license mention ChangeSet@1.1734, 2004-03-16 08:07:17-08:00, torvalds@ppc970.osdl.org Merge bk://kernel.bkbits.net/vojtech/input into ppc970.osdl.org:/home/torvalds/v2.5/linux ChangeSet@1.1733, 2004-03-16 07:51:27-08:00, axboe@suse.de [PATCH] allow random write to cdrom devices with profile 2 (removable disk) This patch is from Iomega, and it allows random write opens of CDROM's that support the feature. ChangeSet@1.1732, 2004-03-16 07:29:37-08:00, akpm@osdl.org [PATCH] ppc64: fix for massive OF properties From: Anton Blanchard We have some versions of firmware out there that have huge OF properties. So huge that we end up overwriting our initrd. Place a 1MB limit and warn bitterly if its over this. Also fix a use of package-to-path where the variable was 64bytes but we would pass in a length of 255. ChangeSet@1.1731, 2004-03-16 07:29:25-08:00, akpm@osdl.org [PATCH] ppc64 defconfig update From: Anton Blanchard ppc64 defconfig update ChangeSet@1.1730, 2004-03-16 07:29:15-08:00, akpm@osdl.org [PATCH] Fix hvc console sleep in spinlock bug From: Jeremy Kerr This patch fixes the sleep in spinlock hvc bug in hvc_write(). The code is a little longer, but protects against large amounts of memory being kmalloc()ed by userspace, and minimises calls to copy_from_user(). ChangeSet@1.1729, 2004-03-16 07:29:03-08:00, akpm@osdl.org [PATCH] Clean up xmon backtrace code. From: Anton Blanchard Clean up xmon backtrace code, it was doing all manner of scary things. ChangeSet@1.1728, 2004-03-16 07:28:51-08:00, akpm@osdl.org [PATCH] Cleanup ppc64 procfs code From: Anton Blanchard Cleanup ppc64 procfs code: - Use initcalls everywhere. This allowed us to remove the iseries proc callback interface. - Kill proc_pmc.c. Most of it wasnt used (and we are planning to export the PMCs via sysfs). The few things left were iseries specific so they got moved into iSeries_proc.c. - Kill pmc.c. We dont use those statistics and the ones that are left can be gained via PMCs. - Create /proc/iSeries and /proc/ppc64 very early. This means we no longer have to call proc_ppc64_init in all the drivers, we can assume its there. - Fix some error return cases in rtas-proc.c and rtas-flash - Dont even try some pseries specific drivers on pmac. ChangeSet@1.1727, 2004-03-16 07:28:37-08:00, akpm@osdl.org [PATCH] Add kernel version to oops. From: Anton Blanchard Add kernel version to oops. ChangeSet@1.1726, 2004-03-16 07:28:25-08:00, akpm@osdl.org [PATCH] Fixed NULL ptr deref in RTAS syscall ppc_rtas() From: John Rose Fixed NULL ptr deref in RTAS syscall ppc_rtas() ChangeSet@1.1725, 2004-03-16 07:28:13-08:00, akpm@osdl.org [PATCH] Added rtas_set_power_level() From: John Rose Added rtas_set_power_level() ChangeSet@1.1724, 2004-03-16 07:28:03-08:00, akpm@osdl.org [PATCH] Remove pci DMA exports From: Anton Blanchard Remove pci DMA exports we now access them via inline functions that operate on pci_dma_ops. ChangeSet@1.1723, 2004-03-16 07:27:52-08:00, akpm@osdl.org [PATCH] Dont enable interrupts during interrupt processing on iseries From: Stephen Rothwell Dont enable interrupts during interrupt processing on iseries ChangeSet@1.1722, 2004-03-16 07:27:40-08:00, akpm@osdl.org [PATCH] Add slow path lookup in xics_get_irq From: Jake Moilanen In xics_get_irq(), for a real-to-virt irq lookup, go down the slowpath by looking through the entire virt_irq_to_real_map array if take a miss on the radix tree. This is possible, when an interrupt is taken before the driver has called request_irq() (eg IDE). ChangeSet@1.1721, 2004-03-16 07:27:28-08:00, akpm@osdl.org [PATCH] Export find_next_bit From: Anton Blanchard - export find_next_bit and move the other exports here - fix a few minor style issues ChangeSet@1.1720, 2004-03-16 07:27:18-08:00, akpm@osdl.org [PATCH] update iseries default target From: Anton Blanchard update iseries default target ChangeSet@1.1719, 2004-03-16 07:27:05-08:00, akpm@osdl.org [PATCH] Move iSeries specific EXPORT_SYMBOLs out of ppc_ksyms.c From: Stephen Rothwell After this the only iSeries specific EXPORT_SYMBOLS in ppc_ksyms.c are the assembler ones ... ChangeSet@1.1718, 2004-03-16 07:26:54-08:00, akpm@osdl.org [PATCH] Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h From: Dave Boutcher Add some functions to make vio.h consistant with pci_dma.h and dma_mapping.h ChangeSet@1.1717, 2004-03-16 07:26:41-08:00, akpm@osdl.org [PATCH] Fix xics IRQ affinity From: Anton Blanchard - Merge some whitespace differences with the ameslab tree - We check for CPU_MASK_ALL in xics to send irqs to all cpus. In some cases CPU_MASK_ALL is smaller than the cpumask (eg NR_CPUS == 32 and cpumask is a long), so we mask it here to be consistent. ChangeSet@1.1716, 2004-03-16 07:26:29-08:00, akpm@osdl.org [PATCH] Fix multiple EEH-related bugs From: Linas Vepstas This patch fixes multiple EEH-related bugs: - Fixes the eeh_check_failure() usage in an interrupt context. This routine is now safe to use in an interrupt. The fix was to build a cache of IO addresses and check that, instead of using the pci routines. - Merges in Olof Johansson's sizeof patch when checking for failure - Adds EEH tests to array/string reads - Fixes bugs with address resolution (some i/o addresses were handled incorrectly, resulting in EEH errors slipping by undetected.) - Adds EEH support to the PCI Hotplug system (so that devices that get added/removed get properly registered with the EEH subsystem.) - Fixes improper use of /proc filesystem. - Adds some misc statistics. While merging Linas' patch I also converted the proc usage to seq_single, used per cpu variables for the stats and removed the eeh-force-off option. ChangeSet@1.1715, 2004-03-16 07:26:19-08:00, akpm@osdl.org [PATCH] Fix for hotplug of multifunction cards. From: Linda Xie The changes in this patch are for multifunction cards insertions/removals and bug fixes: 1. fix up new nodes' linux_phandle field. 2. new nodes' phb, devfn(and so on) need to be fixed even the nodes don't have "interrupts". 3. change of_remove_node to non-recurisve func. The recursions will be done by the caller. 4. add a new function -- of_finish_dynamic_node_interrupts() ChangeSet@1.1714, 2004-03-16 07:26:08-08:00, akpm@osdl.org [PATCH] Add some missing EXPORT_SYMBOLs From: Anton Blanchard Add some missing EXPORT_SYMBOLs ChangeSet@1.1713, 2004-03-16 07:25:57-08:00, akpm@osdl.org [PATCH] Handle longbusy return codes in IBM VETH driver From: Santiago Leon Handle longbusy return codes in IBM VETH driver ChangeSet@1.1712, 2004-03-16 07:25:46-08:00, akpm@osdl.org [PATCH] Add hypervisor busy return codes From: Dave Boutcher Add hypervisor busy return codes ChangeSet@1.1711, 2004-03-16 07:25:35-08:00, akpm@osdl.org [PATCH] Make dma API handle PCI and VIO From: Stephen Rothwell Make dma API handle PCI and VIO ChangeSet@1.1710, 2004-03-16 07:25:22-08:00, akpm@osdl.org [PATCH] Remove some unused ppc64 variables From: Anton Blanchard Remove some unused ppc64 variables ChangeSet@1.1709, 2004-03-16 07:25:10-08:00, akpm@osdl.org [PATCH] Remove bogus sys_oldumount sign extension code From: Anton Blanchard Remove bogus sys_oldumount sign extension code. We were sign extending the flags argument which doesnt make sense. ChangeSet@1.1708, 2004-03-16 07:24:59-08:00, akpm@osdl.org [PATCH] Reduce stack overflow check to 4096 bytes From: Anton Blanchard Reduce stack overflow check to 4096 bytes free, we were tripping it too much at 8192. ChangeSet@1.1707, 2004-03-16 07:22:49-08:00, akpm@osdl.org [PATCH] iostats averaging fix From: Rick Lindsley Fix bug #2230. I've corresponded with the submitter and he did find a real bug -- when we were merging I/O requests we didn't always take the oldest request start time, which would cause a couple of the calculations like wait time and average queue size to be too small. He found it mathematically but having done so, I think logic and inspection makes it easy to verify. ChangeSet@1.1706, 2004-03-16 07:22:38-08:00, akpm@osdl.org [PATCH] blk: statically initialise the congestion waitqueue_heads On a really small memory machine (or one with a monstrous kernel memory leak) we can end up calling blk_congestion_wait() before the waitqueue_heads are set up. ChangeSet@1.1705, 2004-03-16 07:22:26-08:00, akpm@osdl.org [PATCH] kill INIT_THREAD_SIZE From: Matt Mackall This piece of the THREAD_SIZE cleanup got dropped. If you make THREAD_SIZE > 8k, the init thread overlaps the .init section and gets smashed. I've gone ahead and killed INIT_THREAD_SIZE throughout as it wasn't doing much. This also saves 4k when we use 4k stacks. Please apply. Couple more minor pieces remaining. ChangeSet@1.1704, 2004-03-16 07:22:15-08:00, akpm@osdl.org [PATCH] kthreads hold files open keventd and friends are currently holding /dev/console open three times. It's all inherited from init. Steal the relevant parts of daemonize() to fix that up. ChangeSet@1.1703, 2004-03-16 07:22:03-08:00, akpm@osdl.org [PATCH] slab: fix display of object length in corruption detector From: Manfred Spraul print_objinfo() dumps the first few characters of an interesting object for debugging. It used the wrong object len (including debug padding, instead of just the data area), which could cause an oops if DEBUG_PAGEALLOC is enabled. ChangeSet@1.1702, 2004-03-16 07:21:52-08:00, akpm@osdl.org [PATCH] document unchecked do_munmaps in ipc/shm.c From: Manfred Spraul There are a few unchecked do_munmap()s in the shm code. Manfred's comment explains why they are OK. ChangeSet@1.1701, 2004-03-16 07:21:39-08:00, akpm@osdl.org [PATCH] do_write_mem() return value check From: BlaisorBlade , and me - remove unused `file *' arg from do_write_mem() - Add checking for copy_from_user() failures in do_write_mem() - Return correct value from kmem writes() when a fault is encountered. A write()-style syscall's return values are: 0 when nothing was written and there was no error (someone tried to write zero bytes) >0: the number of bytes copied, whether or not there was an error. Userspace detects errors by noting that the write() return value is less than was requested. <0: there was an error and no bytes were copied ChangeSet@1.1700, 2004-03-16 07:21:28-08:00, akpm@osdl.org [PATCH] resierfs: AIO support From: Chris Mason reiserfs can safely use the generic fs aio functions. ChangeSet@1.1699, 2004-03-16 07:21:18-08:00, akpm@osdl.org [PATCH] reiserfs: atomicity fix From: Chris Mason reiserfs_file_write() can use stale metadata after a schedule. Two reiserfs_file_write bugs, where items can change during a schedule. ChangeSet@1.1698, 2004-03-16 07:21:05-08:00, akpm@osdl.org [PATCH] reiserfs: fix transaction sizes From: Chris Mason Make sure reiserfs uses a reasonable number when restarting long unbounded transactions (creating holes or deleting files). Without this patch, the number of blocks requested grows with each transaction restart, until it hits MAX_BATCH_COUNT and starts forcing commits with every new transaction. Oleg Drokin tracked this bug down ChangeSet@1.1697, 2004-03-16 07:20:54-08:00, akpm@osdl.org [PATCH] reiserfs: search_by_key fix From: Chris Mason Fix a bug in reiserfs search_by_key call, where it might not properly detect a change in tree height during a schedule. Originally from vs@namesys.com ChangeSet@1.1696, 2004-03-16 07:20:41-08:00, akpm@osdl.org [PATCH] resierfs: scheduling latency improvements From: Chris Mason Add conditional schedules to reiserfs to help lower latencies. Bits of this orginated long ago in code akpm sent me. ChangeSet@1.1695, 2004-03-16 07:20:29-08:00, akpm@osdl.org [PATCH] reiserfs: fix null pointer deref From: Chris Mason From: Jeff Mahoney fsstress manages to setup a sequence of events that allow an attempt to perform direct-io on a tail. bh_result->b_page == NULL, which causes the PageLocked and PageWriteback checks to perform a NULL deref, causing the oops. ChangeSet@1.1694, 2004-03-16 07:20:17-08:00, akpm@osdl.org [PATCH] kernel-doc build fix From: Michael Still This is needed to get any of the SGML documentation to build with 2.6.4. ChangeSet@1.1693, 2004-03-16 07:20:05-08:00, akpm@osdl.org [PATCH] fbdev: character drawing enhancement. From: James Simmons This patch merges two of the drawing functions. The patch uses aligned transfers when possible even on displays where the characters are not byte align. Tested on my my laptop for 12 bit width fonts and 8 bit wide fonts. It works very nicely. ChangeSet@1.1692, 2004-03-16 07:19:52-08:00, akpm@osdl.org [PATCH] page_referenced() simplification There's no point in calling mark_page_accessed() here. The page is never on the LRU so all mark_page_accessed() will do is to set PG_referenced, which we immediately clear again. ChangeSet@1.1691, 2004-03-16 07:19:41-08:00, akpm@osdl.org [PATCH] flush_workqueue(): detect excessive nesting Add a debug check for workqueues nested more than three deep via the direct-run-workqueue() path. ChangeSet@1.1690, 2004-03-16 07:19:29-08:00, akpm@osdl.org [PATCH] flush_scheduled_work() deadlock fix Because keventd is a resource which is shared between unrelated parts of the kernel it is possible for one person's workqueue handler to accidentally call another person's flush_scheduled_work(). thockin managed it by calling mntput() from a workqueue handler. It deadlocks. It's simple enough to fix: teach flush_scheduled_work() to go direct when it discovers that the calling thread is the one which should be running the work. Note that this can cause recursion. The depth of that recursion is equal to the number of currently-queued works which themselves want to call flush_scheduled_work(). If this ever exceeds three I'll eat my hat. ChangeSet@1.1689, 2004-03-16 07:19:18-08:00, akpm@osdl.org [PATCH] selinux: fix compute_av bug From: Stephen Smalley This patch fixes a bug in the SELinux compute_av code; the current code yields the right access computation but can cause unnecessary (but harmless) processing to occur when transition permission wasn't granted in the first place by the TE configuration. Thanks to Chad Hanson of TCS for reporting the bug. ChangeSet@1.1688, 2004-03-16 07:19:07-08:00, akpm@osdl.org [PATCH] kbuild: fix modpost when used with O= From: Sam Ravnborg modpost or to be more specific sumversion.c was not behaving correct when used with O= and MODULE_VERSION was used. Previously it failed to use local .h when calculation the md-sum in case of a O= build. The following patch introduces the following: - A generic get_next_line() - Check that the topmost part of the directory matches - Using strrch when checking for file with suffix .o - Use NOFAIL for allocations in sumversion - Avoid memory leak in new_module The generic get_next_line will pay off when Andreas implmentation of storing symbol addresses in a seperate file is introduced. ChangeSet@1.1687, 2004-03-16 07:18:55-08:00, akpm@osdl.org [PATCH] fix modular fb drivers From: Arnd Bergmann The recent "fbdev: monitor detection fixes" patch broke modular frame buffer drivers. ChangeSet@1.1686, 2004-03-16 07:18:45-08:00, akpm@osdl.org [PATCH] move PCIBIOS access help text From: "Randy.Dunlap" Moves PCI BIOS Access Mode help text to its top level instead of under PCI_GOBIOS (which is only 1 of 4 possible choices). ChangeSet@1.1685, 2004-03-16 07:18:33-08:00, akpm@osdl.org [PATCH] drivers_cdrom_cdu31c.c check_region() fix From: check_region() fixes. ChangeSet@1.1684, 2004-03-16 07:18:22-08:00, akpm@osdl.org [PATCH] add warning to DocBook/Makefile From: Trivial Patch Monkey From: maximilian attems Print something friendlier than: /bin/sh: fig2dev: command not found make[1]: *** [Documentation/DocBook/parport-share.eps] Error 127 make: *** [pdfdocs] Error 2 ChangeSet@1.1683, 2004-03-16 07:18:09-08:00, akpm@osdl.org [PATCH] Fix comment in drivers/block/genhd.c From: Trivial Patch Monkey From: a.othieno@bluewin.ch (Arthur Othieno) add_gendisk() was replaced with add_disk(), but the comment suggests otherwise. Breaks `make *docs'. ChangeSet@1.1682, 2004-03-16 07:17:58-08:00, akpm@osdl.org [PATCH] minor credits updates From: Trivial Patch Monkey From: andersen@codepoet.org I've moved... This patch updates my contact info. ChangeSet@1.1681, 2004-03-16 07:17:48-08:00, akpm@osdl.org [PATCH] chardev module aliases From: Trivial Patch Monkey From: Steve Youngs Add module aliases for 21285, amba, anakin, clps711x, mux, and sa1100 serial drivers. ChangeSet@1.1680, 2004-03-16 07:17:35-08:00, akpm@osdl.org [PATCH] Fix scripts/ver_linux From: Trivial Patch Monkey From: Thomas Molina ver_linux hasn't displayed binutils version right for some time. This patch corrects that and preserves the old behaviour as well, as suggested by Rusty. ChangeSet@1.1679, 2004-03-16 07:17:23-08:00, akpm@osdl.org [PATCH] fix for kallsyms module symbol resolution problem From: Rusty Russell Fix a problem with kallsyms being unable to look up symbols which are in modules. add_kallsyms should be above module_finalize, which means you can just use the mod->symtab and mod->strtab members. ChangeSet@1.1678, 2004-03-16 07:17:12-08:00, akpm@osdl.org [PATCH] filemap.c comment fix From: Trivial Patch Monkey From: Carl Spalletta ChangeSet@1.1677, 2004-03-16 07:17:01-08:00, akpm@osdl.org [PATCH] rename one of the acpi_disable() instances From: Trivial Patch Monkey From: Pavel Machek There's acpi_disable somewhere in the acpi interpreter (it disables interrupts, iirc). Thus blacklisting function needs better name. ChangeSet@1.1676, 2004-03-16 07:16:48-08:00, akpm@osdl.org [PATCH] drivers_cdrom_sjcd.c check_region() fix From: Trivial Patch Monkey From: Omkhar Arasaratnam ChangeSet@1.1675, 2004-03-16 07:16:38-08:00, akpm@osdl.org [PATCH] Document tricks to get S3_swsusp working From: Trivial Patch Monkey From: Pavel Machek I was sending this to users that had problems with swsusp, then lost it. It would be nice to have it directly in the tree. ChangeSet@1.1674, 2004-03-16 07:16:27-08:00, akpm@osdl.org [PATCH] ACPI: document acpi_sleep option From: Trivial Patch Monkey From: Pavel Machek acpi_sleep option should be documented. ChangeSet@1.1673, 2004-03-16 07:16:15-08:00, akpm@osdl.org [PATCH] drivers_cdrom_cm206.c check_region() fix From: Trivial Patch Monkey From: Omkhar Arasaratnam check_region() fix ChangeSet@1.1672, 2004-03-16 07:16:02-08:00, akpm@osdl.org [PATCH] ide-scsi error handling fixes From: Willem Riede The patch revises the error handling in ide-scsi, fixing the scheduling while locked issues, and make it work properly, at least for me... Specific changes in this patch: - introduce idescsi_expiry, a timeout routine for the ide subsystem, which simply flags the fact that the command timed out, but postpones any other action until either the command still finishes on its own (unlikely?) or the scsi error handler kicks in; - introduce idescsi_atapi_error and idescsi_atapi_abort, error routines for the ide subsystem, which are modeled after those of ide-cd, but take only minimal effort to recover, leaving the heavy lifting for the scsi error handler; - rewrite (and rename for clarity) idescsi_eh_abort and idescsi_eh_error, the abort/error routines to be called by the scsi error handler -- this redesign should not have the scheduling while atomic problems of the old implementation. - move ide_cdrom_dump_status() from ide-cd.c to ide-lib.c as ide_dump_atapi_status() and both ide-cd and ide-scsi call it. - replaces BUG() by WARN_ON()/printk in the error handling code. - sets TASK_UNINTERRUPTIBLE before schedule_timeout() and moves the host unlock/lock around the while loop inside the loop in idescsi_eh_reset(). ChangeSet@1.1671, 2004-03-16 07:15:51-08:00, akpm@osdl.org [PATCH] selinux: Conditional policy extension and MLS detection support From: Stephen Smalley This patch extends the SELinux policy engine to support conditional policy logic based on a set of policy booleans, allowing well-formed changes to the policy to be defined within and mediated by the policy itself. The conditional policy extensions were implemented and contributed by Tresys Technology. Userland packages that support these extensions are already available from nsa.gov/selinux, and backward compatibility is provided for the prior policy version. The patch also includes a small change to enable detection of the optional MLS policy model on a SELinux system and fixes to the conditional policy extensions to allow the MLS policy to work correctly with them that were implemented and contributed by Trusted Computer Solutions. ChangeSet@1.1670, 2004-03-16 07:15:39-08:00, akpm@osdl.org [PATCH] s390: update for altered page_state structure From: Gerald Schaefer Update s390 to track the new fields in struct page_state. ChangeSet@1.1669, 2004-03-16 07:15:28-08:00, akpm@osdl.org [PATCH] ppc32 compile fix From: Tom Rini The problem is that on PPC32 (and probably sparc64) 'asmlinkage' is a useless keyword, and should just be removed from include/asm-ppc/unistd.h. ChangeSet@1.1668, 2004-03-16 07:15:17-08:00, akpm@osdl.org [PATCH] Save some memory in mem_map on x86-64 From: Andi Kleen This patch saves 2MB of memory on a 1GB x86-64 machine, 20MB on a 10GB machine. It does this by eliminating 8 bytes of useless padding in struct page. This resurrects an older patch in a hopefully cleaner form. ChangeSet@1.1667, 2004-03-16 07:15:05-08:00, akpm@osdl.org [PATCH] Fix early parallel make failures From: Sam Ravnborg Ingo said: Starting at around 2.6.4-rc2-mm1, I keep seeing 'scripts/fixdep: Text file busy' messages when doing a -j10 bzImage build - which seems to suggest that by the time fixdep is used by the build system it's not built yet. Sam said: I was pretty sure it was something I had caused, so I gave it a spin. What actually happened was that we tried to build the target 'silentoldconfig' in parrallel with 'scripts'. Since 'silentoldconfig' started a new make and then the config target needed 'scripts' we saw two parallel runs. The way I decided to fix it was to split scripts/ in two parts. The first part is now the very basic stuff - moved to scripts/basic/. The second part is dependent on kernel config etc. and kept in scripts/ In the 2.7 timeframe i will redo this initial stuff - it's becoming too messy for anyone to understand today. Description: Fix dependencies in early phases of kernel build. This solves a few problems nively: modpost is no longer rebuild twicewhen reaching the 'target' state 'make -j10' now works nicely again The patch is rather large due to the following file moves: mkdir scripts/basic mv scripts/fixdep.c scripts/basic mv scripts/split-include.c scripts/basic mv scripts/docproc.c scripts/basic ChangeSet@1.1660.3.1, 2004-03-16 07:07:38-08:00, benh@kernel.crashing.org [PATCH] g5: Fix iommu vs. pci_device_to_OF_node The g5 iommu code would fill the "iommu_table" member of whatever device node was pointed to by pcidev->sysdata during boot. However, the ppc64 kernel fills that with a pointer to the PHB node which is later replaced "lazily" with a pointer to the real node when calling pci_device_to_OF_node(). In this case, we were thus "losign" the iommu_table pointer. Typical symptom: loss of the SATA when looking at it's /proc entry. This fixes it by forcing the update to the final sysdata pointer when filling up the iommu_table pointers. The "lazy" thing is useless on pmac anyway. ChangeSet@1.1660.2.2, 2004-03-16 11:31:31+01:00, vojtech@suse.cz Merge bk://dtor.bkbits.net/input into suse.cz:/data/bk/input ChangeSet@1.1660.2.1, 2004-03-16 11:10:38+01:00, vojtech@suse.cz Merge suse.cz:/data/bk/linus into suse.cz:/data/bk/input ChangeSet@1.1665, 2004-03-16 00:03:48-08:00, davidm@tiger.hpl.hp.com ia64: Update defconfig ChangeSet@1.1660.1.1, 2004-03-16 02:39:14-05:00, jgarzik@redhat.com [libata] bump libata and sata_sil driver versions ChangeSet@1.1664, 2004-03-15 23:31:37-08:00, kaos@sgi.com [PATCH] ia64: Decode salinfo oemdata for SN2 via PROM SN2 platforms provide oemdata in salinfo records. The decode of that oemdata is done via prom routines. This patch provides the interface from user space through the kernel into the prom to do the oem decode. ChangeSet@1.1663, 2004-03-15 23:30:13-08:00, davidm@tiger.hpl.hp.com ia64: Based on patch by Keith Owens: put stop bit to work around GCC problem. Apparently GCC sometimes fails to insert a stop-bit when re-using p14 after the spinlock directives, even though the register is clearly marked as "clobbered". ChangeSet@1.1662, 2004-03-15 23:21:48-08:00, hch@lst.de [PATCH] ia64: update simscsi to 2.6 scsi APIs Use the proper (and cleaner) probing API instead of the old scsi_module.c hack, don't use the typedefs I plan to kill in 2.7 and mark everything static ChangeSet@1.1661, 2004-03-15 22:39:06-08:00, davidm@tiger.hpl.hp.com Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5 into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5 ChangeSet@1.1608.104.8, 2004-03-15 22:34:08-08:00, bjorn.helgaas@hp.com [PATCH] ia64: update ia64/Kconfig This Kconfig patch basically just makes ia64 look a little more like i386: - moves system type above processor type - moves PM & ACPI to a new top-level menu - moves PCI/PCMCIA to a new top-level menu ChangeSet@1.1608.104.7, 2004-03-15 22:33:05-08:00, davidm@tiger.hpl.hp.com ia64: Forward-port hp-agp.c fix from 2.4 See this ChangeSet: http://lia64.bkbits.net:8080/linux-ia64-2.4/cset@40524248tkgE0RDYQL0IyiAdFxo_Ew ChangeSet@1.1608.104.6, 2004-03-15 22:24:32-08:00, jbarnes@sgi.com [PATCH] ia64: kill CONFIG_IA64_MCA The MCA code is now slim enough that there isn't much point in keeping CONFIG_IA64_MCA anymore. ChangeSet@1.1608.104.5, 2004-03-15 22:22:13-08:00, bjorn.helgaas@hp.com [PATCH] ia64: move consistent_dma_mask to the generic device The patch that moved and renamed consistent_dma_mask neglected to fix up arch/ia64/hp/common/sba_iommu.c. ChangeSet@1.1608.104.4, 2004-03-15 22:20:48-08:00, pfg@sgi.com [PATCH] ia64: fix missing braces in SN2 console code The last mod to fix the staircase printing - missed some bracing... ChangeSet@1.1608.104.3, 2004-03-15 22:18:13-08:00, mort@wildopensource.com [PATCH] ia64: Update SN2 defconfig ChangeSet@1.1608.104.2, 2004-03-15 22:17:27-08:00, jsm@udlkern.fc.hp.com yia64: Fix show_mem() panic ChangeSet@1.1660, 2004-03-15 21:44:26-08:00, torvalds@ppc970.osdl.org Linux 2.6.5-rc1 TAG: v2.6.5-rc1