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

Commit cc84ef3f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'origin/master' of ../linux-2.6 into drm-next 

This was a non-trivial merge with some patches sent to Linus
in drm-fixes.

Conflicts:
	drivers/gpu/drm/radeon/r300.c
	drivers/gpu/drm/radeon/radeon_asic.h
	drivers/gpu/drm/radeon/rs600.c
	drivers/gpu/drm/radeon/rs690.c
	drivers/gpu/drm/radeon/rv515.c
parents c746e205 3ff323f8

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 31

EXTRAVERSION = -rc8

EXTRAVERSION = -rc9

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*

arch/ia64/kernel/dma-mapping.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ EXPORT_SYMBOL(dma_ops); 
static int __init dma_init(void)

{

	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);



	return 0;

}

fs_initcall(dma_init);

arch/ia64/lib/ip_fast_csum.S

+5 −3
Original line number Diff line number Diff line
@@ -96,20 +96,22 @@ END(ip_fast_csum) 
GLOBAL_ENTRY(csum_ipv6_magic)

	ld4	r20=[in0],4

	ld4	r21=[in1],4

	dep	r15=in3,in2,32,16

	zxt4	in2=in2

	;;

	ld4	r22=[in0],4

	ld4	r23=[in1],4

	mux1	r15=r15,@rev

	dep	r15=in3,in2,32,16

	;;

	ld4	r24=[in0],4

	ld4	r25=[in1],4

	shr.u	r15=r15,16

	mux1	r15=r15,@rev

	add	r16=r20,r21

	add	r17=r22,r23

	zxt4	in4=in4

	;;

	ld4	r26=[in0],4

	ld4	r27=[in1],4

	shr.u	r15=r15,16

	add	r18=r24,r25

	add	r8=r16,r17

	;;

arch/powerpc/kernel/power7-pmu.c

+3 −3
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int power7_generic_events[] = { 
 */

static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {

	[C(L1D)] = {		/* 	RESULT_ACCESS	RESULT_MISS */

		[C(OP_READ)] = {	0x400f0,	0xc880	},

		[C(OP_READ)] = {	0xc880,		0x400f0	},

		[C(OP_WRITE)] = {	0,		0x300f0	},

		[C(OP_PREFETCH)] = {	0xd8b8,		0	},

	},
@@ -327,8 +327,8 @@ static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = { 
		[C(OP_PREFETCH)] = {	0x408a,		0	},

	},

	[C(LL)] = {		/* 	RESULT_ACCESS	RESULT_MISS */

		[C(OP_READ)] = {	0x6080,		0x6084	},

		[C(OP_WRITE)] = {	0x6082,		0x6086	},

		[C(OP_READ)] = {	0x16080,	0x26080	},

		[C(OP_WRITE)] = {	0x16082,	0x26082	},

		[C(OP_PREFETCH)] = {	0,		0	},

	},

	[C(DTLB)] = {		/* 	RESULT_ACCESS	RESULT_MISS */

arch/powerpc/sysdev/xilinx_intc.c

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc) 
		generic_handle_irq(cascade_irq);



	/* Let xilinx_intc end the interrupt */

	desc->chip->ack(irq);

	desc->chip->unmask(irq);

}