Commit 2a1e1379 authored by James Bottomley's avatar James Bottomley
Browse files

Merge by hand (conflicts in scsi_lib.c) 



This merge is pretty extensive.  The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parents 787926b1 7b666653

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1284,8 +1284,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git 
S:	Supported



INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS

P:	Vojtech Pavlik

M:	vojtech@suse.cz

P:	Dmitry Torokhov

M:	dtor_core@ameritech.net

L:	linux-input@atrey.karlin.mff.cuni.cz

L:	linux-joystick@atrey.karlin.mff.cuni.cz

T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git

arch/alpha/kernel/machvec_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define CAT1(x,y)  x##y

#define CAT(x,y)   CAT1(x,y)



#define DO_DEFAULT_RTC rtc_port: 0x70

#define DO_DEFAULT_RTC .rtc_port = 0x70



#define DO_EV4_MMU							\

	.max_asn =			EV4_MAX_ASN,			\

arch/arm/kernel/module.c

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 
			break;



		case R_ARM_PC24:

		case R_ARM_CALL:

		case R_ARM_JUMP24:

			offset = (*(u32 *)loc & 0x00ffffff) << 2;

			if (offset & 0x02000000)

				offset -= 0x04000000;

arch/arm/mach-pxa/pm.c

+5 −4
Original line number Diff line number Diff line
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state) 
	PSPR = 0;



	/* restore registers */

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);

	RESTORE(GAFR0_L); RESTORE(GAFR0_U);

	RESTORE(GAFR1_L); RESTORE(GAFR1_U);

	RESTORE(GAFR2_L); RESTORE(GAFR2_U);

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);

	RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2);

	RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);

	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);



#ifdef CONFIG_PXA27x

	RESTORE(MDREFR);

	RESTORE(GAFR3_L); RESTORE(GAFR3_U); RESTORE_GPLEVEL(3);

	RESTORE(GPDR3); RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);

	RESTORE_GPLEVEL(3); RESTORE(GPDR3);

	RESTORE(GAFR3_L); RESTORE(GAFR3_U);

	RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);

	RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);

	RESTORE(PFER); RESTORE(PKWR);

#endif

arch/i386/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr) 
			addr < phys_to_virt(ISA_END_ADDRESS))

		return;



	addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr);

	addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr);



	/* Use the vm area unlocked, assuming the caller

	   ensures there isn't another iounmap for the same address

CRA Git | Maintained and supported by SUSTech CRA and CCSE