I got this patch from Zou Nan hai to resolve the problem that
Andrew Morton has been having booting his ia64 system.  The code
is quite a bit cleaner as he has reduced the number of different
definitions of pfn_valid/page_to_pfn/pfn_to_page, and left the
only remaining ones next to each other in page.h ... so this
should be easier to maintain going forward.
Signed-off-by: Tony Luck <tony.luck@intel.com>

Patch written by Ben Woodard.  Sanity checked by Jesse Barnes.
Signed-off-by: Tony Luck <tony.luck@intel.com>

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

Get rid of IO_TOKEN_TO_ADDR() and IO_ADDR_TO_TOKEN() for pSeries EEH;
the conversion to tokens is not needed now that we have __iomem
annotations to prevent drivers from dereferencing IO addresses.

The IO tokens meant that the __raw_ IO accesses wouldn't have worked,
and removing the debugging vestiges simplifies the code noticeably.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into cantab.net:/home/src/ntfs-2.6-devel

- Minor cleanup of fs/ntfs/inode.c::ntfs_init_locked_inode().
- Bump version number and update Documentation/filesystems/ntfs.txt
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

	* vortex.c: trivial __iomem annotations
	* serio_raw.c and tsdev.c: equally trivial __user ones.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	* missing le32_to_cpu() in a bunch of printks
	* on big-endian boxen ext3_error() failed to set EXT3_ERROR_FS in
->s_state (cpu_to_le32() instead of cpu_to_le16())
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

missing fs32_to_cpu() for on-disk ->s_type.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With the recent bio mapping changes, the caller must pass in the
original bio for unmapping again (and they do). So kill this dead code,
it could cause problems in situations where someone has used bi_private
for something else.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

      - Change ntfs_{external_,}attr_find() to return 0 on success, -ENOENT
	if the attribute is not found, and -EIO on real error.  In the case
	of -ENOENT, the search context is updated to describe the attribute
	before which the attribute being searched for would need to be
	inserted if such an action were to be desired and in the case of
	ntfs_external_attr_find() the search context is also updated to
	indicate the attribute list entry before which the attribute list
	entry of the attribute being searched for would need to be inserted
	if such an action were to be desired.  Also make ntfs_find_attr()
	static and remove its prototype from attrib.h as it is not used
	anywhere other than attrib.c.  Update ntfs_attr_lookup() and all
	callers of ntfs_{external,}attr_{find,lookup}() for the new return
	values.
      - Force use of ntfs_attr_find() in ntfs_attr_lookup() when searching
	for the attribute list attribute itself.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

      ntfs_attr_{{re,}init,get,put}_search_ctx() as well as the type
      attr_search_context to ntfs_attr_search_ctx.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      find_external_attr() to ntfs_external_attr_find() to cleanup the
      namespace a bit and to be more consistent with libntfs.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Introduces a fixed size variant of ifmap for rtnetlink. Fixes
issues with address size mismatch between kernel and userspace.
Obviously this will fail if userspace provides an address greater
than 32bit.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
SIgned-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

missing htons() in assigning .sin_port for reconnect
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

        a) Flags2 left little-endian. SMBFLG2_... definitions switched to  
cpu_to_le16(...), which kills the need of conversions in ->Flags2.
	b) FILE_SYSTEM_UNIX_INFO (never used anywhere) is left little-endian;
when users appear, they can convert themselves.
	c) bugfix: in CIFSSessSetup() we used SecurityBlobLength of response
without conversion.  That would screw bigendian clients with servers that
give wcnt=4.
	d) bugfix: in CIFSNTLMSSPNegotiateSessSetup() we use 
SecurityBlob2->NegotiateFlags without conversion.  Again, problem on
big-endian.
	e) bugfix: SecurityBlob->MessageType is *not* host-endian.
	f) bugfix: ->sendmsg() expects its last argument to be equal to sum
of iovec lengths, so the value passed to kernel_sendmsg()/sock_sendmsg()
would better be correct...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

in CIFSSMSetEA() ->list_len got (__u32)cpu_to_le16() instead of cpu_to_le32().
Broken on big-endian...
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>