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

Commit 6338a53a authored Feb 18, 2013 by David S. Miller

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



Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.

Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c   A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 8064b3cf 18cf0d07

Documentation/x86/boot.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -390,6 +390,7 @@ Protocol: 2.00+
	F Special (0xFF = undefined)		F Special (0xFF = undefined)
	10 Reserved		10 Reserved
	11 Minimal Linux Bootloader <http://sebastian-plotz.blogspot.de>		11 Minimal Linux Bootloader <http://sebastian-plotz.blogspot.de>
			12 OVMF UEFI virtualization stack

	Please contact <hpa@zytor.com> if you need a bootloader ID		Please contact <hpa@zytor.com> if you need a bootloader ID
	value assigned.		value assigned.

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7524,7 +7524,7 @@ S: Maintained
	F: drivers/media/tuners/tea5767.*		F: drivers/media/tuners/tea5767.*

	TEAM DRIVER		TEAM DRIVER
	M: Jiri Pirko <jpirko@redhat.com>		M: Jiri Pirko <jiri@resnulli.us>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Supported
	F: drivers/net/team/		F: drivers/net/team/

arch/arm/include/asm/smp_scu.h

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,14 @@

	#ifndef __ASSEMBLER__		#ifndef __ASSEMBLER__
	unsigned int scu_get_core_count(void __iomem *);		unsigned int scu_get_core_count(void __iomem *);
	void scu_enable(void __iomem *);
	int scu_power_mode(void __iomem *, unsigned int);		int scu_power_mode(void __iomem *, unsigned int);

			#ifdef CONFIG_SMP
			void scu_enable(void __iomem *scu_base);
			#else
			static inline void scu_enable(void __iomem *scu_base) {}
			#endif

	#endif		#endif

	#endif		#endif

arch/arm/kernel/smp_scu.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base)
	int scu_power_mode(void __iomem *scu_base, unsigned int mode)		int scu_power_mode(void __iomem *scu_base, unsigned int mode)
	{		{
	unsigned int val;		unsigned int val;
	int cpu = cpu_logical_map(smp_processor_id());		int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);

	if (mode > 3 \|\| mode == 1 \|\| cpu > 3)		if (mode > 3 \|\| mode == 1 \|\| cpu > 3)
	return -EINVAL;		return -EINVAL;

arch/arm/mach-highbank/highbank.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@

	#include <asm/arch_timer.h>		#include <asm/arch_timer.h>
	#include <asm/cacheflush.h>		#include <asm/cacheflush.h>
			#include <asm/cputype.h>
	#include <asm/smp_plat.h>		#include <asm/smp_plat.h>
	#include <asm/smp_twd.h>		#include <asm/smp_twd.h>
	#include <asm/hardware/arm_timer.h>		#include <asm/hardware/arm_timer.h>
	@@ -59,7 +60,7 @@ static void __init highbank_scu_map_io(void)

	void highbank_set_cpu_jump(int cpu, void *jump_addr)		void highbank_set_cpu_jump(int cpu, void *jump_addr)
	{		{
	cpu = cpu_logical_map(cpu);		cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(cpu), 0);
	writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));		writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));
	__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);		__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
	outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),		outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),