Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 230547
b: refs/heads/master
c: da5d1f4
h: refs/heads/master
i:
  230545: 2251412
  230543: 4818964
v: v3
  • Loading branch information
Yusuke Goda authored and Paul Mundt committed Jan 11, 2011
1 parent ab06c9c commit ce3113f
Show file tree
Hide file tree
Showing 2,107 changed files with 49,804 additions and 118,507 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 86f6f9b64a730844f1438cbedfacd6fb0170a7f7
refs/heads/master: da5d1f4c9001c0aa2092019bdfa8f41e9985d163
4 changes: 2 additions & 2 deletions trunk/CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2811,8 +2811,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
N: Stelian Pop
E: stelian@popies.net
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
D: random kernel hacks
S: Paimpont, France
D: sonypi, meye drivers, mct_u232 usb serial hacks
S: Paris, France

N: Pete Popov
E: pete_popov@yahoo.com
Expand Down
9 changes: 0 additions & 9 deletions trunk/Documentation/ABI/testing/sysfs-class-led
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,3 @@ Description:
scheduler is chosen. Trigger specific parameters can appear in
/sys/class/leds/<led> once a given trigger is selected.

What: /sys/class/leds/<led>/inverted
Date: January 2011
KernelVersion: 2.6.38
Contact: Richard Purdie <rpurdie@rpsys.net>
Description:
Invert the LED on/off state. This parameter is specific to
gpio and backlight triggers. In case of the backlight trigger,
it is usefull when driving a LED which is intended to indicate
a device in a standby like state.
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/mtdnand.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ static void board_hwcontrol(struct mtd_info *mtd, int cmd)
<title>Device ready function</title>
<para>
If the hardware interface has the ready busy pin of the NAND chip connected to a
GPIO or other accessible I/O pin, this function is used to read back the state of the
GPIO or other accesible I/O pin, this function is used to read back the state of the
pin. The function has no arguments and should return 0, if the device is busy (R/B pin
is low) and 1, if the device is ready (R/B pin is high).
If the hardware interface does not give access to the ready busy pin, then
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/cgroups/cgroup_event_listener.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ int main(int argc, char **argv)

if (ret == -1) {
perror("cgroup.event_control "
"is not accessible any more");
"is not accessable any more");
break;
}

Expand Down
8 changes: 4 additions & 4 deletions trunk/Documentation/cgroups/cgroups.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@ subsystems, type:

To change the set of subsystems bound to a mounted hierarchy, just
remount with different options:
# mount -o remount,cpuset,blkio hier1 /dev/cgroup
# mount -o remount,cpuset,ns hier1 /dev/cgroup

Now memory is removed from the hierarchy and blkio is added.
Now memory is removed from the hierarchy and ns is added.

Note this will add blkio to the hierarchy but won't remove memory or
Note this will add ns to the hierarchy but won't remove memory or
cpuset, because the new options are appended to the old ones:
# mount -o remount,blkio /dev/cgroup
# mount -o remount,ns /dev/cgroup

To Specify a hierarchy's release_agent:
# mount -t cgroup -o cpuset,release_agent="/sbin/cpuset_release_agent" \
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/cgroups/memcg_test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
written to move_charge_at_immigrate.

9.10 Memory thresholds
Memory controller implements memory thresholds using cgroups notification
Memory controler implements memory thresholds using cgroups notification
API. You can use Documentation/cgroups/cgroup_event_listener.c to test
it.

Expand Down
50 changes: 20 additions & 30 deletions trunk/Documentation/email-clients.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@ Then from the "Message" menu item, select insert file and choose your patch.
As an added bonus you can customise the message creation toolbar menu
and put the "insert file" icon there.

Make the the composer window wide enough so that no lines wrap. As of
KMail 1.13.5 (KDE 4.5.4), KMail will apply word wrapping when sending
the email if the lines wrap in the composer window. Having word wrapping
disabled in the Options menu isn't enough. Thus, if your patch has very
long lines, you must make the composer window very wide before sending
the email. See: https://bugs.kde.org/show_bug.cgi?id=174034

You can safely GPG sign attachments, but inlined text is preferred for
patches so do not GPG sign them. Signing patches that have been inserted
as inlined text will make them tricky to extract from their 7-bit encoding.
Expand Down Expand Up @@ -186,8 +179,26 @@ Sylpheed (GUI)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Thunderbird (GUI)

Thunderbird is an Outlook clone that likes to mangle text, but there are ways
to coerce it into behaving.
By default, thunderbird likes to mangle text, but there are ways to
coerce it into being nice.

- Under account settings, composition and addressing, uncheck "Compose
messages in HTML format".

- Edit your Thunderbird config settings to tell it not to wrap lines:
user_pref("mailnews.wraplength", 0);

- Edit your Thunderbird config settings so that it won't use format=flowed:
user_pref("mailnews.send_plaintext_flowed", false);

- You need to get Thunderbird into preformat mode:
. If you compose HTML messages by default, it's not too hard. Just select
"Preformat" from the drop-down box just under the subject line.
. If you compose in text by default, you have to tell it to compose a new
message in HTML (just as a one-off), and then force it from there back to
text, else it will wrap lines. To do this, use shift-click on the Write
icon to compose to get HTML compose mode, then select "Preformat" from
the drop-down box just under the subject line.

- Allows use of an external editor:
The easiest thing to do with Thunderbird and patches is to use an
Expand All @@ -197,27 +208,6 @@ to coerce it into behaving.
View->Toolbars->Customize... and finally just click on it when in the
Compose dialog.

To beat some sense out of the internal editor, do this:

- Under account settings, composition and addressing, uncheck "Compose
messages in HTML format".

- Edit your Thunderbird config settings so that it won't use format=flowed.
Go to "edit->preferences->advanced->config editor" to bring up the
thunderbird's registry editor, and set "mailnews.send_plaintext_flowed" to
"false".

- Enable "preformat" mode: Shft-click on the Write icon to bring up the HTML
composer, select "Preformat" from the drop-down box just under the subject
line, then close the message without saving. (This setting also applies to
the text composer, but the only control for it is in the HTML composer.)

- Install the "toggle wordwrap" extension. Download the file from:
https://addons.mozilla.org/thunderbird/addon/2351/
Then go to "tools->add ons", select "install" at the bottom of the screen,
and browse to where you saved the .xul file. This adds an "Enable
Wordwrap" entry under the Options menu of the message composer.

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
TkRat (GUI)

Expand Down
24 changes: 0 additions & 24 deletions trunk/Documentation/feature-removal-schedule.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,6 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's

---------------------------

