Commit 6a06e5e1 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/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d9f72f35 6672d90f

Documentation/vfio.txt

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ character devices for this group: 
$ lspci -n -s 0000:06:0d.0

06:0d.0 0401: 1102:0002 (rev 08)

# echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind

# echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id

# echo 1102 0002 > /sys/bus/pci/drivers/vfio-pci/new_id



Now we need to look at what other devices are in the group to free

it for use by VFIO:

MAINTAINERS

+9 −5
Original line number Diff line number Diff line
@@ -3552,11 +3552,12 @@ K: \b(ABS|SYN)_MT_ 


INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Lukasz Dorau <lukasz.dorau@intel.com>

M:	Maciej Patelczyk <maciej.patelczyk@intel.com>

M:	Dave Jiang <dave.jiang@intel.com>

M:	Ed Nadolski <edmund.nadolski@intel.com>

L:	linux-scsi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git

S:	Maintained

T:	git git://git.code.sf.net/p/intel-sas/isci

S:	Supported

F:	drivers/scsi/isci/

F:	firmware/isci/
@@ -3666,11 +3667,12 @@ F: Documentation/networking/README.ipw2200 
F:	drivers/net/wireless/ipw2x00/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Joseph Cihula <joseph.cihula@intel.com>

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot

S:	Supported

F:	Documentation/intel_txt.txt

F:	include/linux/tboot.h
@@ -5543,6 +5545,8 @@ F: Documentation/devicetree/bindings/pwm/ 
F:	include/linux/pwm.h

F:	include/linux/of_pwm.h

F:	drivers/pwm/

F:	drivers/video/backlight/pwm_bl.c

F:	include/linux/pwm_backlight.h



PXA2xx/PXA3xx SUPPORT

M:	Eric Miao <eric.y.miao@gmail.com>

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel

EXTRAVERSION = -rc7

NAME = Terrified Chipmunk



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/arm/boot/compressed/head.S

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ __armv7_mmu_cache_on: 
		mcrne	p15, 0, r0, c8, c7, 0	@ flush I,D TLBs

#endif

		mrc	p15, 0, r0, c1, c0, 0	@ read control reg

		bic	r0, r0, #1 << 28	@ clear SCTLR.TRE

		orr	r0, r0, #0x5000		@ I-cache enable, RR cache replacement

		orr	r0, r0, #0x003c		@ write buffer

#ifdef CONFIG_MMU

arch/arm/boot/dts/at91sam9260.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -113,6 +114,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -122,6 +124,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE