- Bad to remove proc file now, even though it's nearly useless. Reinstated
  in the name of compatibility. 

- Restored original semantics - if software_suspend() is enabled, then just
  call that (and never go into low-power state). Otherwise, call acpi_suspend().

- acpi_suspend() is simply a wrapper for pm_suspend(), passing down the right
  argument. This is so we don't have to do everything manually anymore.

- Fixed long-standing bug by checking for "4b" in string written in to 
  determine if we want to enter S4bios.

- Allows 'backdoor' interface to swsusp, as requested by Pavel. 

- Simply a wrapper to pm_suspend(), though guaranteeing that swsusp is used,
  and system is shutdown (and put into low-power state).

- Call in sys_reboot() changed back to call to software_suspend().

- bios are the preferred method for doing this type of stuff in 2.6. The 
  __bread() uses bio's in the end anyway. 

- bios make it really easy to implement write functionality, so we are able
  to reset the swap signature immediately after checking it during resume.
  So, if something happens while resuming, we will still have valid swap to 
  use. 

- Thanks to Jens for some help in getting it working several months ago.

- Make resume_bdev global to file, so we don't have to pass it around (we 
  always use the same one, so it shouldn't make a difference).

- Allocate cur in read_suspend_image(), since it's the only function that
  uses it. 

- Check all errors and make sure we free cur if any happen.

- Make sure to return errors from the functions called, not our own. 

- Free the pagedir if we hit an error after we allocate it. 

- By moving acpi_{save,restore}_state_mem() into acpi_pm_enter(), implying
  after interrupts have been disabled and nothing else is running on the 
  system, S3 is able to resume properly.

- Prevents ordering issues when drivers add more devices ->probe(). 

- Put in kernel/power/disk.c
- Make compilation depend on CONFIG_SOFTWARE_SUSPEND (should probably be 
  renamed to CONFIG_PM_STD or some such).

- Actually decrement on device_pm_release()
- Call from device_pm_remove().

into osdl.org:/home/mochel/src/kernel/linux-2.5-power

into osdl.org:/home/mochel/src/kernel/linux-2.5-power

- Handle -EAGAIN in device_suspend() properly: keep going, with error reset
  to 0. 

- Call dpm_resume() if we got a real error, instead of device_resume(), which
  would deadlock.

sound/pcmcia/vx/vx_entry.c:

This patch removes the PCMCIA timer release functionality which is no
longer required. Without this the module does not compile.

Too much cut-and-paste, noticed by Dmitry Torokhov <dtor_core@ameritech.net>

into samba.org:/home/paulus/kernel/for-linus-ppc

On PPC32 we reorder the arguments so they fit into 6 registers.  Glibc will
need a two-line stub to change them from the standard order to the ordering
used by the system call: (fd, advice, offset, len).

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

In both 2.4 and in 2.6, error handling for bad cdrom media is
wrong.  And it is my fault I'm afraid, since I botched an earlier
fix for the problem by putting the fix in the wrong spot.

My kids have a "Jumpstart Toddlers" cd they have long since
completely killed, which makes a great test disc.  Without this
fix, the best time projection I can get for completing a dd type
sector copy is about 2 years...  Most of that is spent thrashing
about in kernel space trying to re-read sectors we already know
are not correctable....  After the fix, I was able to rip a copy
the CD (or rather muddle through it getting lots of EIO errors)
in about 15 minutes.

Attached is the fix for 2.6.x,

into osdl.org:/home/mochel/src/kernel/linux-2.5-power

- do_magic()
  - Rename to swsusp_arch_suspend().
  - Move declaration to swsusp.c

- arch_prepare_suspend()
  - Return an int
  - Fix x86 version to return -EFAULT if cpu does not have pse, instead of 
    calling panic().
  - Call from swsusp_save().

- do_magic_suspend_1()
  - Move body to pm_suspend_disk()
  - Remove.

- do_magic_suspend_2()
  - Rename to swsusp_suspend()
  - Move IRQ fiddling to suspend_save_image(), since that's the only call 
    that needs it. 
  - Return an int.

- do_magic_resume_1()
  - Move body to pm_resume().
  - Remove

- do_magic_resume_2()
  - Rename to swsusp_resume(). 
  - Return an int. 

- swsusp general
  - Remove unnecessary includes.
  - Remove suspend_pagedir_lock, since it was only used to disable IRQs.
  - Change swsusp_{suspend,resume} return an int, so pm_suspend_disk() knows
    if anything failed. 

 

into samba.org:/stuff/paulus/kernel/for-linus-ppc

of requiring users to select SCSI in order to see it.

into osdl.org:/home/mochel/src/kernel/linux-2.5-power

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5

From Christoph Hellwig

From David Mosberger:

> We definitely are seeing some strange crashes in get_ksymbol_core().
> I think the reason is the lack of iterator initialization.

Yes, looks good: reset the iterator at allocation.

Remove the PCMCIA release timer that got missed in earlier patch.  This
is required for successful compilation of the driver.

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5

nfsroot_mount().