Merge with Linux 2.4.0-test3-pre2.

5 files changed, 63 insertions, 10 deletions

diff --git a/Documentation/Changes b/Documentation/Changes
index 0b9e549fc..525932df1 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -41,7 +41,7 @@ Card) hardware, for example, you probably needn't concern yourself
 with pcmcia-cs.
 
 o  Gnu C                  2.7.2.3                 # gcc --version
-o  binutils               2.9.1.0.7               # ld -v
+o  binutils               2.9.1.0.22              # ld -v
 o  util-linux             2.10g                   # chsh -v
 o  modutils               2.3.10                  # insmod -V
 o  e2fsprogs              1.18                    # /sbin/tune2fs --version
@@ -78,7 +78,7 @@ release of binutils.
 
 If you can, upgrade to the latest 2.9.5 binutils release.  Older
 releases such as 2.8, 2.8.xx, and the FSF's 2.9.1 should be avoided if
-at all possible.  The later releases of 2.9.1.0.x (anything where x >= 7)
+at all possible.  The later releases of 2.9.1.0.x (anything where x >= 22)
 can and do compile the kernel properly, but there are many benefits
 to upgrading to 2.9.5 if you're up to it.
 
@@ -248,8 +248,8 @@ o  ftp://ftp.varesearch.com/pub/support/hjl/binutils/2.9.1/binutils-2.9.1.0.25.t
 
 2.9.5 series
 ------------
-o  ftp://ftp.varesearch.com/pub/support/hjl/binutils/binutils-2.9.5.0.29.tar.gz
-     <ftp://ftp.varesearch.com/pub/support/hjl/binutils/binutils-2.9.5.0.29.tar.bz2>
+o  ftp://ftp.varesearch.com/pub/support/hjl/binutils/binutils-2.9.5.0.46.tar.gz
+     <ftp://ftp.varesearch.com/pub/support/hjl/binutils/binutils-2.9.5.0.46.tar.bz2>
 
 System utilities
 ****************
diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 5e4f351e5..edaa621b0 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -2136,6 +2136,20 @@ CONFIG_ALPHA_SRM
 
   If unsure, say N.
 
+Legacy kernel start address
+CONFIG_ALPHA_LEGACY_START_ADDRESS
+  The 2.4 kernel changed the kernel start address from 0x310000
+  to 0x810000 to make room for the Wildfire's larger SRM console.
+
+  If you're using aboot 0.7 or later, the bootloader will examine
+  the ELF headers to determine where to transfer control.  Unfortunately,
+  most older bootloaders -- APB, or MILO -- hardcoded the kernel
+  start address rather than examining the ELF headers, and the result
+  is a hard lockup.
+
+  Say Y if you have a broken bootloader.  Say N if you do not, or
+  if you wish to run on Wildfire.
+
 Non-standard serial port support
 CONFIG_SERIAL_NONSTANDARD
   Say Y here if you have any non-standard serial boards -- boards
@@ -3260,6 +3274,14 @@ CONFIG_FB_VIRTUAL
  
   If unsure, say N.
 
+CONFIG_FB_SA1100
+  This is a framebuffer device for the SA-1100 LCD Controller.
+  See http://www.linux-fbdev.org/ for information on framebuffer
+  devices.
+
+  If you plan to use the LCD display with your SA-1100 system, say
+  Y here.
+
 Advanced low level driver options
 CONFIG_FBCON_ADVANCED
   The frame buffer console uses character drawing routines that are
@@ -10049,8 +10071,9 @@ CONFIG_USB_DSBR
 Microtek USB scanner support
 CONFIG_USB_MICROTEK
   Say Y here if you want support for the Microtek X6USB and possibly
-  some other scanners. The scanner will appear as a scsi device to the
-  rest of the system. A patched version of SANE is necessary to use the
+  some other scanners by that vendor. The scanner will appear as a
+  scsi generic device to the rest of the system.
+  A patched version of SANE is necessary to use the
   scanner. It's available at 
   http://fachschaft.cup.uni-muenchen.de/~neukum/scanner.html
   This driver can be compiled as a module.
