Commit 32efe08d 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/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da194316 b01543df

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/boot/dts/exynos4210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		cpu-offset = <0x8000>;

		reg = <0x10490000 0x1000>, <0x10480000 0x100>;

	};

arch/arm/boot/dts/tegra-paz00.dts

+3 −3
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
	};



	serial@70006200 {

		status = "disable";

		clock-frequency = <216000000>;

	};



	serial@70006300 {

		clock-frequency = <216000000>;

		status = "disable";

	};



	serial@70006400 {
@@ -60,7 +60,7 @@ 
	sdhci@c8000000 {

		cd-gpios = <&gpio 173 0>; /* gpio PV5 */

		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000200 {

arch/arm/kernel/traps.c

+4 −1
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ void die(const char *str, struct pt_regs *regs, int err) 
{

	struct thread_info *thread = current_thread_info();

	int ret;

	enum bug_trap_type bug_type = BUG_TRAP_TYPE_NONE;



	oops_enter();
@@ -273,7 +274,9 @@ void die(const char *str, struct pt_regs *regs, int err) 
	console_verbose();

	bust_spinlocks(1);

	if (!user_mode(regs))

		report_bug(regs->ARM_pc, regs);

		bug_type = report_bug(regs->ARM_pc, regs);

	if (bug_type != BUG_TRAP_TYPE_NONE)

		str = "Oops - BUG";

	ret = __die(str, err, thread, regs);



	if (regs && kexec_should_crash(thread->task))

arch/arm/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/page.h>

	

#define PROC_INFO							\

	. = ALIGN(4);							\

	VMLINUX_SYMBOL(__proc_info_begin) = .;				\

	*(.proc.info.init)						\

	VMLINUX_SYMBOL(__proc_info_end) = .;

CRA Git | Maintained and supported by SUSTech CRA and CCSE