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

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

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

parents aea5f654 9981b4fb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9074,7 +9074,7 @@ S: Maintained 
F:	drivers/usb/mtu3/



MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES

M:	Peter Senna Tschudin <peter.senna@collabora.com>

M:	Peter Senna Tschudin <peter.senna@gmail.com>

M:	Martin Donnelly <martin.donnelly@ge.com>

M:	Martyn Welch <martyn.welch@collabora.co.uk>

S:	Maintained

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Merciless Moray



# *DOCUMENTATION*

arch/alpha/kernel/osf_sys.c

+1 −4
Original line number Diff line number Diff line
@@ -1180,13 +1180,10 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,

		struct rusage32 __user *, ur)

{

	unsigned int status = 0;

	struct rusage r;

	long err = kernel_wait4(pid, &status, options, &r);

	long err = kernel_wait4(pid, ustatus, options, &r);

	if (err <= 0)

		return err;

	if (put_user(status, ustatus))

		return -EFAULT;

	if (!ur)

		return err;

	if (put_tv_to_tv32(&ur->ru_utime, &r.ru_utime))

arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ 
			dsa,member = <0 0>;

			eeprom-length = <512>;

			interrupt-parent = <&gpio6>;

			interrupts = <3 IRQ_TYPE_EDGE_FALLING>;

			interrupts = <3 IRQ_TYPE_LEVEL_LOW>;

			interrupt-controller;

			#interrupt-cells = <2>;

arch/arm/boot/dts/omap4-droid4-xt894.dts

+3 −6
Original line number Diff line number Diff line
@@ -159,13 +159,7 @@ 


		dais = <&mcbsp2_port>, <&mcbsp3_port>;

	};

};



&dss {

	status = "okay";

};



&gpio6 {

	pwm8: dmtimer-pwm-8 {

		pinctrl-names = "default";

		pinctrl-0 = <&vibrator_direction_pin>;
@@ -192,7 +186,10 @@ 
		pwm-names = "enable", "direction";

		direction-duty-cycle-ns = <10000000>;

	};

};



&dss {

	status = "okay";

};



&dsi1 {