@@ -15450,6 +15473,20 @@ CONFIG_ARCH_PERSONAL_SERVER
   If you have any questions or comments about the  Compaq Personal
   Server, send e-mail to skiff@crl.dec.com
 
+Include support for Assabet
+CONFIG_SA1100_ASSABET
+  Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
+  Microprocessor Development Board (also known as the Assabet).
+
+Include support for the Compaq iPAQ 3600
+CONFIG_SA1100_BITSY
+  Say Y here if you intend to run this kernel on the Compaq iPAQ 3600
+  handheld computer.  Information about this machine and the Linux
+  port to this machine can be found at:
+
+  http://www.handhelds.org/Compaq/index.html#iPAQ_H3600
+  http://www.compaq.com/products/handhelds/pocketpc/
+
 Math emulation
 CONFIG_NWFPE
   Say Y to include the NWFPE floating point emulator in the kernel.
@@ -15506,6 +15543,17 @@ CONFIG_DEBUG_INFO
   time and disk space needed for compilation of the kernel. If in
   doubt say N.
 
+Kernel low-level debugging functions
+CONFIG_DEBUG_LL
+  Say Y here to include definitions of printascii, printchar, printhex
+  in the kernel.  This is helpful if you are debugging code that
+  executes before the console is initialized.
+
+Kernel low-level debugging messages via footbridge serial port
+CONFIG_DEBUG_DC21285_PORT
+  Say Y here if you want the low-level print routines to direct their
+  output to the serial port in the DC21285 (Footbridge).
+
 Split initialisation functions into discardable section
 CONFIG_TEXT_SECTIONS
   If you say Y here, kernel code that is only used during
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 7256f5aaf..7d1f5ca72 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -176,7 +176,7 @@ filesystem. As of kernel 2.1.99, the following members are defined:
 
 struct super_operations {
 	void (*read_inode) (struct inode *);
-	void (*write_inode) (struct inode *);
+	void (*write_inode) (struct inode *, int);
 	void (*put_inode) (struct inode *);
 	void (*delete_inode) (struct inode *);
 	int (*notify_change) (struct dentry *, struct iattr *);
@@ -198,7 +198,8 @@ or bottom half).
 	read. Other members are filled in by this method
 
   write_inode: this method is called when the VFS needs to write an
-	inode to disc
+	inode to disc.  The second parameter indicates whether the write
+	should be synchronous or not, not all filesystems check this flag.
 
   put_inode: called when the VFS inode is removed from the inode
 	cache. This method is optional
diff --git a/Documentation/networking/tulip.txt b/Documentation/networking/tulip.txt
index b936846af..11494e1dc 100644
--- a/Documentation/networking/tulip.txt
+++ b/Documentation/networking/tulip.txt
@@ -142,6 +142,10 @@ tulip_core.c	- Driver core (a.k.a. where "everything else" goes)
 
 Version history
 ===============
+0.9.7 (June 17, 2000):
+* Timer cleanups (Andrew Morton)
+* Alpha compile fix (somebody?)
+
 0.9.6 (May 31, 2000):
 * Revert 21143-related support flag patch
 * Add HPPA/media-table debugging printk
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index a92453129..e5634fd7f 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -6,7 +6,7 @@ Author: Mark McClelland
 Homepage: http://alpha.dyndns.org/ov511
 
 NEW IN THIS VERSION:
- o Race conditions and other bugs fixed
+ o Preliminary support for YUV422 and YUV422P V4L modes
 
 INTRODUCTION:
 
@@ -209,7 +209,7 @@ TODO:
  o Setting of contrast and brightness not working with 7620
  o Driver/camera state save/restore for when USB supports suspend/resume
  o Multiple cameras reportedly do not work simultaneously
- o Problems with OHCI
+ o Unstable on SMP systems
 
 HOW TO CONTACT ME: