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

Commit 06c54055 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/stmicro/stmmac/stmmac_platform.c
	net/bridge/br_multicast.c
	net/ipv6/sit.c

The conflicts were minor:

1) sit.c changes overlap with change to ip_tunnel_xmit() signature.

2) br_multicast.c had an overlap between computing max_delay using
   msecs_to_jiffies and turning MLDV2_MRC() into an inline function
   with a name using lowercase instead of uppercase letters.

3) stmmac had two overlapping changes, one which conditionally allocated
   and hooked up a dma_cfg based upon the presence of the pbl OF property,
   and another one handling store-and-forward DMA made.  The latter of
   which should not go into the new of_find_property() basic block.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a5bbfc3 e2e5c4c0

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6067,7 +6067,7 @@ M: Rob Herring <rob.herring@calxeda.com> 
M:	Pawel Moll <pawel.moll@arm.com>

M:	Mark Rutland <mark.rutland@arm.com>

M:	Stephen Warren <swarren@wwwdotorg.org>

M:	Ian Campbell <ian.campbell@citrix.com>

M:	Ian Campbell <ijc+devicetree@hellion.org.uk>

L:	devicetree@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/

Makefile

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

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Linux for Workgroups



# *DOCUMENTATION*

arch/arc/lib/strchr-700.S

+10 −0
Original line number Diff line number Diff line
@@ -39,9 +39,18 @@ ARC_ENTRY strchr 
	ld.a	r2,[r0,4]

	sub	r12,r6,r7

	bic	r12,r12,r6

#ifdef __LITTLE_ENDIAN__

	and	r7,r12,r4

	breq	r7,0,.Loop ; For speed, we want this branch to be unaligned.

	b	.Lfound_char ; Likewise this one.

#else

	and	r12,r12,r4

	breq	r12,0,.Loop ; For speed, we want this branch to be unaligned.

	lsr_s	r12,r12,7

	bic 	r2,r7,r6

	b.d	.Lfound_char_b

	and_s	r2,r2,r12

#endif

; /* We require this code address to be unaligned for speed...  */

.Laligned:

	ld_s	r2,[r0]
@@ -95,6 +104,7 @@ ARC_ENTRY strchr 
	lsr	r7,r7,7



	bic	r2,r7,r6

.Lfound_char_b:

	norm	r2,r2

	sub_s	r0,r0,4

	asr_s	r2,r2,3

arch/arm/kernel/fiq.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ void set_fiq_handler(void *start, unsigned int length) 


	memcpy(base + offset, start, length);

	if (!cache_is_vipt_nonaliasing())

		flush_icache_range(base + offset, offset + length);

		flush_icache_range((unsigned long)base + offset, offset +

				   length);

	flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);

}

arch/arm/kernel/machine_kexec.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ void machine_crash_nonpanic_core(void *unused) 
	crash_save_cpu(&regs, smp_processor_id());

	flush_cache_all();



	set_cpu_online(smp_processor_id(), false);

	atomic_dec(&waiting_for_crash_ipi);

	while (1)

		cpu_relax();