Commit f5bb3a5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
  Jesper Juhl is the new trivial patches maintainer
  Documentation: mention email-clients.txt in SubmittingPatches
  fs/binfmt_elf.c: spello fix
  do_invalidatepage() comment typo fix
  Documentation/filesystems/porting fixes
  typo fixes in net/core/net_namespace.c
  typo fix in net/rfkill/rfkill.c
  typo fixes in net/sctp/sm_statefuns.c
  lib/: Spelling fixes
  kernel/: Spelling fixes
  include/scsi/: Spelling fixes
  include/linux/: Spelling fixes
  include/asm-m68knommu/: Spelling fixes
  include/asm-frv/: Spelling fixes
  fs/: Spelling fixes
  drivers/watchdog/: Spelling fixes
  drivers/video/: Spelling fixes
  drivers/ssb/: Spelling fixes
  drivers/serial/: Spelling fixes
  drivers/scsi/: Spelling fixes
  ...
parents 9853832c 1560a79a
...@@ -508,12 +508,8 @@ D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver ...@@ -508,12 +508,8 @@ D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver
S: Germany S: Germany
N: Adrian Bunk N: Adrian Bunk
E: bunk@stusta.de
P: 1024D/4F12B400 B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400 P: 1024D/4F12B400 B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400
D: misc kernel hacking and testing D: misc kernel hacking and testing
S: Grasmeierstrasse 11
S: 80805 Muenchen
S: Germany
N: Ray Burr N: Ray Burr
E: ryb@nightmare.com E: ryb@nightmare.com
...@@ -1124,6 +1120,9 @@ S: 1150 Ringwood Court ...@@ -1124,6 +1120,9 @@ S: 1150 Ringwood Court
S: San Jose, California 95131 S: San Jose, California 95131
S: USA S: USA
N: Adam Fritzler
E: mid@zigamorph.net
N: Fernando Fuganti N: Fernando Fuganti
E: fuganti@conectiva.com.br E: fuganti@conectiva.com.br
E: fuganti@netbank.com.br E: fuganti@netbank.com.br
......
...@@ -154,7 +154,7 @@ firmware_class/ ...@@ -154,7 +154,7 @@ firmware_class/
- request_firmware() hotplug interface info. - request_firmware() hotplug interface info.
floppy.txt floppy.txt
- notes and driver options for the floppy disk driver. - notes and driver options for the floppy disk driver.
fujitsu/ frv/
- Fujitsu FR-V Linux documentation. - Fujitsu FR-V Linux documentation.
gpio.txt gpio.txt
- overview of GPIO (General Purpose Input/Output) access conventions. - overview of GPIO (General Purpose Input/Output) access conventions.
...@@ -364,8 +364,6 @@ sharedsubtree.txt ...@@ -364,8 +364,6 @@ sharedsubtree.txt
- a description of shared subtrees for namespaces. - a description of shared subtrees for namespaces.
smart-config.txt smart-config.txt
- description of the Smart Config makefile feature. - description of the Smart Config makefile feature.
smp.txt
- a few notes on symmetric multi-processing.
sony-laptop.txt sony-laptop.txt
- Sony Notebook Control Driver (SNC) Readme. - Sony Notebook Control Driver (SNC) Readme.
sonypi.txt sonypi.txt
......
...@@ -220,20 +220,8 @@ decreasing the likelihood of your MIME-attached change being accepted. ...@@ -220,20 +220,8 @@ decreasing the likelihood of your MIME-attached change being accepted.
Exception: If your mailer is mangling patches then someone may ask Exception: If your mailer is mangling patches then someone may ask
you to re-send them using MIME. you to re-send them using MIME.
See Documentation/email-clients.txt for hints about configuring
WARNING: Some mailers like Mozilla send your messages with your e-mail client so that it sends your patches untouched.
---- message header ----
Content-Type: text/plain; charset=us-ascii; format=flowed
---- message header ----
The problem is that "format=flowed" makes some of the mailers
on receiving side to replace TABs with spaces and do similar
changes. Thus the patches from you can look corrupted.
To fix this just make your mozilla defaults/pref/mailnews.js file to look like:
pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======
pref("mailnews.display.disable_format_flowed_support", true);
8) E-mail size. 8) E-mail size.
......
...@@ -32,7 +32,7 @@ BARRIER IO before the access to the SMC chip because the AEN latch ...@@ -32,7 +32,7 @@ BARRIER IO before the access to the SMC chip because the AEN latch
only needs occurs after the SMC IO write cycle. The routines that only needs occurs after the SMC IO write cycle. The routines that
implement this work-around make an additional concession which is to implement this work-around make an additional concession which is to
disable interrupts during the IO sequence. Other hardware devices disable interrupts during the IO sequence. Other hardware devices
(the LogicPD CPLD) have registers in the same the physical memory (the LogicPD CPLD) have registers in the same physical memory
region as the SMC chip. An interrupt might allow an access to one of region as the SMC chip. An interrupt might allow an access to one of
those registers while SMC IO is being performed. those registers while SMC IO is being performed.
......
...@@ -16,3 +16,7 @@ echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe ...@@ -16,3 +16,7 @@ echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe
chmod a+x /tmp/modprobe chmod a+x /tmp/modprobe
echo /tmp/modprobe > /proc/sys/kernel/modprobe echo /tmp/modprobe > /proc/sys/kernel/modprobe
Note that the above applies only when the *kernel* is requesting
that the module be loaded -- it won't have any effect if that module
is being loaded explicitly using "modprobe" from userspace.
...@@ -377,7 +377,7 @@ more explicit to have a method whereby userspace sees this divergence. ...@@ -377,7 +377,7 @@ more explicit to have a method whereby userspace sees this divergence.
Rather than have a group where some items behave differently than Rather than have a group where some items behave differently than
others, configfs provides a method whereby one or many subgroups are others, configfs provides a method whereby one or many subgroups are
automatically created inside the parent at its creation. Thus, automatically created inside the parent at its creation. Thus,
mkdir("parent) results in "parent", "parent/subgroup1", up through mkdir("parent") results in "parent", "parent/subgroup1", up through
"parent/subgroupN". Items of type 1 can now be created in "parent/subgroupN". Items of type 1 can now be created in
"parent/subgroup1", and items of type N can be created in "parent/subgroup1", and items of type N can be created in
"parent/subgroupN". "parent/subgroupN".
......
...@@ -28,7 +28,7 @@ Declare ...@@ -28,7 +28,7 @@ Declare
Use FOO_I(inode) instead of &inode->u.foo_inode_i; Use FOO_I(inode) instead of &inode->u.foo_inode_i;
Add foo_alloc_inode() and foo_destory_inode() - the former should allocate Add foo_alloc_inode() and foo_destroy_inode() - the former should allocate
foo_inode_info and return the address of ->vfs_inode, the latter should free foo_inode_info and return the address of ->vfs_inode, the latter should free
FOO_I(inode) (see in-tree filesystems for examples). FOO_I(inode) (see in-tree filesystems for examples).
......
...@@ -216,6 +216,7 @@ Table 1-3: Contents of the stat files (as of 2.6.22-rc3) ...@@ -216,6 +216,7 @@ Table 1-3: Contents of the stat files (as of 2.6.22-rc3)
priority priority level priority priority level
nice nice level nice nice level
num_threads number of threads num_threads number of threads
it_real_value (obsolete, always 0)
start_time time the process started after system boot start_time time the process started after system boot
vsize virtual memory size vsize virtual memory size
rss resident set memory size rss resident set memory size
......
...@@ -118,7 +118,7 @@ All this differs from the old initrd in several ways: ...@@ -118,7 +118,7 @@ All this differs from the old initrd in several ways:
with the new root (cd /newmount; mount --move . /; chroot .), attach with the new root (cd /newmount; mount --move . /; chroot .), attach
stdin/stdout/stderr to the new /dev/console, and exec the new init. stdin/stdout/stderr to the new /dev/console, and exec the new init.
Since this is a remarkably persnickity process (and involves deleting Since this is a remarkably persnickety process (and involves deleting
commands before you can run them), the klibc package introduced a helper commands before you can run them), the klibc package introduced a helper
program (utils/run_init.c) to do all this for you. Most other packages program (utils/run_init.c) to do all this for you. Most other packages
(such as busybox) have named this command "switch_root". (such as busybox) have named this command "switch_root".
......
...@@ -140,7 +140,7 @@ close() decrements the channel buffer's refcount. When the refcount ...@@ -140,7 +140,7 @@ close() decrements the channel buffer's refcount. When the refcount
In order for a user application to make use of relay files, the In order for a user application to make use of relay files, the
host filesystem must be mounted. For example, host filesystem must be mounted. For example,
mount -t debugfs debugfs /debug mount -t debugfs debugfs /sys/kernel/debug
NOTE: the host filesystem doesn't need to be mounted for kernel NOTE: the host filesystem doesn't need to be mounted for kernel
clients to create or use channels - it only needs to be clients to create or use channels - it only needs to be
......
...@@ -177,5 +177,5 @@ separated by spaces: ...@@ -177,5 +177,5 @@ separated by spaces:
(*) vdc=... (*) vdc=...
This option configures the MB93493 companion chip visual display This option configures the MB93493 companion chip visual display
driver. Please see Documentation/fujitsu/mb93493/vdc.txt for more driver. Please see Documentation/frv/mb93493/vdc.txt for more
information. information.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment