Skip to content

Commit

Permalink
Merge commit 'v3.5-rc2' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
James Morris committed Jun 10, 2012
2 parents f52c44c + cfaf025 commit 66dd07b
Show file tree
Hide file tree
Showing 9,145 changed files with 568,081 additions and 362,180 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,5 @@ Uwe Kleine-König <[email protected]>
Valdis Kletnieks <[email protected]>
Takashi YOSHII <[email protected]>
Yusuke Goda <[email protected]>
Gustavo Padovan <[email protected]>
Gustavo Padovan <[email protected]>
4 changes: 2 additions & 2 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer
D: Author of the longest-living linux bug

N: Jonathan Woithe
E: jwoithe@physics.adelaide.edu.au
W: http://www.physics.adelaide.edu.au/~jwoithe
E: jwoithe@just42.net
W: http:/www.just42.net/jwoithe
D: ALS-007 sound card extensions to Sound Blaster driver
S: 20 Jordan St
S: Valley View, SA 5093
Expand Down
2 changes: 0 additions & 2 deletions Documentation/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,6 @@ m68k/
- directory with info about Linux on Motorola 68k architecture.
magic-number.txt
- list of magic numbers used to mark/protect kernel data structures.
mca.txt
- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
md.txt
- info on boot arguments for the multiple devices driver.
memory-barriers.txt
Expand Down
9 changes: 9 additions & 0 deletions Documentation/ABI/removed/ip_queue
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
What: ip_queue
Date: finally removed in kernel v3.5.0
Contact: Pablo Neira Ayuso <[email protected]>
Description:
ip_queue has been replaced by nfnetlink_queue which provides
more advanced queueing mechanism to user-space. The ip_queue
module was already announced to become obsolete years ago.

Users:
45 changes: 45 additions & 0 deletions Documentation/ABI/testing/debugfs-pfo-nx-crypto
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
What: /sys/kernel/debug/nx-crypto/*
Date: March 2012
KernelVersion: 3.4
Contact: Kent Yoder <[email protected]>
Description:

These debugfs interfaces are built by the nx-crypto driver, built in
arch/powerpc/crypto/nx.

Error Detection
===============

errors:
- A u32 providing a total count of errors since the driver was loaded. The
only errors counted here are those returned from the hcall, H_COP_OP.

last_error:
- The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not
recorded here (the hcall will retry until -EBUSY goes away).

last_error_pid:
- The process ID of the process who received the most recent error from the
hcall.

Device Use
==========

aes_bytes:
- The total number of bytes encrypted using AES in any of the driver's
supported modes.

aes_ops:
- The total number of AES operations submitted to the hardware.

sha256_bytes:
- The total number of bytes hashed by the hardware using SHA-256.

sha256_ops:
- The total number of SHA-256 operations submitted to the hardware.

sha512_bytes:
- The total number of bytes hashed by the hardware using SHA-512.

sha512_ops:
- The total number of SHA-512 operations submitted to the hardware.
90 changes: 90 additions & 0 deletions Documentation/ABI/testing/dev-kmsg
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
What: /dev/kmsg
Date: Mai 2012
KernelVersion: 3.5
Contact: Kay Sievers <[email protected]>
Description: The /dev/kmsg character device node provides userspace access
to the kernel's printk buffer.

Injecting messages:
Every write() to the opened device node places a log entry in
the kernel's printk buffer.

The logged line can be prefixed with a <N> syslog prefix, which
carries the syslog priority and facility. The single decimal
prefix number is composed of the 3 lowest bits being the syslog
priority and the higher bits the syslog facility number.

If no prefix is given, the priority number is the default kernel
log priority and the facility number is set to LOG_USER (1). It
is not possible to inject messages from userspace with the
facility number LOG_KERN (0), to make sure that the origin of
the messages can always be reliably determined.

Accessing the buffer:
Every read() from the opened device node receives one record
of the kernel's printk buffer.

The first read() directly following an open() always returns
first message in the buffer; there is no kernel-internal
persistent state; many readers can concurrently open the device
and read from it, without affecting other readers.

Every read() will receive the next available record. If no more
records are available read() will block, or if O_NONBLOCK is
used -EAGAIN returned.

Messages in the record ring buffer get overwritten as whole,
there are never partial messages received by read().

In case messages get overwritten in the circular buffer while
the device is kept open, the next read() will return -EPIPE,
and the seek position be updated to the next available record.
Subsequent reads() will return available records again.

Unlike the classic syslog() interface, the 64 bit record
sequence numbers allow to calculate the amount of lost
messages, in case the buffer gets overwritten. And they allow
to reconnect to the buffer and reconstruct the read position
if needed, without limiting the interface to a single reader.

The device supports seek with the following parameters:
SEEK_SET, 0
seek to the first entry in the buffer
SEEK_END, 0
seek after the last entry in the buffer
SEEK_DATA, 0
seek after the last record available at the time
the last SYSLOG_ACTION_CLEAR was issued.

The output format consists of a prefix carrying the syslog
prefix including priority and facility, the 64 bit message
sequence number and the monotonic timestamp in microseconds.
The values are separated by a ','. Future extensions might
add more comma separated values before the terminating ';'.
Unknown values should be gracefully ignored.

The human readable text string starts directly after the ';'
and is terminated by a '\n'. Untrusted values derived from
hardware or other facilities are printed, therefore
all non-printable characters in the log message are escaped
by "\x00" C-style hex encoding.

A line starting with ' ', is a continuation line, adding
key/value pairs to the log message, which provide the machine
readable context of the message, for reliable processing in
userspace.

Example:
7,160,424069;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)
SUBSYSTEM=acpi
DEVICE=+acpi:PNP0A03:00
6,339,5140900;NET: Registered protocol family 10
30,340,5690716;udevd[80]: starting version 181

The DEVICE= key uniquely identifies devices the following way:
b12:8 - block dev_t
c127:3 - char dev_t
n8 - netdev ifindex
+sound:card0 - subsystem:devname

Users: dmesg(1), userspace kernel log consumers
12 changes: 10 additions & 2 deletions Documentation/ABI/testing/sysfs-block-rssd
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ Description: This is a read-only file. Dumps below driver information and
hardware registers.
- S ACTive
- Command Issue
- Allocated
- Completed
- PORT IRQ STAT
- HOST IRQ STAT
- Allocated
- Commands in Q

What: /sys/block/rssd*/status
Date: April 2012
KernelVersion: 3.4
Contact: Asai Thambi S P <[email protected]>
Description: This is a read-only file. Indicates the status of the device.
Description: This is a read-only file. Indicates the status of the device.