What: CS5535/CS5536 obsolete GPIO driver
When: June 2011
Files: drivers/staging/cs5535_gpio/*
Check: drivers/staging/cs5535_gpio/cs5535_gpio.c
Why: A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
integrates with the Linux GPIO subsystem. The old driver has been
moved to staging, and will be removed altogether around 2.6.40.
Please test the new driver, and ensure that the functionality you
need and any bugfixes from the old driver are available in the new
one.
Who: Andres Salomon <dilinger@queued.net>

--------------------------

What: remove EXPORT_SYMBOL(kernel_thread)
When: August 2006
Files: arch/*/kernel/*_ksyms.c
Expand Down Expand Up @@ -590,13 +576,3 @@ Why: The functions have been superceded by cancel_delayed_work_sync()
Who: Tejun Heo <tj@kernel.org>

----------------------------

What: Legacy, non-standard chassis intrusion detection interface.
When: June 2011
Why: The adm9240, w83792d and w83793 hardware monitoring drivers have
legacy interfaces for chassis intrusion detection. A standard
interface has been added to each driver, so the legacy interface
can be removed.
Who: Jean Delvare <khali@linux-fr.org>

----------------------------
3 changes: 0 additions & 3 deletions trunk/Documentation/filesystems/ntfs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,6 @@ ChangeLog

Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.

2.1.30:
- Fix writev() (it kept writing the first segment over and over again
instead of moving onto subsequent segments).
2.1.29:
- Fix a deadlock when mounting read-write.
2.1.28:
Expand Down
9 changes: 0 additions & 9 deletions trunk/Documentation/filesystems/porting
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,3 @@ Documentation/filesystems/vfs.txt for more details.
on many or all directory inodes on the way down a path walk (to check for
exec permission). These must now be rcu-walk aware (flags & IPERM_RCU). See
Documentation/filesystems/vfs.txt for more details.

--
[mandatory]
In ->fallocate() you must check the mode option passed in. If your
filesystem does not support hole punching (deallocating space in the middle of a
file) you must return -EOPNOTSUPP if FALLOC_FL_PUNCH_HOLE is set in mode.
Currently you can only have FALLOC_FL_PUNCH_HOLE with FALLOC_FL_KEEP_SIZE set,
so the i_size should not change when hole punching, even when puching the end of
a file off.
2 changes: 1 addition & 1 deletion trunk/Documentation/gpio.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ setting up a platform_device using the GPIO, is mark its direction:
int gpio_direction_input(unsigned gpio);
int gpio_direction_output(unsigned gpio, int value);

The return value is zero for success, else a negative errno. It must
The return value is zero for success, else a negative errno. It should
be checked, since the get/set calls don't have error returns and since
misconfiguration is possible. You should normally issue these calls from
a task context. However, for spinlock-safe GPIOs it's OK to use them
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/hwmon/adm9240
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ connected to a normally open switch.
The ADM9240 provides an internal open drain on this line, and may output
a 20 ms active low pulse to reset an external Chassis Intrusion latch.

Clear the CI latch by writing value 0 to the sysfs intrusion0_alarm file.
Clear the CI latch by writing value 1 to the sysfs chassis_clear file.

Alarm flags reported as 16-bit word

Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/hwmon/ads7828
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Supported chips:
http://focus.ti.com/lit/ds/symlink/ads7828.pdf

Authors:
Steve Hardy <shardy@redhat.com>
Steve Hardy <steve@linuxrealtime.co.uk>

Module Parameters
-----------------
Expand Down
12 changes: 5 additions & 7 deletions trunk/Documentation/hwmon/dme1737
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Description
This driver implements support for the hardware monitoring capabilities of the
SMSC DME1737 and Asus A8000 (which are the same), SMSC SCH5027, SCH311x,
and SCH5127 Super-I/O chips. These chips feature monitoring of 3 temp sensors
temp[1-3] (2 remote diodes and 1 internal), 8 voltages in[0-7] (7 external and
temp[1-3] (2 remote diodes and 1 internal), 7 voltages in[0-6] (6 external and
1 internal) and up to 6 fan speeds fan[1-6]. Additionally, the chips implement
up to 5 PWM outputs pwm[1-3,5-6] for controlling fan speeds both manually and
automatically.
Expand Down Expand Up @@ -105,7 +105,6 @@ SCH5127:
in4: V1_IN 0V - 1.5V
in5: VTR (+3.3V standby) 0V - 4.38V
in6: Vbat (+3.0V) 0V - 4.38V
in7: Vtrip (+1.5V) 0V - 1.99V

Each voltage input has associated min and max limits which trigger an alarm
when crossed.
Expand Down Expand Up @@ -218,10 +217,10 @@ cpu0_vid RO CPU core reference voltage in
vrm RW Voltage regulator module version
number.

in[0-7]_input RO Measured voltage in millivolts.
in[0-7]_min RW Low limit for voltage input.
in[0-7]_max RW High limit for voltage input.
in[0-7]_alarm RO Voltage input alarm. Returns 1 if
in[0-6]_input RO Measured voltage in millivolts.
in[0-6]_min RW Low limit for voltage input.
in[0-6]_max RW High limit for voltage input.
in[0-6]_alarm RO Voltage input alarm. Returns 1 if
voltage input is or went outside the
associated min-max range, 0 otherwise.

Expand Down Expand Up @@ -325,4 +324,3 @@ fan5 opt opt
pwm5 opt opt
fan6 opt opt
pwm6 opt opt
in7 yes
22 changes: 0 additions & 22 deletions trunk/Documentation/hwmon/w83627hf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,3 @@ isaset -y -f 0x2e 0xaa

The above sequence assumes a Super-I/O config space at 0x2e/0x2f, but
0x4e/0x4f is also possible.

Voltage pin mapping
-------------------

Here is a summary of the voltage pin mapping for the W83627THF. This
can be useful to convert data provided by board manufacturers into
working libsensors configuration statements.

W83627THF |
Pin | Name | Register | Sysfs attribute
-----------------------------------------------------
100 | CPUVCORE | 20h | in0
99 | VIN0 | 21h | in1
98 | VIN1 | 22h | in2
97 | VIN2 | 24h | in4
114 | AVCC | 23h | in3
61 | 5VSB | 50h (bank 5) | in7
74 | VBAT | 51h (bank 5) | in8

For other supported devices, you'll have to take the hard path and
look up the information in the datasheet yourself (and then add it
to this document please.)
2 changes: 1 addition & 1 deletion trunk/Documentation/hwmon/w83793
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ This driver implements support for Winbond W83793G/W83793R chips.

* Chassis
If the case open alarm triggers, it will stay in this state unless cleared
by writing 0 to the sysfs file "intrusion0_alarm".
by any write to the sysfs file "chassis".

* VID and VRM
The VRM version is detected automatically, don't modify the it unless you
Expand Down
65 changes: 0 additions & 65 deletions trunk/Documentation/i2c/muxes/gpio-i2cmux
View file

This file was deleted.

4 changes: 1 addition & 3 deletions trunk/Documentation/input/ff.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ This information is subject to change.
#include <linux/input.h>
#include <sys/ioctl.h>

#define BITS_TO_LONGS(x) \
(((x) + 8 * sizeof (unsigned long) - 1) / (8 * sizeof (unsigned long)))
unsigned long features[BITS_TO_LONGS(FF_CNT)];
unsigned long features[1 + FF_MAX/sizeof(unsigned long)];
int ioctl(int file_descriptor, int request, unsigned long *features);

"request" must be EVIOCGBIT(EV_FF, size of features array in bytes )
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/ioctl/ioctl-number.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Code Seq#(hex) Include File Comments
'p' 40-7F linux/nvram.h
'p' 80-9F linux/ppdev.h user-space parport
<mailto:tim@cyberelk.net>
'p' A1-A5 linux/pps.h LinuxPPS
'p' A1-A4 linux/pps.h LinuxPPS
<mailto:giometti@linux.it>
'q' 00-1F linux/serio.h
'q' 80-FF linux/telephony.h Internet PhoneJACK, Internet LineJACK
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/iostats.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Field 9 -- # of I/Os currently in progress
The only field that should go to zero. Incremented as requests are
given to appropriate struct request_queue and decremented as they finish.
Field 10 -- # of milliseconds spent doing I/Os
This field increases so long as field 9 is nonzero.
This field is increases so long as field 9 is nonzero.
Field 11 -- weighted # of milliseconds spent doing I/Os
This field is incremented at each I/O start, I/O completion, I/O
merge, or read of these stats by the number of I/Os in progress
Expand Down
Loading

0 comments on commit ce3113f

Please sign in to comment.