Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa93669a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* 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
  ...
parents b13bc8dd 6791457a

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/.../pio

Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the two PIO's of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

Users:		any user space application which wants to communicate with DS28E04-100







What:		/sys/bus/w1/devices/.../eeprom

Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the EEPROM memory of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

Users:		any user space application which wants to communicate with DS28E04-100

Documentation/ABI/testing/dev-kmsg

+20 −9
Original line number Diff line number Diff line
@@ -58,16 +58,18 @@ Description: The /dev/kmsg character device node provides userspace access 


		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.

		sequence number and the monotonic timestamp in microseconds,

		and a flag field. All fields are separated by a ','.



		Future extensions might add more comma separated values before

		the terminating ';'. Unknown fields and 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.

		all non-printable characters and '\' itself 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
@@ -75,11 +77,11 @@ Description: The /dev/kmsg character device node provides userspace access 
		userspace.



		Example:

		7,160,424069;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)

		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

		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
@@ -87,4 +89,13 @@ Description: The /dev/kmsg character device node provides userspace access 
		  n8           - netdev ifindex

		  +sound:card0 - subsystem:devname



		The flags field carries '-' by default. A 'c' indicates a

		fragment of a line. All following fragments are flagged with

		'+'. Note, that these hints about continuation lines are not

		neccessarily correct, and the stream could be interleaved with

		unrelated messages, but merging the lines in the output

		usually produces better human readable results. A similar

		logic is used internally when messages are printed to the

		console, /proc/kmsg or the syslog() syscall.



Users:		dmesg(1), userspace kernel log consumers

Documentation/stable_kernel_rules.txt

+14 −5
Original line number Diff line number Diff line 
Everything you ever wanted to know about Linux 2.6 -stable releases.

Everything you ever wanted to know about Linux -stable releases.



Rules on what kind of patches are accepted, and which ones are not, into the

"-stable" tree:
@@ -42,10 +42,10 @@ Procedure for submitting patches to the -stable tree: 
   cherry-picked than this can be specified in the following format in

   the sign-off area:



     Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle

     Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic

     Cc: <stable@vger.kernel.org> # .32.x

     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle

     Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic

     Cc: <stable@vger.kernel.org> # 3.3.x

    Signed-off-by: Ingo Molnar <mingo@elte.hu>



   The tag sequence has the meaning of:
@@ -79,6 +79,15 @@ Review cycle: 
   security kernel team, and not go through the normal review cycle.

   Contact the kernel security team for more details on this procedure.



Trees:



 - The queues of patches, for both completed versions and in progress

   versions can be found at:

	http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

 - The finalized and tagged releases of all stable kernels can be found

   in separate branches per version at:

	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git





Review committee:

Documentation/w1/slaves/w1_ds28e04

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Kernel driver w1_ds28e04

========================



Supported chips:

  * Maxim DS28E04-100 4096-Bit Addressable 1-Wire EEPROM with PIO



supported family codes:

	W1_FAMILY_DS28E04	0x1C



Author: Markus Franke, <franke.m@sebakmt.com> <franm@hrz.tu-chemnitz.de>



Description

-----------



Support is provided through the sysfs files "eeprom" and "pio". CRC checking

during memory accesses can optionally be enabled/disabled via the device

attribute "crccheck". The strong pull-up can optionally be enabled/disabled

via the module parameter "w1_strong_pullup".



Memory Access



	A read operation on the "eeprom" file reads the given amount of bytes

	from the EEPROM of the DS28E04.



	A write operation on the "eeprom" file writes the given byte sequence

	to the EEPROM of the DS28E04. If CRC checking mode is enabled only

	fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 30

	and 31) are allowed to be written.



PIO Access



	The 2 PIOs of the DS28E04-100 are accessible via the "pio" sysfs file.



	The current status of the PIO's is returned as an 8 bit value. Bit 0/1

	represent the state of PIO_0/PIO_1. Bits 2..7 do not care. The PIO's are

	driven low-active, i.e. the driver delivers/expects low-active values.

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2728,6 +2728,14 @@ M: Mimi Zohar <zohar@us.ibm.com> 
S:	Supported

F:	security/integrity/evm/



EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Chanwoo Choi <cw00.choi@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/extcon/

F:	Documentation/extcon/



EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

L:	linux-fbdev@vger.kernel.org