Commit 7cda4cee authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3fde2ad 2391f0b4

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/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

+16 −7
Original line number Diff line number Diff line
@@ -554,13 +554,13 @@ S: Orphan 
F:	Documentation/filesystems/affs.txt

F:	fs/affs/



AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN

AFS FILESYSTEM

M:	David Howells <dhowells@redhat.com>

L:	linux-afs@lists.infradead.org

S:	Supported

F:	fs/afs/

F:	include/net/af_rxrpc.h

F:	net/rxrpc/af_rxrpc.c

F:	include/trace/events/afs.h

F:	Documentation/filesystems/afs.txt

W:	https://www.infradead.org/~dhowells/kafs/



AGPGART DRIVER
@@ -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/
@@ -11782,6 +11781,18 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-deve 
S:	Maintained

F:	drivers/net/wireless/realtek/rtl8xxxu/



RXRPC SOCKETS (AF_RXRPC)

M:	David Howells <dhowells@redhat.com>

L:	linux-afs@lists.infradead.org

S:	Supported

F:	net/rxrpc/

F:	include/keys/rxrpc-type.h

F:	include/net/af_rxrpc.h

F:	include/trace/events/rxrpc.h

F:	include/uapi/linux/rxrpc.h

F:	Documentation/networking/rxrpc.txt

W:	https://www.infradead.org/~dhowells/kafs/



S3 SAVAGE FRAMEBUFFER DRIVER

M:	Antonino Daplas <adaplas@gmail.com>

L:	linux-fbdev@vger.kernel.org
@@ -13653,10 +13664,8 @@ F: drivers/net/wireless/ti/ 
F:	include/linux/wl12xx.h



TILE ARCHITECTURE

M:	Chris Metcalf <cmetcalf@mellanox.com>

W:	http://www.mellanox.com/repository/solutions/tile-scm/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git

S:	Supported

S:	Orphan

F:	arch/tile/

F:	drivers/char/tile-srom.c

F:	drivers/edac/tile_edac.c

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/include/asm/pgtable-3level.h

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ static inline pte_t pte_mkspecial(pte_t pte) 
}

#define	__HAVE_ARCH_PTE_SPECIAL



#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		(pmd_isclear((pmd), L_PMD_SECT_RDONLY))

#define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))

#define pud_page(pud)		pmd_page(__pmd(pud_val(pud)))