Commit 9f0d34bc 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/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e4a924f5 0a481279

MAINTAINERS

+23 −16
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mvebu/

F:	drivers/rtc/armada38x-rtc

F:	drivers/rtc/rtc-armada38x.c



ARM/Marvell Berlin SoC support

M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c 
F:	drivers/*/*rockchip*

F:	drivers/*/*/*rockchip*

F:	sound/soc/rockchip/

N:	rockchip



ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>
@@ -1675,8 +1676,8 @@ F: drivers/misc/eeprom/at24.c 
F:	include/linux/platform_data/at24.h



ATA OVER ETHERNET (AOE) DRIVER

M:	"Ed L. Cashin" <ecashin@coraid.com>

W:	http://support.coraid.com/support/linux

M:	"Ed L. Cashin" <ed.cashin@acm.org>

W:	http://www.openaoe.org/

S:	Supported

F:	Documentation/aoe/

F:	drivers/block/aoe/
@@ -3252,6 +3253,13 @@ S: Maintained 
F:	Documentation/hwmon/dme1737

F:	drivers/hwmon/dme1737.c



DMI/SMBIOS SUPPORT

M:	Jean Delvare <jdelvare@suse.de>

S:	Maintained

F:	drivers/firmware/dmi-id.c

F:	drivers/firmware/dmi_scan.c

F:	include/linux/dmi.h



DOCKING STATION DRIVER

M:	Shaohua Li <shaohua.li@intel.com>

L:	linux-acpi@vger.kernel.org
@@ -5128,22 +5136,21 @@ M: Deepak Saxena <dsaxena@plexity.net> 
S:	Maintained

F:	drivers/char/hw_random/ixp4xx-rng.c



INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)

INTEL ETHERNET DRIVERS

M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>

M:	Bruce Allan <bruce.w.allan@intel.com>

M:	Carolyn Wyborny <carolyn.wyborny@intel.com>

M:	Don Skidmore <donald.c.skidmore@intel.com>

M:	Greg Rose <gregory.v.rose@intel.com>

M:	Matthew Vick <matthew.vick@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

M:	Linux NICS <linux.nics@intel.com>

L:	e1000-devel@lists.sourceforge.net

R:	Jesse Brandeburg <jesse.brandeburg@intel.com>

R:	Shannon Nelson <shannon.nelson@intel.com>

R:	Carolyn Wyborny <carolyn.wyborny@intel.com>

R:	Don Skidmore <donald.c.skidmore@intel.com>

R:	Matthew Vick <matthew.vick@intel.com>

R:	John Ronciak <john.ronciak@intel.com>

R:	Mitch Williams <mitch.a.williams@intel.com>

L:	intel-wired-lan@lists.osuosl.org

W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git

Q:	http://patchwork.ozlabs.org/project/intel-wired-lan/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git

S:	Supported

F:	Documentation/networking/e100.txt

F:	Documentation/networking/e1000.txt

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arc/kernel/signal.c

+18 −6
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs, 
	       sigset_t *set)

{

	int err;

	err = __copy_to_user(&(sf->uc.uc_mcontext.regs), regs,

	err = __copy_to_user(&(sf->uc.uc_mcontext.regs.scratch), regs,

			     sizeof(sf->uc.uc_mcontext.regs.scratch));

	err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
@@ -83,7 +83,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) 
	if (!err)

		set_current_blocked(&set);



	err |= __copy_from_user(regs, &(sf->uc.uc_mcontext.regs),

	err |= __copy_from_user(regs, &(sf->uc.uc_mcontext.regs.scratch),

				sizeof(sf->uc.uc_mcontext.regs.scratch));



	return err;
@@ -131,6 +131,15 @@ SYSCALL_DEFINE0(rt_sigreturn) 
	/* Don't restart from sigreturn */

	syscall_wont_restart(regs);



	/*

	 * Ensure that sigreturn always returns to user mode (in case the

	 * regs saved on user stack got fudged between save and sigreturn)

	 * Otherwise it is easy to panic the kernel with a custom

	 * signal handler and/or restorer which clobberes the status32/ret

	 * to return to a bogus location in kernel mode.

	 */

	regs->status32 |= STATUS_U_MASK;



	return regs->r0;



badframe:
@@ -229,8 +238,11 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs) 


	/*

	 * handler returns using sigreturn stub provided already by userpsace

	 * If not, nuke the process right away

	 */

	BUG_ON(!(ksig->ka.sa.sa_flags & SA_RESTORER));

	if(!(ksig->ka.sa.sa_flags & SA_RESTORER))

		return 1;



	regs->blink = (unsigned long)ksig->ka.sa.sa_restorer;



	/* User Stack for signal handler will be above the frame just carved */
@@ -296,12 +308,12 @@ static void 
handle_signal(struct ksignal *ksig, struct pt_regs *regs)

{

	sigset_t *oldset = sigmask_to_save();

	int ret;

	int failed;



	/* Set up the stack frame */

	ret = setup_rt_frame(ksig, oldset, regs);

	failed = setup_rt_frame(ksig, oldset, regs);



	signal_setup_done(ret, ksig, 0);

	signal_setup_done(failed, ksig, 0);

}



void do_signal(struct pt_regs *regs)

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ config ARCH_PXA 
	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_IDE

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PLAT_PXA

	select SPARSE_IRQ

arch/arm/boot/dts/dm8168-evm.dts

+19 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ 
		>;

	};



	mmc_pins: pinmux_mmc_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0a70, MUX_MODE0)			/* SD_POW */

			DM816X_IOPAD(0x0a74, MUX_MODE0)			/* SD_CLK */

			DM816X_IOPAD(0x0a78, MUX_MODE0)			/* SD_CMD */

			DM816X_IOPAD(0x0a7C, MUX_MODE0)			/* SD_DAT0 */

			DM816X_IOPAD(0x0a80, MUX_MODE0)			/* SD_DAT1 */

			DM816X_IOPAD(0x0a84, MUX_MODE0)			/* SD_DAT2 */

			DM816X_IOPAD(0x0a88, MUX_MODE0)			/* SD_DAT2 */

			DM816X_IOPAD(0x0a8c, MUX_MODE2)			/* GP1[7] */

			DM816X_IOPAD(0x0a90, MUX_MODE2)			/* GP1[8] */

		>;

	};



	usb0_pins: pinmux_usb0_pins {

		pinctrl-single,pins = <

			DM816X_IOPAD(0x0d00, MUX_MODE0)			/* USB0_DRVVBUS */
@@ -137,7 +151,12 @@ 
};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc_pins>;

	vmmc-supply = <&vmmcsd_fixed>;

	bus-width = <4>;

	cd-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;

};



/* At least dm8168-evm rev c won't support multipoint, later may */

CRA Git | Maintained and supported by SUSTech CRA and CCSE