into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.isdn

plus other small cleanups, in particular getting rid of
isdn_ppp_{receive,send}_ccp() and calling into the CCP code directly.

No (well, hardly any ;) code changes, only moving all /dev/ipppX related
code next to each other and some indenting changes.

o Now that all the infrastructure is in place, struct ipppd can
  easily be allocated when /dev/ipppX is opened and freed
  in the destructor.
o Separate the mix of state and flags in struct ipppd::state.
  We only have three states, open, assigned and connected, and
  additionally two flags to jump out of poll(), returning POLLHUP /
  POLLIN.

Instead of just recording the slot number and then retrieving
the ipppd via that, we can now just keep a pointer and get a
reference which makes sure that it does not go away until
we drop the reference.

We had introduced ipppd_get/put() earlier, so now add a real reference
count.

Basically, all what was missing was a common way to xmit frames
given the isdn_net_dev / isdn_net_local. We have this now by means
of function pointers (still room for improvement there, though), so
now let's do things from isdn_ppp_ccp.c.

Let isdn_ppp_ccp.c take care of keeping state / flags by itself.

Use a shared function for generating the PPP header, use the
{put,get}_u{8,16,32} helpers for endian-safe access.

I cannot see now reason why ISDN PPP devices should have a fake
::header routine which reserves a couple of bytes just to reclaim them
later during hard_start_xmit(), and since it works just as well without
it...

Fix missed STAT_BSENT acks and don't use skb_clone() for the skb which is
sent back, the network layer gets confused by that.

Create the new files isdn_ppp_ccp.[hc] which deal with PPP CCP
(compression control protocol) related stuff. Move most of the CCP
related stuff from isdn_ppp.c into isdn_ppp_ccp.c, putting CCP
state into a new "struct ippp_ccp".

A lot of the state in struct ipppd actually belongs to
isdn_net_dev or isdn_net_local, making it more easily accessible at a
most places, and also removing the ambiguity whether it's link-
or bundle-specific.

and move the declaration from include/linux/isdn_ppp.h
into drivers/isdn/i4l/isdn_ppp.c

Make sync PPP compile with the latest changes to the ISDN net device
layer - PPP negotiations work again after this patch.

Definitions which is only needed in one source file should go there and not
in a common header.

Last step in separating generic / interface-type specific code,
the former is now all in isdn_net_lib.c, the specific code in
isdn_net.c / isdn_ppp.c / isdn_concap.c

Instead of using locking per-channel, just lock the entire ISDN net work
interface as an entity, getting rid of weird locking.
  
Basically, ::hard_start_xmit() is already serialized by the network core,
so we could just rely on that. However, we want to send keep alive
frames, PPP messages from ipppd and such things directly without going
through the network stack, so we additionally lock
isdn_net_local->xmit_lock in hard_start_xmit(), which is taken in
the other paths dealing with transmitting frames as well.

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make

If you compile the kernel with -ffunction-sections, each function gets
put in a section .text.function_name.  This collides with our current use
of .text.init.  So here's a patch which converts x86 to use .init.text
instead.

I've tested it on x86 and it still frees 120k of ram, so it seems to work.
Other architectures will need to change their vmlinux.lds appropriately,
and may need other changes (arm, m68k seem to use .text.init verbatim).

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

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/linux-2.5_ppc64_work

[PATCH] md - 1 of 1 - Register mergeable function for linear so requests don't cross device boundries

We abstract out "which_dev" which finds which device a sector is on
and us it to make sure both ends of a to-be-merged request will
be on the same device.

As the expkey cache references entries in export cache,
it should be flushed first.
Also, the auth_unix caches should go last.

This brings the linux-2.5.42 tree up to spec WRT setclientid and
setclientid_confirm

Switch knfsd to vfs_read/vfs_write to work on aio-only filesystems.
This also gets stuff like the LSM checks and mandatory lock checking
for free.

o don't define __NO_VERSION__ (no use in 2.4/2.5)
o don't include <linux/version.h>

... as generic names probably aren't such a good idea.
Also sort the related EXPORT_SYMBOLS.

A 'qword' is a 'quoted word' and can be added, added as hex,
or got (getted??).

When releasing a cache item we always release anything
that is part of the key, but we ONLY release the content
is if it is valid.  i.e. if CACHE_VALID but not CACHE_NEGATIVE.

The new caching and auth code needs symbols to be exported.

An rpc service like NFSD knows about a number of
versions (2,3,4) and needs to know the max and min valid
version numbers, and also the maximum xdr buffer size used
by any version.

These max/mins are currently computed at compile time which means
we need to include all the xdr*.h headers into nfssvc.c just for
computing a couple of numbers.

With this patch, these max/mins are calculated at run time from
information in the svc_version structure which has been extended to
include per-version xdrsize.

Also the nfsd_version2, nfsd_version3, and nfsd_version4
structures are moved from nfssvc.c to their more correct home
of nfs*proc.c

Code gets neated, xdr*.h are no-longer included in
nfssvc.c, and the ugly ifdef can be removed fom xdr4.h

With gcc-2.95.3, text size goes from 2,399,190 to 2,390,004 - nearly
10 kbytes.

- Don't inline mpage_writepage().

  Even though it had but a single call site, uninlining this function
  took mpage.o from 4529 bytes of text to 3985.  gcc-2.95.3.

- Various buffer.c tweaks.  13233 bytes down to 12977

I had some code in page reclaim which is designed to catch the caller
of write(2) in page reclaim and force him to wait on writeout of his
own spindle's pages.

It works too well - there are large stalls in things like `cp
large-file foo' on small-memory machines.

So remove it, and rely on the other, more predictable throttling
schemes.

From Marcus Alanen <marcus@infa.abo.fi>

vmalloc is allocating one more page than necessary.