diff -Nru a/CREDITS b/CREDITS --- a/CREDITS Tue Feb 3 19:45:34 2004 +++ b/CREDITS Tue Feb 3 19:45:34 2004 @@ -1394,7 +1394,9 @@ N: Marcel Holtmann E: marcel@holtmann.org W: http://www.holtmann.org +D: Maintainer of the Linux Bluetooth Subsystem D: Author and maintainer of the various Bluetooth HCI drivers +D: Author and maintainer of the CAPI message transport protocol driver D: Various other Bluetooth related patches, cleanups and fixes S: Germany @@ -2670,9 +2672,9 @@ S: Finland N: Luca Risolia -E: luca_ing@libero.it -D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chip -S: Via Libertà 41/a +E: luca.risolia@studio.unibo.it +D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips +S: Via Liberta' 41/A S: Osio Sotto, 24046, Bergamo S: Italy diff -Nru a/Documentation/BK-usage/00-INDEX b/Documentation/BK-usage/00-INDEX --- a/Documentation/BK-usage/00-INDEX Tue Feb 3 19:45:17 2004 +++ b/Documentation/BK-usage/00-INDEX Tue Feb 3 19:45:17 2004 @@ -17,6 +17,14 @@ which compresses its input, and then outputs the uu-/base64-encoded version of the compressed input. +cpcset: Copy changeset between unrelated repositories. +Attempts to preserve changeset user, user address, description, in +addition to the changeset (the patch) itself. +Typical usage: + cd my-updated-repo + bk changes # looking for a changeset... + cpcset 1.1511 . ../another-repo + csets-to-patches: Produces a delta of two BK repositories, in the form of individual files, each containing a single cset as a GNU patch. Output is several files, each with the filename "/tmp/rev-$REV.patch" @@ -32,6 +40,11 @@ cd my-updated-repo bk changes -L ~/repo/original-repo 2>&1 | \ perl cset-to-linus > summary.txt + +gcapatch: Generates patch containing changes in local repository. +Typical usage: + cd my-updated-repo + gcapatch > foo.patch unbz64wrap: Reverse an encoded, compressed data stream created by bz64wrap into an uncompressed, typically text/plain output. diff -Nru a/Documentation/BK-usage/cpcset b/Documentation/BK-usage/cpcset --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/Documentation/BK-usage/cpcset Tue Feb 3 19:45:43 2004 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Purpose: Copy changeset patch and description from one +# repository to another, unrelated one. +# +# usage: cpcset [revision] [from-repository] [to-repository] +# + +REV=$1 +FROM=$2 +TO=$3 +TMPF=/tmp/cpcset.$$ + +rm -f $TMPF* + +CWD_SAVE=`pwd` +cd $FROM +bk changes -r$REV | \ + grep -v '^ChangeSet' | \ + sed -e 's/^ //g' > $TMPF.log + +USERHOST=`bk changes -r$REV | grep '^ChangeSet' | awk '{print $4}'` +export BK_USER=`echo $USERHOST | awk '-F@' '{print $1}'` +export BK_HOST=`echo $USERHOST | awk '-F@' '{print $2}'` + +bk export -tpatch -hdu -r$REV > $TMPF.patch && \ +cd $CWD_SAVE && \ +cd $TO && \ +bk import -tpatch -CFR -y"`cat $TMPF.log`" $TMPF.patch . && \ +bk commit -y"`cat $TMPF.log`" + +rm -f $TMPF* + +echo changeset $REV copied. +echo "" + diff -Nru a/Documentation/BK-usage/gcapatch b/Documentation/BK-usage/gcapatch --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/Documentation/BK-usage/gcapatch Tue Feb 3 19:45:43 2004 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Purpose: Generate GNU diff of local changes versus canonical top-of-tree +# +# Usage: gcapatch > foo.patch +# + +bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ diff -Nru a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl --- a/Documentation/DocBook/kernel-locking.tmpl Tue Feb 3 19:45:17 2004 +++ b/Documentation/DocBook/kernel-locking.tmpl Tue Feb 3 19:45:17 2004 @@ -66,6 +66,7 @@ fundamentals of concurrency and locking for SMP. + The Problem With Concurrency @@ -193,6 +194,7 @@ And then there are the unfriendly primitives, but I'll pretend they don't exist. + @@ -657,6 +659,7 @@ + @@ -1110,6 +1113,7 @@ return obj; } + @@ -1229,6 +1233,7 @@ behavior of the code, and can be hard to gain from just reading. And as Alan Cox says, Lock data, not code. + @@ -1317,6 +1322,7 @@ The two CPUs will spin forever, waiting for the other to give up their lock. It will look, smell, and feel like a crash. + Preventing Deadlock @@ -1886,6 +1892,7 @@ + Some Functions Which Don't Sleep diff -Nru a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches --- a/Documentation/SubmittingPatches Tue Feb 3 19:45:16 2004 +++ b/Documentation/SubmittingPatches Tue Feb 3 19:45:16 2004 @@ -20,16 +20,18 @@ -1) "diff -u" +1) "diff -up" ------------ -Use "diff -u" or "diff -urN" to create patches. +Use "diff -up" or "diff -uprN" to create patches. All changes to the Linux kernel occur in the form of patches, as generated by diff(1). When creating your patch, make sure to create it in "unified diff" format, as supplied by the '-u' argument to diff(1). -Patches should be based in the root kernel source directory, not in -any lower subdirectory. +Also, please use the '-p' argument which shows which C function each +change is in - that makes the resultant diff a lot easier to read. +Patches should be based in the root kernel source directory, +not in any lower subdirectory. To create a patch for a single file, it is often sufficient to do: @@ -39,7 +41,7 @@ cd $SRCTREE cp $MYFILE $MYFILE.orig vi $MYFILE # make your change - diff -u $MYFILE.orig $MYFILE > /tmp/patch + diff -up $MYFILE.orig $MYFILE > /tmp/patch To create a patch for multiple files, you should unpack a "vanilla", or unmodified kernel source tree, and generate a diff against your @@ -50,7 +52,7 @@ tar xvfz linux-2.4.0-test11.tar.gz mv linux linux-vanilla wget http://www.moses.uklinux.net/patches/dontdiff - diff -urN -X dontdiff linux-vanilla $MYSRC > /tmp/patch + diff -uprN -X dontdiff linux-vanilla $MYSRC > /tmp/patch rm -f dontdiff "dontdiff" is a list of files which are generated by the kernel during diff -Nru a/Documentation/arm/SA1100/CERF b/Documentation/arm/SA1100/CERF --- a/Documentation/arm/SA1100/CERF Tue Feb 3 19:45:16 2004 +++ b/Documentation/arm/SA1100/CERF Tue Feb 3 19:45:16 2004 @@ -1,3 +1,5 @@ +*** The StrongARM version of the CerfBoard/Cube has been discontinued *** + The Intrinsyc CerfBoard is a StrongARM 1110-based computer on a board that measures approximately 2" square. It includes an Ethernet controller, an RS232-compatible serial port, a USB function port, and @@ -5,7 +7,7 @@ Intrinsyc website, http://www.intrinsyc.com. This document describes the support in the Linux kernel for the -Intrinsyc CerfBoard as of version 2.4.0-test4-np1. +Intrinsyc CerfBoard. Supported in this version: - CompactFlash+ slot (select PCMCIA in General Setup and any options @@ -14,24 +16,14 @@ Network Devices) - Serial ports with a serial console (hardcoded to 38400 8N1) -Not supported in this version (yet): - - LCD driver/touchscreen interface - - UDC (a driver exists right now, but is unstable and slow and only - works with the Linux USB) - In order to get this kernel onto your Cerf, you need a server that runs both BOOTP and TFTP. Detailed instructions should have come with your evaluation kit on how to use the bootloader. This series of commands will suffice: - make cerf_config - make xconfig - make zImage + make ARCH=arm CROSS_COMPILE=arm-linux- cerfcube_defconfig + make ARCH=arm CROSS_COMPILE=arm-linux- zImage + make ARCH=arm CROSS_COMPILE=arm-linux- modules cp arch/arm/boot/zImage -The default config uses a 4MB RAM disk located at 0xc0500000 as root. -Setting the board to mount root from a NFS partition works, too. - - -I-Gene Leong, Intrinsyc Software Inc. -ileong@intrinsyc.com +support@intrinsyc.com diff -Nru a/Documentation/devices.txt b/Documentation/devices.txt --- a/Documentation/devices.txt Tue Feb 3 19:45:17 2004 +++ b/Documentation/devices.txt Tue Feb 3 19:45:17 2004 @@ -2526,15 +2526,15 @@ 1 = /dev/dri/card1 Second graphics card ... -227 char IBM 3270 terminal block-mode access +227 char IBM 3270 terminal Unix tty access + 1 = /dev/3270/tty1 First 3270 terminal + 2 = /dev/3270/tty2 Seconds 3270 terminal + ... + +228 char IBM 3270 terminal block-mode access 0 = /dev/3270/tub Controlling interface 1 = /dev/3270/tub1 First 3270 terminal 2 = /dev/3270/tub2 Second 3270 terminal - ... - -228 char IBM 3270 terminal Unix tty access - 1 = /dev/3270/tty1 First 3270 terminal - 2 = /dev/3270/tty2 Seconds 3270 terminal ... 229 char IBM iSeries virtual console diff -Nru a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt --- a/Documentation/dvb/contributors.txt Tue Feb 3 19:45:17 2004 +++ b/Documentation/dvb/contributors.txt Tue Feb 3 19:45:17 2004 @@ -8,7 +8,7 @@ Marcus Metzler Ralph Metzler - for their contining work on the DVB driver + for their continuing work on the DVB driver Michael Holzt for his contributions to the dvb-net driver @@ -58,5 +58,9 @@ for his work on the budget drivers, the demux code, the module unloading problems, ... +Hans-Frieder Vogt + for his work on calculating and checking the crc's for the + TechnoTrend/Hauppauge DEC driver firmware + (If you think you should be in this list, but you are not, drop a line to the DVB mailing list) diff -Nru a/Documentation/dvb/ttusb-dec.txt b/Documentation/dvb/ttusb-dec.txt --- a/Documentation/dvb/ttusb-dec.txt Tue Feb 3 19:45:43 2004 +++ b/Documentation/dvb/ttusb-dec.txt Tue Feb 3 19:45:43 2004 @@ -14,6 +14,7 @@ Hotplug firmware loader under 2.6 kernels In Progress: + DEC2540-t DEC3000-s To Do: @@ -23,21 +24,34 @@ Getting the Firmware -------------------- -Currently, the driver only works with v2.15a of the firmware. The firmwares -can be obtained in this way: +The firmware can be found in the software update zip files on this page: +http://www.hauppauge.de/sw_dec.htm -wget http://hauppauge.lightpath.net/de/dec215a.exe -unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_T.bin -unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_S.bin +The firmwares are named as follows: +DEC2000-t: STB_PC_T.bin +DEC2540-t: STB_PC_X.bin +DEC3000-s: STB_PC_S.bin + +Note that firmwares since version 2.16 beta2 for the DEC2000-t give the device +the USB ID of the DEC3000-s. The driver copes with this. + +Instructions follow for retrieving version 2.16 of the firmware: + +wget http://hauppauge.lightpath.net/de/dec216.exe +unzip -j dec216.exe software/OEM/STB/App/Boot/STB_PC_T.bin +unzip -j dec216.exe software/OEM/STB/App/Boot/STB_PC_X.bin +unzip -j dec216.exe software/OEM/STB/App/Boot/STB_PC_S.bin Compilation Notes for 2.4 kernels --------------------------------- For 2.4 kernels the firmware for the DECs is compiled into the driver itself. -The firmwares are expected to be in /etc/dvb at compilation time. +The firmwares are expected to be in the build-2.4 directory at compilation +time. -mv STB_PC_T.bin /etc/dvb/dec2000t.bin -mv STB_PC_S.bin /etc/dvb/dec3000s.bin +mv STB_PC_T.bin build-2.4/dvb-ttusb-dec-2000t.fw +mv STB_PC_X.bin build-2.4/dvb-ttusb-dec-2540t.fw +mv STB_PC_S.bin build-2.4/dvb-ttusb-dec-3000s.fw Hotplug Firmware Loading for 2.6 kernels @@ -45,5 +59,6 @@ For 2.6 kernels the firmware is loaded at the point that the driver module is loaded. See linux/Documentation/dvb/firmware.txt for more information. -mv STB_PC_T.bin /usr/lib/hotplug/firmware/dvb-ttusb-dec-2000t-2.15a.fw -mv STB_PC_S.bin /usr/lib/hotplug/firmware/dvb-ttusb-dec-3000s-2.15a.fw +mv STB_PC_T.bin /usr/lib/hotplug/firmware/dvb-ttusb-dec-2000t.fw +mv STB_PC_X.bin /usr/lib/hotplug/firmware/dvb-ttusb-dec-2540t.fw +mv STB_PC_S.bin /usr/lib/hotplug/firmware/dvb-ttusb-dec-3000s.fw diff -Nru a/Documentation/fb/modedb.txt b/Documentation/fb/modedb.txt --- a/Documentation/fb/modedb.txt Tue Feb 3 19:45:35 2004 +++ b/Documentation/fb/modedb.txt Tue Feb 3 19:45:35 2004 @@ -51,10 +51,11 @@ Drivers that support modedb boot options Boot Name Cards Supported - ami - Amiga chipset frame buffer + amifb - Amiga chipset frame buffer aty128fb - ATI Rage128 / Pro frame buffer atyfb - ATI Mach64 frame buffer - tdfx - 3D Fx frame buffer + tdfxfb - 3D Fx frame buffer + tridentfb - Trident (Cyber)blade chipset frame buffer BTW, only a few drivers use this at the moment. Others are to follow (feel free to send patches). diff -Nru a/Documentation/fb/tridentfb.txt b/Documentation/fb/tridentfb.txt --- a/Documentation/fb/tridentfb.txt Tue Feb 3 19:45:17 2004 +++ b/Documentation/fb/tridentfb.txt Tue Feb 3 19:45:17 2004 @@ -11,10 +11,15 @@ How to use it? ============== -Just do your usual console work :) -When booting you can pass the following parameters -================================================== +When booting you can pass the video parameter. +video=tridentfb + +The parameters for tridentfb are concatenated with a ':' as in this example. + +video=tridentfb:800x600,bpp=16,noaccel + +The second level parameters that tridentfb understands are: noaccel - turns off acceleration (when it doesn't work for your card) accel - force text acceleration (for boards which by default are noacceled) diff -Nru a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt --- a/Documentation/filesystems/ntfs.txt Tue Feb 3 19:45:28 2004 +++ b/Documentation/filesystems/ntfs.txt Tue Feb 3 19:45:28 2004 @@ -272,6 +272,9 @@ Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog. +2.1.6: + - Fix minor bug in handling of compressed directories that fixes the + erroneous "du" and "stat" output people reported. 2.1.5: - Minor bug fix in attribute list attribute handling that fixes the I/O errors on "ls" of certain fragmented files found by at least two diff -Nru a/Documentation/i386/usb-legacy-support.txt b/Documentation/i386/usb-legacy-support.txt --- /dev/null Wed Dec 31 16:00:00 1969 +++ b/Documentation/i386/usb-legacy-support.txt Tue Feb 3 19:45:43 2004 @@ -0,0 +1,44 @@ +USB Legacy support +~~~~~~~~~~~~~~~~~~ + +Vojtech Pavlik , January 2004 + + +Also known as "USB Keyboard" or "USB Mouse support" in the BIOS Setup is a +feature that allows one to use the USB mouse and keyboard as if they were +their classic PS/2 counterparts. This means one can use an USB keyboard to +type in LILO for example. + +It has several drawbacks, though: + +1) On some machines, the emulated PS/2 mouse takes over even when no USB + mouse is present and a real PS/2 mouse is present. In that case the extra + features (wheel, extra buttons, touchpad mode) of the real PS/2 mouse may + not be available. + +2) If CONFIG_HIGHMEM64G is enabled, the PS/2 mouse emulation can cause + system crashes, because the SMM BIOS is not expecting to be in PAE mode. + The Intel E7505 is a typical machine where this happens. + +3) If AMD64 64-bit mode is enabled, again system crashes often happen, + because the SMM BIOS isn't expecting the CPU to be in 64-bit mode. The + BIOS manufacturers only test with Windows, and Windows doesn't do 64-bit + yet. + +Solutions: + +Problem 1) can be solved by loading the USB drivers prior to loading the +PS/2 mouse driver. Since the PS/2 mouse driver is in 2.6 compiled into +the kernel unconditionally, this means the USB drivers need to be +compiled-in, too. + +Problem 2) can currently only be solved by either disabling HIGHMEM64G +in the kernel config or USB Legacy support in the BIOS. A BIOS update +could help, but so far no such update exists. + +Problem 3) is usually fixed by a BIOS update. Check the board +manufacturers web site. If an update is not available, disable USB +Legacy support in the BIOS. If this alone doesn't help, try also adding +idle=poll on the kernel command line. The BIOS may be entering the SMM +on the HLT instruction as well. + diff -Nru a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt --- a/Documentation/i386/zero-page.txt Tue Feb 3 19:45:17 2004 +++ b/Documentation/i386/zero-page.txt Tue Feb 3 19:45:17 2004 @@ -28,8 +28,13 @@ 0xa0 16 bytes System description table truncated to 16 bytes. ( struct sys_desc_table_struct ) - 0xb0 - 0x1df Free. Add more parameters here if you really need them. + 0xb0 - 0x1c3 Free. Add more parameters here if you really need them. +0x1c4 unsigned long EFI system table pointer +0x1c8 unsigned long EFI memory descriptor size +0x1cc unsigned long EFI memory descriptor version +0x1d0 unsigned long EFI memory descriptor map pointer +0x1d4 unsigned long EFI memory descriptor map size 0x1e0 unsigned long ALT_MEM_K, alternative mem check, in Kb 0x1e8 char number of entries in E820MAP (below) 0x1e9 unsigned char number of entries in EDDBUF (below) diff -Nru a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt Tue Feb 3 19:45:43 2004 +++ b/Documentation/kernel-parameters.txt Tue Feb 3 19:45:43 2004 @@ -37,7 +37,7 @@ MCA MCA bus support is enabled. MDA MDA console support is enabled. MOUSE Appropriate mouse support is enabled. - MTD MTD support is nebaled. + MTD MTD support is enabled. NET Appropriate network support is enabled. NFS Appropriate NFS support is enabled. OSS OSS sound support is enabled. @@ -57,6 +57,7 @@ SMP The kernel is an SMP kernel. SPARC Sparc architecture is enabled. SWSUSP Software suspension is enabled. + TS Appropriate touchscreen support is enabled. USB USB support is enabled. V4L Video For Linux support is enabled. VGA The VGA console has been enabled. @@ -85,6 +86,9 @@ See header of drivers/scsi/53c7xx.c. See also Documentation/scsi/ncr53c7xx.txt. + 98busmouse.irq= [HW,MOUSE] PC-9801 Bus Mouse Driver + Format: , default is 13 + acpi= [HW,ACPI] Advanced Configuration and Power Interface Format: { force | off | ht } force -- enables ACPI for systems with default off @@ -92,6 +96,23 @@ ht -- run only enough ACPI to enable Hyper Threading See also Documentation/pm.txt. + acpi_pic_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode + Format: { level | edge } + level Force PIC-mode SCI to Level Trigger (default) + edge Force PIC-mode SCI to Edge Trigge + + acpi_irq_balance [HW,ACPI] ACPI will balance active IRQs + default in APIC mode + + acpi_irq_nobalance [HW,ACPI] ACPI will not move active IRQs (default) + default in PIC mode + + acpi_irq_pci= [HW,ACPI] If irq_balance, Clear listed IRQs for use by PCI + Format: ,... + + acpi_irq_isa= [HW,ACPI] If irq_balance, Mark listed IRQs used by ISA + Format: ,... + ad1816= [HW,OSS] Format: ,,, See also Documentation/sound/oss/AD1816. @@ -153,10 +174,11 @@ atascsi= [HW,SCSI] Atari SCSI - atkbd_set= [HW] Select keyboard code set + atkbd.set= [HW] Select keyboard code set Format: - - atkbd_reset [HW] Reset keyboard during initialization + atkbd.softrepeat= + [HW] Use software keyboard repeat + atkbd.reset= [HW] Reset keyboard during initialization autotest [IA64] @@ -372,13 +394,15 @@ noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing - i8042_direct [HW] Keyboard has been put into non-translated mode - by BIOS - i8042_dumbkbd [HW] Don't attempt to blink the leds - i8042_noaux [HW] Don't check for auxiliary (== mouse) port - i8042_nomux - i8042_reset [HW] Reset the controller during init and cleanup - i8042_unlock [HW] Unlock (ignore) the keylock + i8042.direct [HW] Put keyboard port into non-translated mode + i8042.dumbkbd [HW] Pretend that controlled can only read data from + keyboard and can not control its state + (Don't attempt to blink the leds) + i8042.noaux [HW] Don't check for auxiliary (== mouse) port + i8042.nomux [HW] Don't check presence of an active multiplexing + controller + i8042.reset [HW] Reset the controller during init and cleanup + i8042.unlock [HW] Unlock (ignore) the keylock i810= [HW,DRM] @@ -414,7 +438,7 @@ initrd= [BOOT] Specify the location of the initial ramdisk - inport_irq= [HW] Inport (ATI XL and Microsoft) busmouse driver + inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver Format: inttest= [IA64] @@ -462,7 +486,7 @@ lockd.tcpport= [NFS] - logibm_irq= [HW,MOUSE] Logitech Bus Mouse Driver + logibm.irq= [HW,MOUSE] Logitech Bus Mouse Driver Format: log_buf_len=n Sets the size of the printk ring buffer, in bytes. @@ -562,6 +586,11 @@ mga= [HW,DRM] + mousedev.xres [MOUSE] Horizontal screen resolution, used for devices + reporting absolute coordinates, such as tablets + mousedev.yres [MOUSE] Vertical screen resolution, used for devices + reporting absolute coordinates, such as tablets + mpu401= [HW,OSS] Format: , @@ -795,12 +824,18 @@ before loading. See Documentation/ramdisk.txt. - psmouse_proto= [HW,MOUSE] Highest PS2 mouse protocol extension to + psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to probe for (bare|imps|exps). - - psmouse_resetafter= + psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports + per second. + psmouse.resetafter= [HW,MOUSE] Try to reset Synaptics Touchpad after so many bad packets (0 = never). + psmouse.resolution= + [HW,MOUSE] Set desired mouse resolution, in dpi. + psmouse.smartscroll= + [HW,MOUSE] Controls Logitech smartscroll autorepeat, + 0 = disabled, 1 = enabled (default). pss= [HW,OSS] Personal Sound System (ECHO ESC614) Format: ,,,,, @@ -1118,6 +1153,9 @@ trix= [HW,OSS] MediaTrix AudioTrix Pro Format: ,,,,,,,, + tsdev.xres [TS] Horizontal screen resolution. + tsdev.yres [TS] Vertical screen resolution. + u14-34f= [HW,SCSI] UltraStor 14F/34F SCSI host adapter See header of drivers/scsi/u14-34f.c. diff -Nru a/Documentation/m68k/00-INDEX b/Documentation/m68k/00-INDEX --- a/Documentation/m68k/00-INDEX Tue Feb 3 19:45:17 2004 +++ b/Documentation/m68k/00-INDEX Tue Feb 3 19:45:17 2004 @@ -1,7 +1,5 @@ 00-INDEX - this file -framebuffer.txt - - info about the Linux/m68k frame buffer device kernel-options.txt - command line options for Linux/m68k diff -Nru a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt --- a/Documentation/networking/ip-sysctl.txt Tue Feb 3 19:45:17 2004 +++ b/Documentation/networking/ip-sysctl.txt Tue Feb 3 19:45:17 2004 @@ -667,6 +667,13 @@ valid temporary addresses. Default: 5 +max_addresses - INTEGER + Number of maximum addresses per interface. 0 disables limitation. + It is recommended not set too large value (or 0) because it would + be too easy way to crash kernel to allow to create too much of + autoconfigured addresses. + Default: 16 + icmp/*: ratelimit - INTEGER Limit the maximal rates for sending ICMPv6 packets. diff -Nru a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt --- a/Documentation/networking/sk98lin.txt Tue Feb 3 19:45:33 2004 +++ b/Documentation/networking/sk98lin.txt Tue Feb 3 19:45:33 2004 @@ -2,9 +2,9 @@ All rights reserved =========================================================================== -sk98lin.txt created 23-Sep-2003 +sk98lin.txt created 15-Dec-2003 -Readme File for sk98lin v6.18 +Readme File for sk98lin v6.21 Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX This file contains @@ -466,7 +466,7 @@ Link Aggregation according to IEEE standards 802.1, 802.1q, and 802.3ad. These features are only available after installation of open source modules available on the Internet: -For VLAN go to: http://scry.wanfear.com/~greear/vlan.html +For VLAN go to: http://www.candelatech.com/~greear/vlan.html For Link Aggregation go to: http://www.st.rim.or.jp/~yumo NOTE: SysKonnect GmbH does not offer any support for these open source diff -Nru a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt --- a/Documentation/power/swsusp.txt Tue Feb 3 19:45:16 2004 +++ b/Documentation/power/swsusp.txt Tue Feb 3 19:45:16 2004 @@ -17,13 +17,30 @@ You need to append resume=/dev/your_swap_partition to kernel command line. Then you suspend by echo 4 > /proc/acpi/sleep. -[Notice. Rest docs is pretty outdated (see date!) It should be safe to -use swsusp on ext3/reiserfs these days.] +Pavel's unreliable guide to swsusp mess +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +There are currently two versions of swap suspend in the kernel, the old +"Pavel's" version in kernel/power/swsusp.c and the new "Patrick's" +version in kernel/power/pmdisk.c. They provide the same functionality; +the old version looks ugly but was tested, while the new version looks +nicer but did not receive so much testing. echo 4 > /proc/acpi/sleep +calls the old version, echo disk > /sys/power/state calls the new one. + +[In the future, when the new version is stable enough, two things can +happen: + +* the new version is moved into swsusp.c, and swsusp is renamed to swap + suspend (Pavel prefers this) + +* pmdisk is kept as is and swsusp.c is removed from the kernel] + Article about goals and implementation of Software Suspend for Linux +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Author: G‚ábor Kuti -Last revised: 2002-04-08 +Last revised: 2003-10-20 by Pavel Machek Idea and goals to achieve @@ -36,84 +53,23 @@ interrupt our programs so processes that are calculating something for a long time shouldn't need to be written interruptible. -On desk machines the power saving function isn't as important as it is in -laptops but we really may benefit from the second one. Nowadays the number of -desk machines supporting suspend function in their APM is going up but there -are (and there will still be for a long time) machines that don't even support -APM of any kind. On the other hand it is reported that using APM's suspend -some irqs (e.g. ATA disk irq) is lost and it is annoying for the user until -the Linux kernel resets the device. - -So I started thinking about implementing Software Suspend which doesn't need -any APM support and - since it uses pretty near only high-level routines - is -supposed to be architecture independent code. - Using the code -The code is experimental right now - testers, extra eyes are welcome. To -compile this support into the kernel, you need CONFIG_EXPERIMENTAL, -and then CONFIG_SOFTWARE_SUSPEND in menu General Setup to be enabled. It -cannot be used as a module and I don't think it will ever be needed. - -You have two ways to use this code. The first one is if you've compiled in -sysrq support then you may press Sysrq-D to request suspend. The other way -is with a patched SysVinit (my patch is against 2.76 and available at my -home page). You might call 'swsusp' or 'shutdown -z