into hera.kernel.org:/home/mochel/BK/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

ttl of tcp_socket.

brw_kiovec() and ll_rw_kiovec() switched to struct block_device *.

Bunch of places converted from fsync_dev/invalidate_buffers to
fsync_bdev/invalidate_bdev.

get_sb_bdev() stores original block size in ->s_old_blocksize and
kill_block_super() restores it.

This kills 99% of crap with "oh, I've mounted/umounted that device and
its behaviour had changed" (remaining 1% can be dealt in pretty similar
ways; ideally I'd like to see ioctls that get/set block size dead and
gone).

Fix typo

Use sb_set_blocksize() in JFS instead of trying to do it by hand.

Clean up minix/bitmap.c

Kill BKL in minix/itree* (similar to ext2 patches)

Clean up the write_super-related code in minixfs

Move minix-private stuff to fs/minix/minix.h.

This version of sys_nfsservctl() fix hadn't made DaveM complain.

Obvious romfs fix.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

In 2.5.7 there is a thinko in the allocation and initialisation
of the fs-private superblock for ext2.  It's passing the wrong type
to the sizeof operator (which of course gives the wrong size)
when allocating and clearing the memory.

Lesson for the day: this is one of the reasons why this idiom:

	some_type *p;

	p = malloc(sizeof(*p));
	...
	memset(p, 0, sizeof(*p));

is preferable to

	some_type *p;

	p = malloc(sizeof(some_type));
	...
	memset(p, 0, sizeof(some_type));

I checked the other filesystems.  They're OK (but idiomatically
impure).  I've added a couple of defensive memsets where
they were missing.

- Apply Pavel Macheks suspend resume double resume fix.

- Finally remove the busy field for ata_operations and replace it with
   MOD_INC_USE_COUNT and MOD_DEC_USE_COUNT.

- Fix ali15xx chipset support by removing initialization differences,
   apparently caused by mislead interpretation of the specs or a mismatch
   between the specification and reality.

- Guard calls to ide_set_handler with checks to see whatever the previously
   installed IRQ handler already served it's purpose.

- Convert timeout checks on poll_timeout to the time_before() interface.

- Consolidate the two different IRQ handlers for multi mode PIO writes into
   one. The problems remain the same but at least now we will only have to
   tangle one single problem.

- Make for less terse error messages in ide-tape.c.

- Replaced all timecomparisions done by hand with all the proper timer_after()
   commands.

- Remove the drive niec1 mechanisms alltogether. There are several reasons for
   this:

   1. The code implementing it is nonintelliglible and therefore propably
   broken.

   2. If we have to invent somethig about sceduling drive IO, it should be done
   on the BIO level.

   3. We may in fact interleave with the IO sceduling on the upper layers and
   the results of two overlapping signal filters overlapped with each other can
   be disasterous to the overall throughput. (In fact they *are* most of the
   time.)

   4. It was not working if you had intermixed modes on different drives
   DMA versus PIO.

   5. Our goal is to have a driver which is able to share the badwidth
   properly and shouldn't needing this kind of "tuning".

- Remove unused nice2 from disk struct.

- Rename channel member of ata_channel to unit and device to dev to
   just prevent wrong interpretations. This prevents constructs like
   channel->channel...

- Mark all members of structures, which get jiffies assigned or involved in
   ugly timeout calculations with the prefix PADAM_  for easy spotting. This is
   Polish for "I'm falling down" or "This brings me to the knees" or slag
   comment for "What a sh..". Please be assured that it doesn't sound vulgar.

   Please grep for it to see immediately why this nomenclature is justified.

- Rename hwifs_s to ata_channel and eliminate ide_hwifs_t as well as the HWIF
   macro. OK this step makes this patch rather big.

- Replace the task_io_reg_t with the simple u8. There is no need to obfuscate
   the code more then necessary.

- kill some unnecessary type definitions out from hdreg.h.

- Add proper attributes to register files in hdreg.h.

- Don't use raw arrays for tfRegister and hobRegister in ide_task_s.  Use out
   nice global structures describing the fields in them.  This allows to kill
   the following defines:

     IDE_DATA_OFFSET
     IDE_FEATURE_OFFSET
     IDE_NSECTOR_OFFSET
     IDE_SECTOR_OFFSET
     IDE_LCYL_OFFSET
     IDE_HCYL_OFFSET
     IDE_SELECT_OFFSET
     IDE_COMMAND_OFFSET

   and many many others.

- Please have a look at the following in pdc4030.c. It couldn't have worked!
   This has been fixed in one go with the above change:

   memcpy(args.hobRegister, NULL, sizeof(struct hd_drive_hob_hdr));

- Kill the redundant *_REG_HOB definitions. They don't help readability in any
   way.

- Push BAD_DMA_DRIVE and GOOD_DMA_DRIVE to the ide-pmac.c file, since this is
   the only place where those get used.

- Kill unused fields from the ide_task_s structure. In esp. we pass a task
   attached to a request and not the other way around!

- Rename hwif field to channel in struct ide_drive_s.

- Move the request queue to the level where proper serialization has to happen
   anyway - the channel structure.

- Support for additional Promise controller id's (PDC20276).

- Remove code duplication between do_rw_taskfile and do_taskfile.
   This will evolve into a more reasonable ata_command() function
   finally. The ata_taskfile function has far too many arguments, but
   I favour this over having two different code paths for getting
   actual data to the drive.

Fix initrd problem that appeared back in 2.5.2-pre6 when kdev_t type
changed and comparison function was incorrectly converted..

- ETHTOOL_GLINK handling forgets to return on success

- Make use of pci_unmap_xxx storage optimization.
- In tg3_get_invariants, fix cacheline_sz_reg shifts.
  On 5703 chips, if latency timer is less than 64, set
  it to 64.
- In tg3_test_dma, only run the actual test on 5700/5701
  chips.  Aparently 5702/5703 revs have some problems.

- Fix SMP locking throughout
- Deal with hw bug involving lost writes to rxring base address
- Disable Never Give Up mode on transmitter, set TX attempts
  limit to 16 (the default).  This deals with a possible hang
  when the TX deadlocks with the PHY when a jabber occurs.
- Delete some dead code.

- support for multiple expected connections
  (necessary for protocols like H.323, SIP, PPTP)
- helper-definable limit of unconfirmed expectations
- timeouts for expectations
- full graph of connection relations, even after expectation confirmed
- various changes in the API towards conntrack and NAT helper
- automatic conntrack helper loading when at helper is loaded
- NAT mangling of TCP SACK in case of sequence number alteration
  (no need to delete SACKPERM anymore, I hope Alexey is happy now)

Based upon a patch from Maxim Krasnyansky.

property in pci_intmap_match even if pbm->num_pbm_intmap is
zero.

Create global list in which all devices are inserted. Done by Kai Germaschewski.

Add concept of system bus, so system devices (CPUs, PICs, etc) can have a common home in the device tree.
Add helper functions for {un,}registering.