Paul Gortmaker <p_gortmaker@yahoo.com>: ENOTTY for rtc ioctl:
   ioctl(d, valid, crap) --> -EINVAL
   ioctl(d, crap, ....)  --> -ENOTTY

  man ioctl agrees:

         ENOTTY The specified request does not apply to the kind of
                object that the descriptor d references.

  Currently we return -EINVAL for both cases which is not as
  informative for debugging stuff.

  Patch is for 2.5.6 but applies cleanly (with minor offset) to 2.4.19p2

  Paul.

(Included in 2.2)
(Included in 2.4)

Paul Gortmaker <p_gortmaker@yahoo.com>: ENOTTY for nvram ioctl:
   ioctl(d, valid, crap) --> -EINVAL
   ioctl(d, crap, ....)  --> -ENOTTY

  man ioctl agrees:

         ENOTTY The specified request does not apply to the kind of
                object that the descriptor d references.

  Currently we return -EINVAL for both cases which is not as
  informative for debugging stuff.

  Patch is for 2.5.6 but applies cleanly (with minor offset) to 2.4.19p2

  Paul.

(Included in 2.2)
(Included in 2.4)

Martin Pool <mbp@samba.org>: trivial kernel patch -- clean up fs_exec.c:

(Included in 2.4)

Mark Hymers <markh@linuxfromscratch.org>: Kernel tree patch; Documentation_DocBook_kernel-hacking.tmpl:
  Hi,

  Just a small thing I noticed when grepping through the kernel source:
  one of the templates in Documentation/DocBook has a typo (I think).  I
  believe it should refer to MODULE_LICENSE instead of LICENCE.  Please
  correct me if I'm wrong though.

  Mark


(Included in 2.4)

Anton Blanchard <anton@au1.ibm.com>: newline in printk in olympic driver:

Christopher Yeoh <cyeoh@samba.org>: Re: fcntl returns wrong error code (Updated):
  At 2002/3/22 00:58+1100  Christopher Yeoh writes:
  > btw Stephen Rothwell pointed out that there is a much neater way to
  > achieve the same change. I'll post a new patch in the morning.

  This is the updated patch.


(Included in 2.4)

Andrey Panin <pazke@orbita1.ru>: serial.c ISAPNP fix:
  Thist patch fixes buglet which disables ISAPNP support in serial driver.
  __ISAPNP__ conditional symbol is used before isapnp.h is included.


(Included in 2.2)
(Included in 2.4)

Andrey Panin <pazke@orbita1.ru>: drivers_net_sis900.c: misiing __devinit:
  This patch adds missing __devinit modifier for read_eeprom() function.
  Patch against 2.5.8. Compiles, but untested.

Andrey Panin <pazke@orbita1.ru>: drivers_net_eepro100: missing __devinit:
  This patch adds missing __devinit modifiers for speedo_found1() and
  do_eeprom_cmd() functions. Patch against 2.5.8. Compiles, but untested.

Andrew Morton <akpm@zip.com.au>: fix a warning in i386_pci-pc.c:

