into kleikamp.dyn.webahead.ibm.com:/shaggy/bk/jfs-2.5

The S_IFxxxx macros aren't bits to be tested, they
are values of the S_IFMT field.

This patch fixes the GPM cursor corruption people where seeing.

With 32 bit sector_t the block device size _in bytes_ is also cut to
32 bit in __set_size when the block device is mount (a filesystem
mounted). The argument should be cast to loff_t before expanding the
sector count to a byte count and calling i_size_write.

[Christophe Saout]

user program inclusion.

It's still wrong to include kernel headers from
user programs. Oh, well.

Ths "fix duplication of DMA {black,white}list in icside.c" patch broke it.

Noticed by Geert Uytterhoeven <geert@linux-m68k.org>.

From John McKell <mckellj@iomega.com>:

  This patch for scsi/sr.c and cdrom/cdrom.c persuades
  /proc/sys/dev/cdrom/info to report that connecting a drive via USB
  rather than ATAPI in fact does not make it able to write DVD-R.

  Without this patch, when sr0 and hdd are the same type of device
  connected via USB and ATAPI respectively, I see:

	$ cat /proc/sys/dev/cdrom/info:
	drive name:             sr1     sr0     hdd
	...
	Can write CD-R:         1       0       0
	Can write CD-RW:        1       0       0
	Can read DVD:           0       0       0
	Can write DVD-R:        1       1       0
	Can write DVD-RAM:      0       0       0
	Can read MRW:           0               0               0
	Can write MRW:          0               0               0

  With this patch applied, instead I see:

	$ cat /proc/sys/dev/cdrom/info:
	drive name:             sr1     sr0     hdd
	...
	Can write CD-R:         1       0       0
	Can write CD-RW:        1       0       0
	Can read DVD:           0       0       0
	Can write DVD-R:        0       0       0
	Can write DVD-RAM:      0       0       0
	Can read MRW:           0       0       0
	Can write MRW:          0       0       0

  The sr1 device in particular is an ordinary CD-RW that in fact cannot
  write DVD-R.

  While messing with this code, I also thought to tweak the /proc
  formatting to align the tabbed columns.

Here's a new version of the patch according to our discussion.

This allows the platform to add its own platform files to the
sysfs PCI device node through a "pcibios_add_platform_entries()"
call.

I added an empty pcibios_add_platform_entries() inline to all
archs that apparently have PCI and implemented the OF stuff for
ppc and ppc64. The name is still "devspec" for now, I doubt
it will conflict and that's consistent with our use of the
"devspec" name in other places.

From: Nathan Scott <nathans@sgi.com>,
      Andreas Gruenbacher <agruen@suse.de>

XFS regression tests tripped a couple of problems with the recent xattr fix.

When a size of 0 is passed in, the getxattr and listxattr syscalls return the
size that would be required for the value or list of names, without actually
returning the value.  The previous patch accidentally removed this test, and
so querying the required size broke.

From: "Art Haas" <ahaas@airmail.net>

The following patch removes the duplicated sysctl entries for 'soft-power'
and 'unaligned-trap' for HPPA users.  Immediately before these lines these
two entries exist in a C99-style format.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

<Patch from Stephen Hemminger>
o [CORRECT] Better handling of shared IRQs in w83977af_ir driver.

<Patch from Stephen Hemminger>
o [CORRECT] Better handling of shared IRQs in via-ircc driver.

<Patch from Stephen Hemminger>
o [CORRECT] Better handling of shared IRQs in smsc-ircc2 driver.

<Patch from Stephen Hemminger>
o [CORRECT] Better handling of shared IRQs in ali-ircc driver.

<Patch from Stephen Hemminger>
o [CORRECT] Better handling of shared IRQs in nsc-ircc driver.

<Patch from Stephen Hemminger>
o [FEATURE] remove unused code : device notifier handler.

o [FEATURE] Don't drop IrLAP connection is we *just* received an
	incomming IrLMP connection request.

<Original patch from Stephen Hemminger>
o [CORRECT] Always initialise Ultra packet/header size.
o [CORRECT] Don't allow Ultra send on unbound sockets if no
	dest address is given.
o [FEATURE] Properly support Ultra sendto on unbound sockets.

From: Trond Myklebust <trond.myklebust@fys.uio.no>

Fix for proper C99 designated initializer, and avoid warning from
missing (unreachable - but gcc doesn't know it) return.

a function of its own.

This also allows us to do a better job, since slab.c
can now do more proper tests.

nfs_idmap.h independent of CONFIG_NFS4 and other header
files.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into kernel.bkbits.net:/home/davem/net-2.6

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

Here is patch for linux-2.6/drivers/usb/media/Kconfig.

into kroah.com:/home/greg/linux/BK/i2c-2.6

  
Now this should get that Rusty^Wmonkey off my back...

Now this should get that Rusty^Wmonkey off my back...

into kroah.com:/home/greg/linux/BK/pci-2.6

This is a new ported driver, fscher, which supports the FSC Hermes chip.
The original driver was written by Reinhard Nissl, who also ported it to
Linux 2.6, as discussed on the lm_sensors mailing list during the last
two weeks. I reviewed the code and we made the necessary changes, so
that what we have now looks good to me. Please apply on top of your i2c
patches stack.

into kroah.com:/home/greg/linux/BK/driver-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6