Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 232647
b: refs/heads/master
c: 7111ebc
h: refs/heads/master
i:
  232645: d2653d2
  232643: b0277ae
  232639: 48c56eb
v: v3
  • Loading branch information
Sarah Sharp committed Jan 14, 2011
1 parent c444572 commit d2e244f
Show file tree
Hide file tree
Showing 4,724 changed files with 105,929 additions and 249,366 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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: 3c47eb06f08eb970ea9d696bcdb57a175d37b470
refs/heads/master: 7111ebc97ed53a32314011c85a6f235f0dab8ae8
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
4 changes: 0 additions & 4 deletions trunk/Documentation/ABI/stable/thermal-notification
View file

This file was deleted.

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.
6 changes: 0 additions & 6 deletions trunk/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
View file

This file was deleted.

21 changes: 4 additions & 17 deletions trunk/Documentation/DocBook/80211.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@
!Finclude/net/mac80211.h ieee80211_ops
!Finclude/net/mac80211.h ieee80211_alloc_hw
!Finclude/net/mac80211.h ieee80211_register_hw
!Finclude/net/mac80211.h ieee80211_get_tx_led_name
!Finclude/net/mac80211.h ieee80211_get_rx_led_name
!Finclude/net/mac80211.h ieee80211_get_assoc_led_name
!Finclude/net/mac80211.h ieee80211_get_radio_led_name
!Finclude/net/mac80211.h ieee80211_unregister_hw
!Finclude/net/mac80211.h ieee80211_free_hw
</chapter>
Expand Down Expand Up @@ -378,23 +382,6 @@
</para>
</partintro>

<chapter id="led-support">
<title>LED support</title>
<para>
Mac80211 supports various ways of blinking LEDs. Wherever possible,
device LEDs should be exposed as LED class devices and hooked up to
the appropriate trigger, which will then be triggered appropriately
by mac80211.
</para>
!Finclude/net/mac80211.h ieee80211_get_tx_led_name
!Finclude/net/mac80211.h ieee80211_get_rx_led_name
!Finclude/net/mac80211.h ieee80211_get_assoc_led_name
!Finclude/net/mac80211.h ieee80211_get_radio_led_name
!Finclude/net/mac80211.h ieee80211_tpt_blink
!Finclude/net/mac80211.h ieee80211_tpt_led_trigger_flags
!Finclude/net/mac80211.h ieee80211_create_tpt_led_trigger
</chapter>

<chapter id="hardware-crypto-offload">
<title>Hardware crypto acceleration</title>
!Pinclude/net/mac80211.h Hardware crypto acceleration
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/dvb/dvbapi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<holder>Convergence GmbH</holder>
</copyright>
<copyright>
<year>2009-2011</year>
<year>2009-2010</year>
<holder>Mauro Carvalho Chehab</holder>
</copyright>

Expand Down
4 changes: 2 additions & 2 deletions trunk/Documentation/DocBook/media.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<title>LINUX MEDIA INFRASTRUCTURE API</title>

<copyright>
<year>2009-2011</year>
<year>2009-2010</year>
<holder>LinuxTV Developers</holder>
</copyright>

Expand Down Expand Up @@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled
</author>
</authorgroup>
<copyright>
<year>2009-2011</year>
<year>2009-2010</year>
<holder>Mauro Carvalho Chehab</holder>
</copyright>

Expand Down
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
6 changes: 2 additions & 4 deletions trunk/Documentation/DocBook/v4l/dev-rds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ as follows:</para>
</section>

<section>
<title>RDS datastructures</title>
<table frame="none" pgwide="1" id="v4l2-rds-data">
<title>struct
<structname>v4l2_rds_data</structname></title>
Expand Down Expand Up @@ -130,11 +129,10 @@ as follows:</para>