Andrey Panin <pazke@orbita1.ru>: drivers_net_dl2k.c: missing __devinit's:
  This patch adds missing __devinit modifiers for read_eeprom() and
  parse_eeprom() functions. Patch against 2.5.8. Compiles, but untested.

 - sane retention policy for /proc/<pid>/fd/* - ->d_revalidate() says
   "kill it" if descriptor is not opened anymore (in addition to checks
   for task being dead) and we allow dentries of /proc/<pid>/fd/<n> to
   stay around.

 - preparation for sane policy for /proc/<pid>/fd/* - don't store
   struct file * in these inodes anymore.

 - sane dentry retention.  Namely, we don't kill /proc/<pid> dentries at the
   first opportunity (as the current tree does).  Instead we do the following:
	* ->d_delete() kills it only if process is already dead.
	* all ->lookup() in proc/base.c end with checking if process is still
	  alive and unhash if it isn't.
	* proc_pid_lookup() (lookup for /proc/<pid>) caches reference to dentry
	  in task_struct.  It's _not_ counted in ->d_count.
	* ->d_iput() resets said reference to NULL.
	* release_task() (burying a zombie) checks if there is a cached
	  reference and if there is - shrinks the subtree.
	* tasklist_lock is used for exclusion.
   That way we are guaranteed that after release_task() all dentries in
   /proc/<pid> will go away as soon as possible; OTOH, before release_task()
   we have normal retention policy - they go away under memory pressure with
   the same rules as for dentries on any other fs.

 - new helper in fs/proc/base.c - name_to_int(dentry) returns ~0U if name
   doesn't match 0|[1-9][0-9]* or is too large.  Otherwise it returns
   numeric value of name.  proc_pid_lookup() and proc_lookupfd() converted.

 - take unhash_process() into sched.c, move zeroing ->pid into it (and
   under tasklist_lock)

Fix buffer-head leak on truncate race.

The reason why it hadn't been triggered left right and center is that we
step on that path only when partial truncate blows away an indirect
block shared between truncated and remaining areas _and_ races with
ext2_get_block() in the beginning of said area.  IOW, we need

	* indirect block with hole in the beginning
	* get_block starting to read that block
	* truncate killing everything past the hole (and thus freeing indirect
	  block in question)
	* get_block completing the read and noticing that block is actually
	  gone.

OK...  IMO we should do that brelse() outside of the loop.

 - fixed off-by-PAGE_OFFSET in populate_pmd() (alpha, again)

 - alpha/mm/init.c forgot to set max_pfn

 - (dumb) default_idle() provided (alpha)

 - s/p_pptr/parent/, s/p_opptr/real_parent/ done for alpha

 - missing defines/fields/includes for alpha (accumulated since 2.5.0)

 - bogus return value type for ->open() and ->release() on nfsd
   (generic, caught on alpha since there ssize_t != int)

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

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

Make cpu type message consistent with cache type message.

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

Make the PCMCIA client drivers depend on hisax.o, 
use the right CONFIG_ variable for hisax submodules,
handle the case of built-in hisax, modular hisax submodules.

Remove the repeated information on what a module is.

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

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

This patch brings 2.5.8 in sync with the x86-64 2.4 development tree again
(excluding device drivers)

It has lots of bug fixes and enhancements. It only touches architecture
specific files.

- Sync with 2.5.8
- SMP/APIC supported now.
- Module loading works now.
- Time keeping bugs fixed.
- entry.S streamlined and some bugs fixed.
- modify_ldt works now
- mostly rewritten FPU support (including FXRSTOR for initial FPU
  initialization based on the initial state)
- 32bit emulation enhanced and bugs fixed.
- rewrote mm initialization and lots of cleanups in the page table handling
  __PAGE_OFFSET is now moved to 0x10000000000 and some vmalloc/ioremap
  problems have been fixed. They have an own PML4 slot now.
- WCHAN reporting support for RIP (but not RSP)
- Lots of various other bug fixes and cleanups.

Currently broken:
- ACPI
- MTRR

It needs some other bugfixes outside architecture specific code. I sent
them all in separate mail.

When vt_init happens to run before the keyboard is initialized (the order is random
because they're both different initcalls) then set_leds raises an not yet enabled
tasklet. This causes an endless loop on the first schedule() call because the tasklet
handling cannot handle raised but disabled tasklets.

This patch just does not do set_leds in virtual terminal initialization to avoid that.
It is done later anyways.

Minor patch for the x86-64 32bit emulation. Originally proposed by hpa and it
makes autofs 32bit/64bit clean for x86-64

(a minor fix to the previous version - 1096/2)
The enclosed patch includes trizeps-specific PCMCIA code. All
modifications are enclosed in
#ifdef CONFIG_SA1100_TRIZEPS
#endif
blocks or are linked as
+sa1100_cs-objs-        += sa1100_trizeps.o
so, other platforms remain unaffected. The patch is built against
2.5.6-rmk1.