Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (ce28bb44) · Commits · 戴 / test

MAINTAINERS

+9 −2

Original line number	Diff line number	Diff line
		@@ -2633,6 +2633,13 @@ S: Maintained
		F: Documentation/devicetree/bindings/sound/axentia,*
		F: sound/soc/atmel/tse850-pcm5142.c

		AXXIA I2C CONTROLLER
		M: Krzysztof Adamski <krzysztof.adamski@nokia.com>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/i2c/i2c-axxia.txt
		F: drivers/i2c/busses/i2c-axxia.c

		AZ6007 DVB DRIVER
		M: Mauro Carvalho Chehab <mchehab@kernel.org>
		L: linux-media@vger.kernel.org
		@@ -4050,7 +4057,7 @@ S: Maintained
		F: drivers/media/dvb-frontends/cxd2820r*

		CXGB3 ETHERNET DRIVER (CXGB3)
		M: Santosh Raspatur <santosh@chelsio.com>
		M: Arjun Vynipadath <arjun@chelsio.com>
		L: netdev@vger.kernel.org
		W: http://www.chelsio.com
		S: Supported
		@@ -4079,7 +4086,7 @@ S: Supported
		F: drivers/crypto/chelsio

		CXGB4 ETHERNET DRIVER (CXGB4)
		M: Ganesh Goudar <ganeshgr@chelsio.com>
		M: Arjun Vynipadath <arjun@chelsio.com>
		L: netdev@vger.kernel.org
		W: http://www.chelsio.com
		S: Supported

+2 −7

Original line number	Diff line number	Diff line
		@@ -1076,7 +1076,7 @@ scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)
		# version.h and scripts_basic is processed / created.

		# Listed in dependency order
		PHONY += prepare archprepare macroprepare prepare0 prepare1 prepare2 prepare3
		PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3

		# prepare3 is used to check if we are building in a separate output directory,
		# and if so do:
		@@ -1099,9 +1099,7 @@ prepare2: prepare3 outputmakefile asm-generic
		prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
		$(cmd_crmodverdir)

		macroprepare: prepare1 archmacros

		archprepare: archheaders archscripts macroprepare scripts_basic
		archprepare: archheaders archscripts prepare1 scripts_basic

		prepare0: archprepare gcc-plugins
		$(Q)$(MAKE) $(build)=.
		@@ -1177,9 +1175,6 @@ archheaders:
		PHONY += archscripts
		archscripts:

		PHONY += archmacros
		archmacros:

		PHONY += __headers
		__headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
		$(Q)$(MAKE) $(build)=scripts build_unifdef

+6 −7

Original line number	Diff line number	Diff line
		@@ -310,25 +310,24 @@ void __init setup_arch(char **cmdline_p)

		register_console(&prom_early_console);

		printk("ARCH: ");
		switch(sparc_cpu_model) {
		case sun4m:
		printk("SUN4M\n");
		pr_info("ARCH: SUN4M\n");
		break;
		case sun4d:
		printk("SUN4D\n");
		pr_info("ARCH: SUN4D\n");
		break;
		case sun4e:
		printk("SUN4E\n");
		pr_info("ARCH: SUN4E\n");
		break;
		case sun4u:
		printk("SUN4U\n");
		pr_info("ARCH: SUN4U\n");
		break;
		case sparc_leon:
		printk("LEON\n");
		pr_info("ARCH: LEON\n");
		break;
		default:
		printk("UNKNOWN!\n");
		pr_info("ARCH: UNKNOWN!\n");
		break;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -642,9 +642,9 @@ void __init setup_arch(char **cmdline_p)
		register_console(&prom_early_console);

		if (tlb_type == hypervisor)
		printk("ARCH: SUN4V\n");
		pr_info("ARCH: SUN4V\n");
		else
		printk("ARCH: SUN4U\n");
		pr_info("ARCH: SUN4U\n");

		#ifdef CONFIG_DUMMY_CONSOLE
		conswitchp = &dummy_con;

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
		CPPFLAGS_vdso.lds += -P -C

		VDSO_LDFLAGS_vdso.lds = -m elf64_sparc -soname linux-vdso.so.1 --no-undefined \
		-z max-page-size=8192 -z common-page-size=8192
		-z max-page-size=8192

		$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
		$(call if_changed,vdso)