diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 14:25:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-26 14:25:33 -0400 |
commit | fa93669a1917f93b09142d4b2298329b82d7d36d (patch) | |
tree | 7f8d6dc9d1fbb086c59a799a3a7137c46fb9959e /Documentation/ABI | |
parent | b13bc8dda81c54a66a1c84e66f60b8feba659f28 (diff) | |
parent | 6791457a090d9a234a40b501c2536f0aefaeae4b (diff) |
Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core changes from Greg Kroah-Hartman:
"Here's the big driver core pull request for 3.6-rc1.
Unlike 3.5, this kernel should be a lot tamer, with the printk changes
now settled down. All we have here is some extcon driver updates, w1
driver updates, a few printk cleanups that weren't needed for 3.5, but
are good to have now, and some other minor fixes/changes in the driver
core.
All of these have been in the linux-next releases for a while now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
printk: Export struct log size and member offsets through vmcoreinfo
Drivers: hv: Change the hex constant to a decimal constant
driver core: don't trigger uevent after failure
extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
sysfs: fail dentry revalidation after namespace change fix
sysfs: fail dentry revalidation after namespace change
extcon: spelling of detach in function doc
extcon: arizona: Stop microphone detection if we give up on it
extcon: arizona: Update cable reporting calls and split headset
PM / Runtime: Do not increment device usage counts before probing
kmsg - do not flush partial lines when the console is busy
kmsg - export "continuation record" flag to /dev/kmsg
kmsg - avoid warning for CONFIG_PRINTK=n compilations
kmsg - properly print over-long continuation lines
driver-core: Use kobj_to_dev instead of re-implementing it
driver-core: Move kobj_to_dev from genhd.h to device.h
driver core: Move deferred devices to the end of dpm_list before probing
driver core: move uevent call to driver_register
driver core: fix shutdown races with probe/remove(v3)
Extcon: Arizona: Add driver for Wolfson Arizona class devices
...
Diffstat (limited to 'Documentation/ABI')
-rw-r--r-- | Documentation/ABI/stable/sysfs-driver-w1_ds28e04 | 15 | ||||
-rw-r--r-- | Documentation/ABI/testing/dev-kmsg | 29 |
2 files changed, 35 insertions, 9 deletions
diff --git a/Documentation/ABI/stable/sysfs-driver-w1_ds28e04 b/Documentation/ABI/stable/sysfs-driver-w1_ds28e04 new file mode 100644 index 000000000000..26579ee868c9 --- /dev/null +++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28e04 | |||
@@ -0,0 +1,15 @@ | |||
1 | What: /sys/bus/w1/devices/.../pio | ||
2 | Date: May 2012 | ||
3 | Contact: Markus Franke <franm@hrz.tu-chemnitz.de> | ||
4 | Description: read/write the contents of the two PIO's of the DS28E04-100 | ||
5 | see Documentation/w1/slaves/w1_ds28e04 for detailed information | ||
6 | Users: any user space application which wants to communicate with DS28E04-100 | ||
7 | |||
8 | |||
9 | |||
10 | What: /sys/bus/w1/devices/.../eeprom | ||
11 | Date: May 2012 | ||
12 | Contact: Markus Franke <franm@hrz.tu-chemnitz.de> | ||
13 | Description: read/write the contents of the EEPROM memory of the DS28E04-100 | ||
14 | see Documentation/w1/slaves/w1_ds28e04 for detailed information | ||
15 | Users: any user space application which wants to communicate with DS28E04-100 | ||
diff --git a/Documentation/ABI/testing/dev-kmsg b/Documentation/ABI/testing/dev-kmsg index 281ecc5f9709..7e7e07a82e0e 100644 --- a/Documentation/ABI/testing/dev-kmsg +++ b/Documentation/ABI/testing/dev-kmsg | |||
@@ -58,16 +58,18 @@ Description: The /dev/kmsg character device node provides userspace access | |||
58 | 58 | ||
59 | The output format consists of a prefix carrying the syslog | 59 | The output format consists of a prefix carrying the syslog |
60 | prefix including priority and facility, the 64 bit message | 60 | prefix including priority and facility, the 64 bit message |
61 | sequence number and the monotonic timestamp in microseconds. | 61 | sequence number and the monotonic timestamp in microseconds, |
62 | The values are separated by a ','. Future extensions might | 62 | and a flag field. All fields are separated by a ','. |
63 | add more comma separated values before the terminating ';'. | 63 | |
64 | Unknown values should be gracefully ignored. | 64 | Future extensions might add more comma separated values before |
65 | the terminating ';'. Unknown fields and values should be | ||
66 | gracefully ignored. | ||
65 | 67 | ||
66 | The human readable text string starts directly after the ';' | 68 | The human readable text string starts directly after the ';' |
67 | and is terminated by a '\n'. Untrusted values derived from | 69 | and is terminated by a '\n'. Untrusted values derived from |
68 | hardware or other facilities are printed, therefore | 70 | hardware or other facilities are printed, therefore |
69 | all non-printable characters in the log message are escaped | 71 | all non-printable characters and '\' itself in the log message |
70 | by "\x00" C-style hex encoding. | 72 | are escaped by "\x00" C-style hex encoding. |
71 | 73 | ||
72 | A line starting with ' ', is a continuation line, adding | 74 | A line starting with ' ', is a continuation line, adding |
73 | key/value pairs to the log message, which provide the machine | 75 | key/value pairs to the log message, which provide the machine |
@@ -75,11 +77,11 @@ Description: The /dev/kmsg character device node provides userspace access | |||
75 | userspace. | 77 | userspace. |
76 | 78 | ||
77 | Example: | 79 | Example: |
78 | 7,160,424069;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored) | 80 | 7,160,424069,-;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored) |
79 | SUBSYSTEM=acpi | 81 | SUBSYSTEM=acpi |
80 | DEVICE=+acpi:PNP0A03:00 | 82 | DEVICE=+acpi:PNP0A03:00 |
81 | 6,339,5140900;NET: Registered protocol family 10 | 83 | 6,339,5140900,-;NET: Registered protocol family 10 |
82 | 30,340,5690716;udevd[80]: starting version 181 | 84 | 30,340,5690716,-;udevd[80]: starting version 181 |
83 | 85 | ||
84 | The DEVICE= key uniquely identifies devices the following way: | 86 | The DEVICE= key uniquely identifies devices the following way: |
85 | b12:8 - block dev_t | 87 | b12:8 - block dev_t |
@@ -87,4 +89,13 @@ Description: The /dev/kmsg character device node provides userspace access | |||
87 | n8 - netdev ifindex | 89 | n8 - netdev ifindex |
88 | +sound:card0 - subsystem:devname | 90 | +sound:card0 - subsystem:devname |
89 | 91 | ||
92 | The flags field carries '-' by default. A 'c' indicates a | ||
93 | fragment of a line. All following fragments are flagged with | ||
94 | '+'. Note, that these hints about continuation lines are not | ||
95 | neccessarily correct, and the stream could be interleaved with | ||
96 | unrelated messages, but merging the lines in the output | ||
97 | usually produces better human readable results. A similar | ||
98 | logic is used internally when messages are printed to the | ||
99 | console, /proc/kmsg or the syslog() syscall. | ||
100 | |||
90 | Users: dmesg(1), userspace kernel log consumers | 101 | Users: dmesg(1), userspace kernel log consumers |