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

Commit 639136d2 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.16 

"A couple of patches this time. Just some more compatibles for the
pca954x driver and an error handling tweak for the reg driver."
parents 017fc4f6 ac5b85de

Documentation/devicetree/bindings/hwmon/jc42.txt

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Required properties: 


- reg: I2C address



Optional properties:

- smbus-timeout-disable: When set, the smbus timeout function will be disabled.

			 This is not supported on all chips.



Example:



temp-sensor@1a {

Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt

+11 −2
Original line number Diff line number Diff line 
* NXP PCA954x I2C bus switch



The driver supports NXP PCA954x and PCA984x I2C mux/switch devices.



Required Properties:



  - compatible: Must contain one of the following.

    "nxp,pca9540", "nxp,pca9542", "nxp,pca9543", "nxp,pca9544",

    "nxp,pca9545", "nxp,pca9546", "nxp,pca9547", "nxp,pca9548"

    "nxp,pca9540",

    "nxp,pca9542",

    "nxp,pca9543",

    "nxp,pca9544",

    "nxp,pca9545",

    "nxp,pca9546", "nxp,pca9846",

    "nxp,pca9547", "nxp,pca9847",

    "nxp,pca9548", "nxp,pca9848",

    "nxp,pca9849"



  - reg: The I2C address of the device.

Documentation/printk-formats.txt

+28 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ How to get printk format specifiers right 
:Author: Randy Dunlap <rdunlap@infradead.org>

:Author: Andrew Murray <amurray@mpc-data.co.uk>





Integer types

=============
@@ -45,6 +44,18 @@ return from vsnprintf. 
Raw pointer value SHOULD be printed with %p. The kernel supports

the following extended format specifiers for pointer types:



Pointer Types

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



Pointers printed without a specifier extension (i.e unadorned %p) are

hashed to give a unique identifier without leaking kernel addresses to user

space. On 64 bit machines the first 32 bits are zeroed. If you _really_

want the address see %px below.



::



	%p	abcdef12 or 00000000abcdef12



Symbols/Function Pointers

=========================
@@ -85,18 +96,32 @@ Examples:: 
	printk("Faulted at %pS\n", (void *)regs->ip);

	printk(" %s%pB\n", (reliable ? "" : "? "), (void *)*stack);





Kernel Pointers

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



::



	%pK	0x01234567 or 0x0123456789abcdef

	%pK	01234567 or 0123456789abcdef



For printing kernel pointers which should be hidden from unprivileged

users. The behaviour of ``%pK`` depends on the ``kptr_restrict sysctl`` - see

Documentation/sysctl/kernel.txt for more details.



Unmodified Addresses

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



::



	%px	01234567 or 0123456789abcdef



For printing pointers when you _really_ want to print the address. Please

consider whether or not you are leaking sensitive information about the

Kernel layout in memory before printing pointers with %px. %px is

functionally equivalent to %lx. %px is preferred to %lx because it is more

uniquely grep'able. If, in the future, we need to modify the way the Kernel

handles printing pointers it will be nice to be able to find the call

sites.



Struct Resources

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

Documentation/sysctl/vm.txt

+0 −7
Original line number Diff line number Diff line
@@ -158,10 +158,6 @@ Note: the minimum value allowed for dirty_bytes is two pages (in bytes); any 
value lower than this limit will be ignored and the old configuration will be

retained.



Note: the value of dirty_bytes also must be set greater than

dirty_background_bytes or the amount of memory corresponding to

dirty_background_ratio.



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



dirty_expire_centisecs
@@ -181,9 +177,6 @@ generating disk writes will itself start writing out dirty data. 


The total available memory is not equal to total system memory.



Note: dirty_ratio must be set greater than dirty_background_ratio or

ratio corresponding to dirty_background_bytes.



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



dirty_writeback_centisecs

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -6174,7 +6174,6 @@ M: Jean Delvare <jdelvare@suse.com> 
M:	Guenter Roeck <linux@roeck-us.net>

L:	linux-hwmon@vger.kernel.org

W:	http://hwmon.wiki.kernel.org/

T:	quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

S:	Maintained

F:	Documentation/hwmon/
@@ -9331,9 +9330,9 @@ F: drivers/gpu/drm/mxsfb/ 
F:	Documentation/devicetree/bindings/display/mxsfb-drm.txt



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Hyong-Youb Kim <hykim@myri.com>

M:	Chris Lee <christopher.lee@cspi.com>

L:	netdev@vger.kernel.org

W:	https://www.myricom.com/support/downloads/myri10ge.html

W:	https://www.cspi.com/ethernet-products/support/downloads/

S:	Supported

F:	drivers/net/ethernet/myricom/myri10ge/