Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 265151
b: refs/heads/master
c: 1b4c8af
h: refs/heads/master
i:
  265149: d87c1fa
  265147: daab8ac
  265143: 0136d08
  265135: 618f26e
  265119: 26a4cff
  265087: c5b0c1d
v: v3
  • Loading branch information
David S. Miller committed Aug 1, 2011
1 parent c6cd552 commit 4e7d916
Show file tree
Hide file tree
Showing 2,746 changed files with 37,347 additions and 70,243 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: 1be025d3cb40cd295123af2c394f7229ef9b30ca
refs/heads/master: 1b4c8af8d2e9bfb474f233b010988ec008ae2ffa
2 changes: 0 additions & 2 deletions trunk/Documentation/00-INDEX
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ printk-formats.txt
- how to get printk format specifiers right
prio_tree.txt
- info on radix-priority-search-tree use for indexing vmas.
ramoops.txt
- documentation of the ramoops oops/panic logging module.
rbtree.txt
- info on what red-black trees are and what they are for.
robust-futex-ABI.txt
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/ABI/removed/o2cb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
What: /sys/o2cb symlink
Date: May 2011
KernelVersion: 3.0
KernelVersion: 2.6.40
Contact: ocfs2-devel@oss.oracle.com
Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
removed when new versions of ocfs2-tools which know to look
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/ABI/removed/raw1394
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Description:
/dev/raw1394 was a character device file that allowed low-level
access to FireWire buses. Its major drawbacks were its inability
to implement sensible device security policies, and its low level
of abstraction that required userspace clients to duplicate much
of abstraction that required userspace clients do duplicate much
of the kernel's ieee1394 core functionality.
Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
firewire-core.
Expand Down
23 changes: 0 additions & 23 deletions trunk/Documentation/ABI/testing/evm
View file

This file was deleted.

6 changes: 0 additions & 6 deletions trunk/Documentation/ABI/testing/pstore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,3 @@ Description: Generic interface to platform dependent persistent storage.
multiple) files based on the record size of the underlying
persistent storage until at least this amount is reached.
Default is 10 Kbytes.

Pstore only supports one backend at a time. If multiple
backends are available, the preferred backend may be
set by passing the pstore.backend= argument to the kernel at
boot time.

8 changes: 4 additions & 4 deletions trunk/Documentation/ABI/testing/sysfs-bus-bcma
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
What: /sys/bus/bcma/devices/.../manuf
Date: May 2011
KernelVersion: 3.0
KernelVersion: 2.6.40
Contact: Rafał Miłecki <zajec5@gmail.com>
Description:
Each BCMA core has it's manufacturer id. See
include/linux/bcma/bcma.h for possible values.

What: /sys/bus/bcma/devices/.../id
Date: May 2011
KernelVersion: 3.0
KernelVersion: 2.6.40
Contact: Rafał Miłecki <zajec5@gmail.com>
Description:
There are a few types of BCMA cores, they can be identified by
id field.

What: /sys/bus/bcma/devices/.../rev
Date: May 2011
KernelVersion: 3.0
KernelVersion: 2.6.40
Contact: Rafał Miłecki <zajec5@gmail.com>
Description:
BCMA cores of the same type can still slightly differ depending
on their revision. Use it for detailed programming.

What: /sys/bus/bcma/devices/.../class
Date: May 2011
KernelVersion: 3.0
KernelVersion: 2.6.40
Contact: Rafał Miłecki <zajec5@gmail.com>
Description:
Each BCMA core is identified by few fields, including class it
Expand Down
46 changes: 0 additions & 46 deletions trunk/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
View file

This file was deleted.

15 changes: 0 additions & 15 deletions trunk/Documentation/ABI/testing/sysfs-bus-usb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,3 @@ Description:
such devices.
Users:
usb_modeswitch

What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm
Date: September 2011
Contact: Andiry Xu <andiry.xu@amd.com>
Description:
If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device
is plugged in to a xHCI host which support link PM, it will
perform a LPM test; if the test is passed and host supports
USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will
be enabled for the device and the USB device directory will
contain a file named power/usb2_hardware_lpm. The file holds
a string value (enable or disable) indicating whether or not
USB2 hardware LPM is enabled for the device. Developer can
write y/Y/1 or n/N/0 to the file to enable/disable the
feature.
16 changes: 8 additions & 8 deletions trunk/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_max
What: /sys/class/backlight/<backlight>/l3_office_max
What: /sys/class/backlight/<backlight>/l4_indoor_max
What: /sys/class/backlight/<backlight>/l5_dark_max
Date: May 2011
KernelVersion: 3.0
Date: Mai 2011
KernelVersion: 2.6.40
Contact: device-drivers-devel@blackfin.uclinux.org
Description:
Control the maximum brightness for <ambient light zone>
Expand All @@ -18,8 +18,8 @@ What: /sys/class/backlight/<backlight>/l2_bright_dim
What: /sys/class/backlight/<backlight>/l3_office_dim
What: /sys/class/backlight/<backlight>/l4_indoor_dim
What: /sys/class/backlight/<backlight>/l5_dark_dim
Date: May 2011
KernelVersion: 3.0
Date: Mai 2011
KernelVersion: 2.6.40
Contact: device-drivers-devel@blackfin.uclinux.org
Description:
Control the dim brightness for <ambient light zone>
Expand All @@ -29,8 +29,8 @@ Description:
this <ambient light zone>.

What: /sys/class/backlight/<backlight>/ambient_light_level
Date: May 2011
KernelVersion: 3.0
Date: Mai 2011
KernelVersion: 2.6.40
Contact: device-drivers-devel@blackfin.uclinux.org
Description:
Get conversion value of the light sensor.
Expand All @@ -39,8 +39,8 @@ Description:
8000 (max ambient brightness)

What: /sys/class/backlight/<backlight>/ambient_light_zone
Date: May 2011
KernelVersion: 3.0
Date: Mai 2011
KernelVersion: 2.6.40
Contact: device-drivers-devel@blackfin.uclinux.org
Description:
Get/Set current ambient light zone. Reading returns
Expand Down
13 changes: 0 additions & 13 deletions trunk/Documentation/ABI/testing/sysfs-class-scsi_host
View file

This file was deleted.

7 changes: 0 additions & 7 deletions trunk/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
View file

This file was deleted.

17 changes: 0 additions & 17 deletions trunk/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,3 @@ KernelVersion: 2.6.37
Contact: "Ike Panhc <ike.pan@canonical.com>"
Description:
Control the power of camera module. 1 means on, 0 means off.

What: /sys/devices/platform/ideapad/cfg
Date: Jun 2011
KernelVersion: 3.1
Contact: "Ike Panhc <ike.pan@canonical.com>"
Description:
Ideapad capability bits.
Bit 8-10: 1 - Intel graphic only
2 - ATI graphic only
3 - Nvidia graphic only
4 - Intel and ATI graphic
5 - Intel and Nvidia graphic
Bit 16: Bluetooth exist (1 for exist)
Bit 17: 3G exist (1 for exist)
Bit 18: Wifi exist (1 for exist)
Bit 19: Camera exist (1 for exist)

23 changes: 16 additions & 7 deletions trunk/Documentation/CodingStyle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,22 @@ available tools.
The limit on the length of lines is 80 columns and this is a strongly
preferred limit.

Statements longer than 80 columns will be broken into sensible chunks, unless
exceeding 80 columns significantly increases readability and does not hide
information. Descendants are always substantially shorter than the parent and
are placed substantially to the right. The same applies to function headers
with a long argument list. However, never break user-visible strings such as
printk messages, because that breaks the ability to grep for them.

Statements longer than 80 columns will be broken into sensible chunks.
Descendants are always substantially shorter than the parent and are placed
substantially to the right. The same applies to function headers with a long
argument list. Long strings are as well broken into shorter strings. The
only exception to this is where exceeding 80 columns significantly increases
readability and does not hide information.

void fun(int a, int b, int c)
{
if (condition)
printk(KERN_WARNING "Warning this is a long printk with "
"3 parameters a: %u b: %u "
"c: %u \n", a, b, c);
else
next_statement;
}

Chapter 3: Placing Braces and Spaces

Expand Down
Loading

0 comments on commit 4e7d916

Please sign in to comment.