Skip to content

Commit

Permalink
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/jikos/trivial

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...
  • Loading branch information
torvalds committed Aug 4, 2010
2 parents 5cf6571 + 0ea6e61 commit 3cfc2c4
Show file tree
Hide file tree
Showing 310 changed files with 461 additions and 574 deletions.
6 changes: 3 additions & 3 deletions Documentation/ABI/testing/sysfs-devices-memory
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description:
added or removed dynamically to represent hot-add/remove
operations.
Users: hotplug memory add/remove tools
https://w3.opensource.ibm.com/projects/powerpc-utils/
http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils

What: /sys/devices/system/memory/memoryX/removable
Date: June 2008
Expand All @@ -19,7 +19,7 @@ Description:
identify removable sections of the memory before attempting
potentially expensive hot-remove memory operation
Users: hotplug memory remove tools
https://w3.opensource.ibm.com/projects/powerpc-utils/
http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils

What: /sys/devices/system/memory/memoryX/phys_device
Date: September 2008
Expand Down Expand Up @@ -58,7 +58,7 @@ Description:
by root to offline that section.
# echo offline > /sys/devices/system/memory/memory22/state
Users: hotplug memory remove tools
https://w3.opensource.ibm.com/projects/powerpc-utils/
http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils


What: /sys/devices/system/memoryX/nodeY
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-devices-system-cpu
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Description: These files exist in every cpu's cache index directories.
Currently, only AMD Family 10h Processors support cache index
disable, and only for their L3 caches. See the BIOS and
Kernel Developer's Guide at
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
http://support.amd.com/us/Embedded_TechDocs/31116-Public-GH-BKDG_3-28_5-28-09.pdf
for formatting information and other details on the
cache index disable.
Users: [email protected]
12 changes: 6 additions & 6 deletions Documentation/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>

Mkinitrd
--------
o <ftp://rawhide.redhat.com/pub/rawhide/SRPMS/SRPMS/>
o <https://code.launchpad.net/initrd-tools/main>

E2fsprogs
---------
Expand All @@ -343,11 +343,11 @@ o <http://jfs.sourceforge.net/>

Reiserfsprogs
-------------
o <http://www.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.3.tar.gz>
o <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>

Xfsprogs
--------
o <ftp://oss.sgi.com/projects/xfs/download/>
o <ftp://oss.sgi.com/projects/xfs/>

Pcmciautils
-----------
Expand Down Expand Up @@ -387,18 +387,18 @@ o <http://sourceforge.net/projects/fuse>

mcelog
------
o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/mcelog/>
o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/>

Networking
**********

PPP
---
o <ftp://ftp.samba.org/pub/ppp/ppp-2.4.0.tar.gz>
o <ftp://ftp.samba.org/pub/ppp/>

Isdn4k-utils
------------
o <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils.v3.1pre1.tar.gz>
o <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/>

NFS-utils
---------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocBook/scsi.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
</para>
<para>
For documentation see
<ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink>
<ulink url='http://sg.danny.cz/sg/sdebug26.html'>http://sg.danny.cz/sg/sdebug26.html</ulink>
</para>
<!-- !Edrivers/scsi/scsi_debug.c -->
</sect2>
Expand Down
5 changes: 3 additions & 2 deletions Documentation/DocBook/v4l/compat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1091,8 +1091,9 @@ signed 64-bit integer. Output devices should not send a buffer out
until the time in the timestamp field has arrived. I would like to
follow SGI's lead, and adopt a multimedia timestamping system like
their UST (Unadjusted System Time). See
http://reality.sgi.com/cpirazzi_engr/lg/time/intro.html. [This link is
no longer valid.] UST uses timestamps that are 64-bit signed integers
http://web.archive.org/web/*/http://reality.sgi.com
/cpirazzi_engr/lg/time/intro.html.
UST uses timestamps that are 64-bit signed integers
(not struct timeval's) and given in nanosecond units. The UST clock
starts at zero when the system is booted and runs continuously and
uniformly. It takes a little over 292 years for UST to overflow. There
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocBook/v4l/fdl-appendix.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
The GNU Free Documentation License 1.1 in DocBook
Markup by Eric Baudais <[email protected]>
Maintained by the GNOME Documentation Project
http://developer.gnome.org/projects/gdp
http://live.gnome.org/DocumentationProject
Version: 1.0.1
Last Modified: Nov 16, 2000
-->
Expand Down
6 changes: 3 additions & 3 deletions Documentation/HOWTO
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ apply a patch.
If you do not know where you want to start, but you want to look for
some task to start doing to join into the kernel development community,
go to the Linux Kernel Janitor's project:
http://janitor.kernelnewbies.org/
http://kernelnewbies.org/KernelJanitors
It is a great place to start. It describes a list of relatively simple
problems that need to be cleaned up and fixed within the Linux kernel
source tree. Working with the developers in charge of this project, you
Expand Down Expand Up @@ -315,7 +315,7 @@ process is tracked with the tool patchwork. Patchwork offers a web
interface which shows patch postings, any comments on a patch or
revisions to it, and maintainers can mark patches as under review,
accepted, or rejected. Most of these patchwork sites are listed at
http://patchwork.kernel.org/ or http://patchwork.ozlabs.org/.
http://patchwork.kernel.org/.

2.6.x -next kernel tree for integration tests
---------------------------------------------
Expand Down Expand Up @@ -595,7 +595,7 @@ start exactly where you are now.

----------
Thanks to Paolo Ciarrocchi who allowed the "Development Process"
(http://linux.tar.bz/articles/2.6-development_process) section
(http://lwn.net/Articles/94386/) section
to be based on text he had written, and to Randy Dunlap and Gerrit
Huizenga for some of the list of things you should and should not say.
Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/PCI/pci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ to be handled by platform and generic code, not individual drivers.
8. Vendor and device identifications
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

One is not not required to add new device ids to include/linux/pci_ids.h.
One is not required to add new device ids to include/linux/pci_ids.h.
Please add PCI_VENDOR_ID_xxx for vendors and a hex constant for device ids.

PCI_VENDOR_ID_xxx constants are re-used. The device ids are arbitrary
Expand Down
2 changes: 1 addition & 1 deletion Documentation/RCU/RTFP.txt
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ Suparna Bhattacharya"
,Year="2006"
,pages="v2 123-138"
,note="Available:
\url{http://www.linuxsymposium.org/2006/view_abstract.php?content_key=184}
\url{http://www.linuxsymposium.org/2006/index_2006.php}
\url{http://www.rdrop.com/users/paulmck/RCU/OLSrtRCU.2006.08.11a.pdf}
[Viewed January 1, 2007]"
,annotation="
Expand Down
2 changes: 1 addition & 1 deletion Documentation/SubmittingDrivers
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ How to NOT write kernel driver by Arjan van de Ven:
http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf

Kernel Janitor:
http://janitor.kernelnewbies.org/
http://kernelnewbies.org/KernelJanitors

GIT, Fast Version Control System:
http://git-scm.com/
2 changes: 1 addition & 1 deletion Documentation/aoe/aoe.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The EtherDrive (R) HOWTO for users of 2.6 kernels is found at ...

http://www.coraid.com/support/linux/EtherDrive-2.6-HOWTO.html
http://www.coraid.com/SUPPORT/EtherDrive-HBA

It has many tips and hints!

Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/IXP2000
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ telecom systems. In addition to an XScale core, it contains up to 8
interfaces (UTOPIA, SPI, etc), a PCI host bridge, one serial port,
flash interface, and some other odds and ends. For more information, see:

http://developer.intel.com/design/network/products/npfamily/ixp2xxx.htm
http://developer.intel.com

2. Linux Support

Expand Down
14 changes: 6 additions & 8 deletions Documentation/arm/IXP4xx
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ require the use of Intel's propietary CSR softare:
If you need to use any of the above, you need to download Intel's
software from:

http://developer.intel.com/design/network/products/npfamily/ixp425swr1.htm
http://developer.intel.com/design/network/products/npfamily/ixp425.htm

DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPIETARY
SOFTWARE.

There are several websites that provide directions/pointers on using
Intel's software:

http://ixp4xx-osdg.sourceforge.net/
http://sourceforge.net/projects/ixp4xx-osdg/
Open Source Developer's Guide for using uClinux and the Intel libraries

http://gatewaymaker.sourceforge.net/
Expand Down Expand Up @@ -112,21 +112,21 @@ http://www.adiengineering.com/productsCoyote.html
Finally, there is an IDE port hanging off the expansion bus.

Gateworks Avila Network Platform
http://www.gateworks.com/avila_sbc.htm
http://www.gateworks.com/support/overview.php

The Avila platform is basically and IXDP425 with the 4 PCI slots
replaced with mini-PCI slots and a CF IDE interface hanging off
the expansion bus.

Intel IXDP425 Development Platform
http://developer.intel.com/design/network/products/npfamily/ixdp425.htm
http://www.intel.com/design/network/products/npfamily/ixdpg425.htm

This is Intel's standard reference platform for the IXDP425 and is
also known as the Richfield board. It contains 4 PCI slots, 16MB
of flash, two 10/100 ports and one ADSL port.

Intel IXDP465 Development Platform
http://developer.intel.com/design/network/products/npfamily/ixdp465.htm
http://www.intel.com/design/network/products/npfamily/ixdp465.htm

This is basically an IXDP425 with an IXP465 and 32M of flash instead
of just 16.
Expand All @@ -141,15 +141,13 @@ Intel IXDPG425 Development Platform
a pivot_root to NFS.

Motorola PrPMC1100 Processor Mezanine Card
http://www.fountainsys.com/datasheet/PrPMC1100.pdf
http://www.fountainsys.com

The PrPMC1100 is based on the IXCP1100 and is meant to plug into
and IXP2400/2800 system to act as the system controller. It simply
contains a CPU and 16MB of flash on the board and needs to be
plugged into a carrier board to function. Currently Linux only
supports the Motorola PrPMC carrier board for this platform.
See https://mcg.motorola.com/us/ds/pdf/ds0144.pdf for info
on the carrier board.

5. TODO LIST

Expand Down
4 changes: 2 additions & 2 deletions Documentation/arm/README
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ Bug reports etc
---------------

Please send patches to the patch system. For more information, see
http://www.arm.linux.org.uk/patches/info.html Always include some
http://www.arm.linux.org.uk/developer/patches/info.php Always include some
explanation as to what the patch does and why it is needed.

Bug reports should be sent to [email protected],
or submitted through the web form at
http://www.arm.linux.org.uk/forms/solution.shtml
http://www.arm.linux.org.uk/developer/

When sending bug reports, please ensure that they contain all relevant
information, eg. the kernel messages that were printed before/during
Expand Down
5 changes: 2 additions & 3 deletions Documentation/arm/SA1100/Assabet
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ The Intel Assabet (SA-1110 evaluation) board
============================================

Please see:
http://developer.intel.com/design/strong/quicklist/eval-plat/sa-1110.htm
http://developer.intel.com/design/strong/guides/278278.htm
http://developer.intel.com

Also some notes from John G Dorsey <[email protected]>:
http://www.cs.cmu.edu/~wearable/software/assabet.html
Expand Down Expand Up @@ -64,7 +63,7 @@ Initial RedBoot configuration
-----------------------------

The commands used here are explained in The RedBoot User's Guide available
on-line at http://sources.redhat.com/ecos/docs-latest/redboot/redboot.html.
on-line at http://sources.redhat.com/ecos/docs.html.
Please refer to it for explanations.

If you have a CF network card (my Assabet kit contained a CF+ LP-E from
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Brutus
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Brutus is an evaluation platform for the SA1100 manufactured by Intel.
For more details, see:

http://developer.intel.com/design/strong/applnots/sa1100lx/getstart.htm
http://developer.intel.com

To compile for Brutus, you must issue the following commands:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/FreeBird
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Freebird-1.1 is produced by Legned(C) ,Inc.
(http://www.legend.com.cn)
http://web.archive.org/web/*/http://www.legend.com.cn
and software/linux mainatined by Coventive(C),Inc.
(http://www.coventive.com)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/GraphicsClient
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Supported peripherals:
- serial ports (ttyS[0-2])
- ttyS0 is default for serial console
- Smart I/O (ADC, keypad, digital inputs, etc)
See http://www.applieddata.com/developers/linux for IOCTL documentation
See http://www.eurotech-inc.com/linux-sbc.asp for IOCTL documentation
and example user space code. ps/2 keybd is multiplexed through this driver

To do:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/GraphicsMaster
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Supported peripherals:
- serial ports (ttyS[0-2])
- ttyS0 is default for serial console
- Smart I/O (ADC, keypad, digital inputs, etc)
See http://www.applieddata.com/developers/linux for IOCTL documentation
See http://www.eurotech-inc.com/linux-sbc.asp for IOCTL documentation
and example user space code. ps/2 keybd is multiplexed through this driver

To do:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Itsy
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ research projects at Compaq that are related to pocket computing.

For more information, see:

http://www.research.digital.com/wrl/itsy/index.html
http://www.hpl.hp.com/downloads/crl/itsy/

Notes on initial 2.4 Itsy support (8/27/2000) :
The port was done on an Itsy version 1.5 machine with a daughtercard with
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/PLEB
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ PLEB support has yet to be fully integrated.

For more information, see:

http://www.cse.unsw.edu.au/~pleb/
http://www.cse.unsw.edu.au


2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Victor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VisuAide, Inc. to be used by blind people.

For more information related to Victor, see:

http://www.visuaide.com/victor
http://www.humanware.com/en-usa/products

Of course Victor is using Linux as its main operating system.
The Victor implementation for Linux is maintained by Nicolas Pitre:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/nanoEngine
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ for more info.
(Ref: Stuart Adams <[email protected]>)

Also visit Larry Doolittle's "Linux for the nanoEngine" site:
http://recycle.lbl.gov/~ldoolitt/bse/
http://www.brightstareng.com/arm/nanoeng.htm

2 changes: 1 addition & 1 deletion Documentation/binfmt_misc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@ cause unexpected behaviour and can be a security hazard.


There is a web page about binfmt_misc at
http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html
http://www.tat.physik.uni-tuebingen.de

Richard Günther <[email protected]>
2 changes: 1 addition & 1 deletion Documentation/blockdev/paride.txt
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,6 @@ have in your mail headers, when sending mail to the list server.
You might also find some useful information on the linux-parport
web pages (although they are not always up to date) at

http://www.torque.net/parport/
http://web.archive.org/web/*/http://www.torque.net/parport/


2 changes: 1 addition & 1 deletion Documentation/cdrom/packet-writing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Using the pktcdvd sysfs interface

Since Linux 2.6.20, the pktcdvd module has a sysfs interface
and can be controlled by it. For example the "pktcdvd" tool uses
this interface. (see http://people.freenet.de/BalaGi#pktcdvd )
this interface. (see http://tom.ist-im-web.de/download/pktcdvd )

"pktcdvd" works similar to "pktsetup", e.g.:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/cgroups/cpusets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ There are ways to query or modify cpusets:
cat, rmdir commands from the shell, or their equivalent from C.
- via the C library libcpuset.
- via the C library libcgroup.
(http://sourceforge.net/proects/libcg/)
(http://sourceforge.net/projects/libcg/)
- via the python application cset.
(http://developer.novell.com/wiki/index.php/Cpuset)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/development-process/4.Coding
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ With sparse, the programmer can be warned about confusion between
user-space and kernel-space addresses, mixture of big-endian and
small-endian quantities, the passing of integer values where a set of bit
flags is expected, and so on. Sparse must be installed separately (it can
be found at http://www.kernel.org/pub/software/devel/sparse/ if your
be found at https://sparse.wiki.kernel.org/index.php/Main_Page if your
distributor does not package it); it can then be run on the code by adding
"C=1" to your make command.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/device-mapper/dm-crypt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Example scripts
===============
LUKS (Linux Unified Key Setup) is now the preferred way to set up disk
encryption with dm-crypt using the 'cryptsetup' utility, see
http://luks.endorphin.org/
http://clemens.endorphin.org/cryptography

[[
#!/bin/sh
Expand Down
Loading

0 comments on commit 3cfc2c4

Please sign in to comment.