<table frame="none" pgwide="1" id="v4l2-rds-block-codes">
<title>Block defines</title>
<tgroup cols="4">
<tgroup cols="3">
<colspec colname="c1" colwidth="1*" />
<colspec colname="c2" colwidth="1*" />
<colspec colname="c3" colwidth="1*" />
<colspec colname="c4" colwidth="5*" />
<colspec colname="c3" colwidth="5*" />
<tbody valign="top">
<row>
<entry>V4L2_RDS_BLOCK_MSK</entry>
Expand Down
3 changes: 1 addition & 2 deletions trunk/Documentation/DocBook/v4l/v4l2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ Remote Controller chapter.</contrib>
<year>2008</year>
<year>2009</year>
<year>2010</year>
<year>2011</year>
<holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>
</copyright>
Expand Down Expand Up @@ -382,7 +381,7 @@ and discussions on the V4L mailing list.</revremark>
</partinfo>

<title>Video for Linux Two API Specification</title>
<subtitle>Revision 2.6.38</subtitle>
<subtitle>Revision 2.6.33</subtitle>

<chapter id="common">
&sub-common;
Expand Down
27 changes: 0 additions & 27 deletions trunk/Documentation/IPMI.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,33 +533,6 @@ completion during sending a panic event.
Other Pieces
------------

Get the detailed info related with the IPMI device
--------------------------------------------------

Some users need more detailed information about a device, like where
the address came from or the raw base device for the IPMI interface.
You can use the IPMI smi_watcher to catch the IPMI interfaces as they
come or go, and to grab the information, you can use the function
ipmi_get_smi_info(), which returns the following structure:

struct ipmi_smi_info {
enum ipmi_addr_src addr_src;
struct device *dev;
union {
struct {
void *acpi_handle;
} acpi_info;
} addr_info;
};

Currently special info for only for SI_ACPI address sources is
returned. Others may be added as necessary.

Note that the dev pointer is included in the above structure, and
assuming ipmi_smi_get_info returns success, you must call put_device
on the dev pointer.


Watchdog
--------

Expand Down
122 changes: 0 additions & 122 deletions trunk/Documentation/acpi/apei/output_format.txt
View file

This file was deleted.

27 changes: 0 additions & 27 deletions trunk/Documentation/cgroups/blkio-controller.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,33 +89,6 @@ Throttling/Upper Limit policy

Limits for writes can be put using blkio.write_bps_device file.

Hierarchical Cgroups
====================
- Currently none of the IO control policy supports hierarhical groups. But
cgroup interface does allow creation of hierarhical cgroups and internally
IO policies treat them as flat hierarchy.

So this patch will allow creation of cgroup hierarhcy but at the backend
everything will be treated as flat. So if somebody created a hierarchy like
as follows.

root
/ \
test1 test2
|
test3

CFQ and throttling will practically treat all groups at same level.

pivot
/ | \ \
root test1 test2 test3

Down the line we can implement hierarchical accounting/control support
and also introduce a new cgroup file "use_hierarchy" which will control
whether cgroup hierarchy is viewed as flat or hierarchical by the policy..
This is how memory controller also has implemented the things.

Various user visible config options
===================================
CONFIG_BLK_CGROUP
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
7 changes: 1 addition & 6 deletions trunk/Documentation/device-mapper/dm-crypt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> <offset>

<cipher>
Encryption cipher and an optional IV generation mode.
(In format cipher[:keycount]-chainmode-ivopts:ivmode).
(In format cipher-chainmode-ivopts:ivmode).
Examples:
des
aes-cbc-essiv:sha256
Expand All @@ -20,11 +20,6 @@ Parameters: <cipher> <key> <iv_offset> <device path> <offset>
Key used for encryption. It is encoded as a hexadecimal number.
You can only use key sizes that are valid for the selected cipher.

<keycount>
Multi-key compatibility mode. You can define <keycount> keys and
then sectors are encrypted according to their offsets (sector 0 uses key0;
sector 1 uses key1 etc.). <keycount> must be a power of two.

<iv_offset>
The IV offset is a sector count that is added to the sector number
before creating the IV.
Expand Down
Loading

0 comments on commit d2e244f

Please sign in to comment.