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

Commit 24bc518a authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b3e3bd71 194d9831

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38 
S: D-64295

S: Germany



N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

Documentation/devicetree/bindings/net/mdio-gpio.txt

+8 −1
Original line number Diff line number Diff line
@@ -8,9 +8,16 @@ gpios property as described in section VIII.1 in the following order: 


MDC, MDIO.



Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"

node.



Example:



mdio {

aliases {

	mdio-gpio0 = <&mdio0>;

};



mdio0: mdio {

	compatible = "virtual,mdio-gpio";

	#address-cells = <1>;

	#size-cells = <0>;

Documentation/networking/vxlan.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ no entry is in the forwarding table. 
  # ip link delete vxlan0



3. Show vxlan info

  # ip -d show vxlan0

  # ip -d link show vxlan0



It is possible to create, destroy and display the vxlan

forwarding table using the new bridge command.
@@ -41,7 +41,7 @@ forwarding table using the new bridge command. 
  # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0



2. Delete forwarding table entry

  # bridge fdb delete 00:17:42:8a:b4:05

  # bridge fdb delete 00:17:42:8a:b4:05 dev vxlan0



3. Show forwarding table

  # bridge fdb show dev vxlan0

MAINTAINERS

+18 −10
Original line number Diff line number Diff line
@@ -526,17 +526,17 @@ F: drivers/video/geode/ 
F:	arch/x86/include/asm/geode.h



AMD IOMMU (AMD-VI)

M:	Joerg Roedel <joerg.roedel@amd.com>

M:	Joerg Roedel <joro@8bytes.org>

L:	iommu@lists.linux-foundation.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

S:	Supported

S:	Maintained

F:	drivers/iommu/amd_iommu*.[ch]

F:	include/linux/amd-iommu.h



AMD MICROCODE UPDATE SUPPORT

M:	Andreas Herrmann <andreas.herrmann3@amd.com>

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

L:	amd64-microcode@amd64.org

S:	Supported

S:	Maintained

F:	arch/x86/kernel/microcode_amd.c



AMS (Apple Motion Sensor) DRIVER
@@ -841,6 +841,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git 
F:	arch/arm/mach-sa1100/jornada720.c

F:	arch/arm/mach-sa1100/include/mach/jornada720.h



ARM/IGEP MACHINE SUPPORT

M:	Enric Balletbo i Serra <eballetbo@gmail.com>

M:	Javier Martinez Canillas <javier@dowhile0.org>

L:	linux-omap@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-omap2/board-igep0020.c



ARM/INCOME PXA270 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2708,10 +2716,10 @@ F: include/linux/edac.h 


EDAC-AMD64

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <borislav.petkov@amd.com>

M:	Borislav Petkov <bp@alien8.de>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Supported

S:	Maintained

F:	drivers/edac/amd64_edac*



EDAC-E752X
@@ -3753,7 +3761,7 @@ S: Maintained 
F:	drivers/platform/x86/ideapad-laptop.c



IDE/ATAPI DRIVERS

M:	Borislav Petkov <petkovbb@gmail.com>

M:	Borislav Petkov <bp@alien8.de>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	Documentation/cdrom/ide-cd
@@ -4282,8 +4290,8 @@ F: include/linux/lockd/ 
F:	include/linux/sunrpc/



KERNEL VIRTUAL MACHINE (KVM)

M:	Avi Kivity <avi@redhat.com>

M:	Marcelo Tosatti <mtosatti@redhat.com>

M:	Gleb Natapov <gleb@redhat.com>

L:	kvm@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported
@@ -5415,7 +5423,7 @@ S: Maintained 
F:	sound/drivers/opl4/



OPROFILE

M:	Robert Richter <robert.richter@amd.com>

M:	Robert Richter <rric@kernel.org>

L:	oprofile-list@lists.sf.net

S:	Maintained

F:	arch/*/include/asm/oprofile*.h
@@ -8207,7 +8215,7 @@ F: drivers/platform/x86 


X86 MCE INFRASTRUCTURE

M:	Tony Luck <tony.luck@intel.com>

M:	Borislav Petkov <bp@amd64.org>

M:	Borislav Petkov <bp@alien8.de>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	arch/x86/kernel/cpu/mcheck/*

arch/alpha/kernel/osf_sys.c

+3 −3
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ struct procfs_args { 
 * unhappy with OSF UFS. [CHECKME]

 */

static int

osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)

osf_ufs_mount(const char *dirname, struct ufs_args __user *args, int flags)

{

	int retval;

	struct cdfs_args tmp;
@@ -465,7 +465,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags) 
}



static int

osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)

osf_cdfs_mount(const char *dirname, struct cdfs_args __user *args, int flags)

{

	int retval;

	struct cdfs_args tmp;
@@ -485,7 +485,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags) 
}



static int

osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags)

osf_procfs_mount(const char *dirname, struct procfs_args __user *args, int flags)

{

	struct procfs_args tmp;