What: /sys/block/rssd*/flags
Date: May 2012
KernelVersion: 3.5
Contact: Asai Thambi S P <[email protected]>
Description: This is a read-only file. Dumps the flags in port and driver
data structure
77 changes: 77 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-fcoe
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
What: /sys/bus/fcoe/ctlr_X
Date: March 2012
KernelVersion: TBD
Contact: Robert Love <[email protected]>, [email protected]
Description: 'FCoE Controller' instances on the fcoe bus
Attributes:

fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
this value will change the dev_loss_tmo for all
FCFs discovered by this controller.

lesb_link_fail: Link Error Status Block (LESB) link failure count.

lesb_vlink_fail: Link Error Status Block (LESB) virtual link
failure count.

lesb_miss_fka: Link Error Status Block (LESB) missed FCoE
Initialization Protocol (FIP) Keep-Alives (FKA).

lesb_symb_err: Link Error Status Block (LESB) symbolic error count.

lesb_err_block: Link Error Status Block (LESB) block error count.

lesb_fcs_error: Link Error Status Block (LESB) Fibre Channel
Serivces error count.

Notes: ctlr_X (global increment starting at 0)

What: /sys/bus/fcoe/fcf_X
Date: March 2012
KernelVersion: TBD
Contact: Robert Love <[email protected]>, [email protected]
Description: 'FCoE FCF' instances on the fcoe bus. A FCF is a Fibre Channel
Forwarder, which is a FCoE switch that can accept FCoE
(Ethernet) packets, unpack them, and forward the embedded
Fibre Channel frames into a FC fabric. It can also take
outbound FC frames and pack them in Ethernet packets to
be sent to their destination on the Ethernet segment.
Attributes:

fabric_name: Identifies the fabric that the FCF services.

switch_name: Identifies the FCF.

priority: The switch's priority amongst other FCFs on the same
fabric.

selected: 1 indicates that the switch has been selected for use;
0 indicates that the swich will not be used.

fc_map: The Fibre Channel MAP

vfid: The Virtual Fabric ID

mac: The FCF's MAC address

fka_peroid: The FIP Keep-Alive peroid

fabric_state: The internal kernel state
"Unknown" - Initialization value
"Disconnected" - No link to the FCF/fabric
"Connected" - Host is connected to the FCF
"Deleted" - FCF is being removed from the system

dev_loss_tmo: The device loss timeout peroid for this FCF.

Notes: A device loss infrastructre similar to the FC Transport's
is present in fcoe_sysfs. It is nice to have so that a
link flapping adapter doesn't continually advance the count
used to identify the discovered FCF. FCFs will exist in a
"Disconnected" state until either the timer expires and the
FCF becomes "Deleted" or the FCF is rediscovered and becomes
"Connected."


Users: The first user of this interface will be the fcoeadm application,
which is commonly packaged in the fcoe-utils package.
15 changes: 15 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
What: /sys/bus/i2c/devices/.../output_hvled[n]
Date: April 2012
KernelVersion: 3.5
Contact: Johan Hovold <[email protected]>
Description:
Set the controlling backlight device for high-voltage current
sink HVLED[n] (n = 1, 2) (0, 1).

What: /sys/bus/i2c/devices/.../output_lvled[n]
Date: April 2012
KernelVersion: 3.5
Contact: Johan Hovold <[email protected]>
Description:
Set the controlling led device for low-voltage current sink
LVLED[n] (n = 1..5) (0..3).
Loading

0 comments on commit 66dd07b

Please sign in to comment.