From:  <a.othieno@bluewin.ch> (Arthur Othieno)

via scripts/checkincludes.pl:
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From:  Chris Heath <chris@heathens.co.nz>

Here's a trivial patch that removes an unused-variable warning in ftape.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From:  David Gibson <david@gibson.dropbear.id.au>

This patch excludes the .pc directory from the same things that
SCCS/BitKeeper/.svn/CVS files are excluded from.  The .pc directory is used
for backup/reference files by quilt, a patch mangling system conceptually
derived from akpm's patch scripts.  Excluding the .pc directory is handy,
because otherwise old versions of files found in there tend to end up at the
front of the TAGS index.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fixes a cut'n'paste error...
Signed-off-by: Rusty Trivial Russell <trivial@rustcorp.com.au>
Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From:  <adobriyan@mail.ru>

Fix missing bracket when parameter to be documented is a pointer to function.

int (* resume (struct usb_interface *intf);
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From:  <adobriyan@mail.ru>

Imagine you have a code similar to

  struct foo {
  	union {
  		struct tcphdr   *th;
  	} h;
  	union {
  		struct iphdr    *iph;
  	} nh;
  };

kernel-doc in it's current state will happily eat everything from first '{' to
last '}' and nobody will see parameter 'h' in documentation (look at
include/linux/skbuff.h:struct sk_buff for real world example).

So, fix the greedy regexp.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

  CC [M]  fs/smbfs/proc.o
fs/smbfs/proc.c: In function `smb_proc_readdir_long':
fs/smbfs/proc.c:2313: warning: comparison of unsigned expression < 0 is always false
fs/smbfs/proc.c:2467: warning: comparison of unsigned expression < 0 is always false

The first one is pretty dangerous looking, as smb_proc_readdir_long() can
return several negative error values and all those are converted to
unsigned and then erronously pass the test on line 2313.  Chris Wright gave
it a quick look and we did not see immediately if this can be remotely
exploited, but it looks pretty scary.

The second warning on line 2467 is just extra so I just removed it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fixup another round of sparse warnings of the type:
	warning: Using plain integer as NULL pointer
Acked by Stephen.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Arjan (sensibly) put a might_sleep() in mempool_alloc() and it caught a bad
cfq usage.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

PPC small data area base symbols shift between kallsyms phases 1 and 2, which
makes the kallsyms data unstable.  Exclude them from the kallsyms list.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The <driver>_config function called just before clear DEV_CONFIG, and
DEV_STALE_LINK isn't set anywhere else.  This is a copy & paste thing found
in all old pcmcia drivers.

The patch has been sent to the isdn list ages ago but I didn't get any
response.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

nfsd currently just sets f_pos when seeking in a directory.  This bypasses
any checking and other handling that a filesystem might want to do.

So instead, we define "vfs_llseek" to be an exported "llseek", and use
that, both to seek at the start, and the find the new position at the end.

Thanks to
    "Derrick Schommer" <dschommer@acopia.com>
    "Trond Myklebust" <trond.myklebust@fys.uio.no>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch below against 2.6.7-mm5 fixes more compile errors with
MCA_LEGACY=n.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here's a patch to allow the kAFS filesystem to use the automount facility
patch presented in a previous email.

It allows me to mount an AFS root volume on /afs and then just walk through
the directory structure causing referenced volumes to be automounted and
autoumounted.

For instance, if I do:

	[root@andromeda root]# mount -t afs \#root.afs. /afs
	[root@andromeda root]# ls /afs
	asd  cambridge  cambridge.redhat.com  grand.central.org
	[root@andromeda root]# ls /afs/cambridge
	afsdoc
	[root@andromeda root]# ls /afs/cambridge/afsdoc/
	ChangeLog  html  LICENSE  pdf  RELNOTES-1.2.2

And then look in the mountpoint catalogue, I see:

	[root@andromeda root]# cat /proc/mounts
	...
	#root.afs. /afs afs rw 0 0
	#root.cell. /afs/cambridge.redhat.com afs rw 0 0
	#afsdoc. /afs/cambridge.redhat.com/afsdoc afs rw 0 0

Then after waiting a few minutes:

	[root@andromeda root]# cat /proc/mounts
	...
	#root.afs. /afs afs rw 0 0

Is all that remains.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here's a patch that I worked out with Al Viro that adds support for a
filesystem (such as kAFS) to perform automounting intrinsically without the
need for a userspace daemon.  It also adds support for such mountpoints to be
degraded at the filesystem's behest until they've been untouched long enough
that they'll be removed.

I've a patch (to follow) that removes some #ifdef's from fs/afs/* thus
allowing it to make use of this facility.

There are five pieces to this:

 (1) Any interested filesystem needs to have at least one list to which
     expirable mountpoints can be added.

     Access to this list is governed by the vfsmount_lock.

 (2) When a filesystem wants to create an expirable mount, it calls
     do_kern_mount() to get a handle on the filesystem it wants mounting, and
     then calls do_add_mount() to mount that filesystem on the designated
     mountpoint, supplying the list mentioned in (1) to which the vfsmount
     will be added.

     In kAFS's case, the mountpoint is a directory with a follow_link() method
     defined (fs/afs/mntpt.c). This uses the struct nameidata supplied as an
     argument as a determination of where the new filesystem should be
     mounted.

 (3) When something using a vfsmount finishes dealing with it, it calls
     mntput(). This unmarks the vfsmount for immediate expiry.

     There are two criteria for determining if a vfsmount may be expired - it
     mustn't be marked as in use for anything other than being a child of
     another vfsmount, and it must have an expiry mark against it already.

 (4) The filesystem then determines the policy on expiring the mounts created
     in (2). When it feels the need to, it passes the list mentioned in (1) to
     mark_mounts_for_expiry() to request everything on the list be expired.

     This function examines each mount listed. If the vfsmount meets the
     criteria mentioned in (3), then the vfsmount is deleted from the
     namespace and disposed of as for unmounting; otherwise the vfsmount is
     left untouched apart from now bearing an expiration mark if it didn't
     before.

     kAFS's expiration policy is simply to invoke this process at regular
     intervals for all the mounts on its list.

 (5) An expiration facility is also provided to userspace: by calling umount()
     with a MNT_EXPIRE flag, it can make a request to unmount only if the
     mountpoint hasn't been used since the last request and isn't in use now.

     This allows expiration to be driven by userspace instead of by the
     kernel if that is desirable.

     This also means that do_umount() has to use a different version of
     path_release() to everyone else... it can't call mntput() as that clears
     the expiration flag, thus rendering this unachievable; so it's version of
     path_release() calls _mntput(), which doesn't do the clear.

My original idea was to give the kernel more knowledge of automounted
things. This avoids a certain problem with stat() on a mountpoint causing it
to mount (for example, do "ls -l /afs" on a machine with kAFS), but Al wanted
it done this way.

> Why is autofs unsuitable?

Because:

 (1) Autofs is flat; AFS requires a tree - mounts on mounts on mounts on
     mounts...

 (2) AFS holds the data as to what the mountpoints are and where they go, and
     these may be cross-links to subtrees beyond your control. It's also not
     trivial to extract a list of mountpoints as is required for autofs.

 (3) Autofs is not namespace safe.

 (4) Ducking back to userspace to get that to do the mount is pretty tricky if
     namespaces are involved.

In fact, autofs may well want to make use of this facility.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Process modules in sorted order during modpost and modules install.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Consolidate rules for installing internal and external modules.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Will Schmidt <willschm@us.ibm.com>

This patch includes updates and cleanup for the PPC64 proc/lparcfg interface.
     - use seq_file's seq_printf for output
     - remove redundant e2a function. (use viopath.c's instead)
     - change to Kconfig to allow building as a module.
     - export required symbols from LparData.c

    Pass # 2 updates..
      - Per Pauls request I've removed the vpurr references, and left
	just a stub function get_purr().
      - this should apply clean to latest linus tree.  (test-applied against
	2.6.7-rc3).

    Pass # 3 updates...
      - Correcting my previously incorrect description of the
	lparcfg_count_active_processors() function..
	This is for the cases where we have some number of virtual
	processors that are different than the total number of threads
	in the system.  (i.e. systemcfg->processorcount isnt the desired
	value for partition_active_processors)
      - moved e2a function into its own file in arch/ppc64/lib.
      - changed lparcfg_count_active_processors() to use a while loop
	instead of a for loop.
      - removed redundant of_node_put in lparcfg_count_active_processors().
      - removed unneeded parms from get-system-parameter rtas_call.
Signed-off-by: Will Schmidt <willschm@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

On recent pSeries systems, EEH needs to be enabled even on PCI Host Bridges
(PHB's).  If not enabled, then ordinary PCI probing (config-space
reads/writes to the bridges) will generate firmware error messages,
possibly a very large number of messages for systems with large numbers of
pci slots.
Signed-off-by: Linas Vepstas <linas@linas.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes some unbalanced usage of pci_dev_get()/pci_dev_put() calls
in the eeh code.  The old code had too many calls to dev_put, which could
cause memory structs to be freed prematurely, possibly leading to bad bad
pointer derefs in certain cases.
Signed-off-by: Linas Vepstas <linas@linas.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

gcc 3.5 is complaining about the size of copy_from_user.  It turns out it
is rather large and putting it out of line saves us about 30kB on a default
kernel build.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here is a patch to fix some bugs with the current CPM UART code, Tom Rini
has seen this and ok'd it.

* Fixes need to config both SMC1 & SCC1
* Fixes buffer descriptor wrapping issue in set_termios
* Fixes confusion in Kconfig regarding CPM1 vs CPM2
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Pantelis Antoniou <panto@intracom.gr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We have something like this in our kernel since many months.  It sets the
console device to what OF uses.  ppc64 does the same, and it works ok.
serial is found on CHRP, ch-a is used on all powermacs.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch fixes locking of i_flags.  It removes S_QUOTA flag from i_flags
because it was almost unused and updating it on some places correctly
(under i_sem) would be tricky.  Note that accessing of S_NOQUOTA flag is
serialized by dqptr_sem and so we can reliably tested without i_sem.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Setup synchronous expansion card resource.
- Fix order of IRQ and FIQ mask/offsets.

This include isn't required for ARM builds either.

Apparantly, the reason for this change is that it gives "much less
NFS stalls with a SMC91C96 on a 10/100MB switch."

Alan Cox's comments on this is:
"spec says 16 collision retries max _ever_.  I bet his 'broken
switch' is a case of half v full duplex" and a recommendation to
remove it.

Also, since the change does not limit the number of times we may
retry to send the packet, I think this code opens a potential DoS
attack against network which has a machine connected running this
code.

Patch from John Lenz

Cleanup and forward port of patch 1849.
This patch provides support for the SHARP LoCoMo device, 
a companion chip similar to the sa1111 device.  It is present
in many of the SHARP Zaurus line of PDAs.

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

Patch from Ian Campbell

Update 1954/1 to use pxa2xx- as the platform device prefix 
instead of pxa2xx_. This changes pxamci to pxa2xx-mci, pxa2xx_udc 
to pxa2xx-udc and pxafb to pxa2xx-fb. pxa2xx-uart doesn't need changing.

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

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

hm, I had a brainfart here.  The recent "fix" to snd_ctl_read() actually
unfixed it.  Revert that, and fix the real bug.

Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There was a memory leak in epoll.

The reference count (d_count) of the struct dentry of a new epoll-fd was
set to TWO.  (new_inode() assigned ONE, than ep_getfd() incremented it by
dget()).  There was only ONE reference to this dentry, so struct dentry and
struct inode were never freed.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Alexey Dobriyan <adobriyan@mail.ru>

drivers/char/upd4990a.c was removed from 2.6.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>