[linux-next] LinuxNextTracking branch, master, updated. next-20180627

batman at open-mesh.org batman at open-mesh.org
Thu Jun 28 00:17:32 CEST 2018


The following commit has been merged in the master branch:
commit 9ff3b40e411c00870d1c29cd6b843fca7c4160ae
Merge: 823819507095135b475a99048f0b0b6e75580fbc 6f0d349d922ba44e4348a17a78ea51b7135965b1
Author: David S. Miller <davem at davemloft.net>
Date:   Tue Jun 26 08:07:17 2018 +0900

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

diff --combined MAINTAINERS
index 99e5cef8172e,e19ec6d90a44..f3e766e504d8
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9882,6 -9882,7 +9882,7 @@@ M:	Andrew Lunn <andrew at lunn.ch
  M:	Vivien Didelot <vivien.didelot at savoirfairelinux.com>
  M:	Florian Fainelli <f.fainelli at gmail.com>
  S:	Maintained
+ F:	Documentation/devicetree/bindings/net/dsa/
  F:	net/dsa/
  F:	include/net/dsa.h
  F:	include/linux/dsa/
@@@ -12162,9 -12163,7 +12163,9 @@@ M:	Herbert Xu <herbert at gondor.apana.org
  L:	netdev at vger.kernel.org
  S:	Maintained
  F:	lib/rhashtable.c
 +F:	lib/test_rhashtable.c
  F:	include/linux/rhashtable.h
 +F:	include/linux/rhashtable-types.h
  
  RICOH R5C592 MEMORYSTICK DRIVER
  M:	Maxim Levitsky <maximlevitsky at gmail.com>
@@@ -15574,6 -15573,7 +15575,7 @@@ M:	x86 at kernel.or
  L:	linux-kernel at vger.kernel.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:	Maintained
+ F:	Documentation/devicetree/bindings/x86/
  F:	Documentation/x86/
  F:	arch/x86/
  

-- 
LinuxNextTracking


More information about the linux-merge mailing list