Merge commit 'v2.6.29-rc7' into sched/core (49d2d266) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/scsi/cxgb3i.txt

+5 −6

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2464,7 +2464,7 @@ S: Maintained

	ISDN SUBSYSTEM		ISDN SUBSYSTEM
	P: Karsten Keil		P: Karsten Keil
	M: kkeil@suse.de		M: isdn@linux-pingi.de
	L: isdn4linux@listserv.isdn4linux.de (subscribers-only)		L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
	W: http://www.isdn4linux.de		W: http://www.isdn4linux.de
	T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git		T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 29		SUBLEVEL = 29
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = Erotic Pickled Herring		NAME = Erotic Pickled Herring

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/kernel/setup.c

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -233,12 +233,13 @@ static void __init cacheid_init(void)
	unsigned int cachetype = read_cpuid_cachetype();		unsigned int cachetype = read_cpuid_cachetype();
	unsigned int arch = cpu_architecture();		unsigned int arch = cpu_architecture();

	if (arch >= CPU_ARCH_ARMv7) {		if (arch >= CPU_ARCH_ARMv6) {
			if ((cachetype & (7 << 29)) == 4 << 29) {
			/* ARMv7 register format */
	cacheid = CACHEID_VIPT_NONALIASING;		cacheid = CACHEID_VIPT_NONALIASING;
	if ((cachetype & (3 << 14)) == 1 << 14)		if ((cachetype & (3 << 14)) == 1 << 14)
	cacheid \|= CACHEID_ASID_TAGGED;		cacheid \|= CACHEID_ASID_TAGGED;
	} else if (arch >= CPU_ARCH_ARMv6) {		} else if (cachetype & (1 << 23))
	if (cachetype & (1 << 23))
	cacheid = CACHEID_VIPT_ALIASING;		cacheid = CACHEID_VIPT_ALIASING;
	else		else
	cacheid = CACHEID_VIPT_NONALIASING;		cacheid = CACHEID_VIPT_NONALIASING;

arch/arm/mach-at91/pm.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -332,7 +332,6 @@ static int at91_pm_enter(suspend_state_t state)
	at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR));		at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR));

	error:		error:
	sdram_selfrefresh_disable();
	target_state = PM_SUSPEND_ON;		target_state = PM_SUSPEND_ON;
	at91_irq_resume();		at91_irq_resume();
	at91_gpio_resume();		at91_gpio_resume();

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@ Introduction
	============		============

	The Chelsio T3 ASIC based Adapters (S310, S320, S302, S304, Mezz cards, etc.		The Chelsio T3 ASIC based Adapters (S310, S320, S302, S304, Mezz cards, etc.
	series of products) supports iSCSI acceleration and iSCSI Direct Data Placement		series of products) support iSCSI acceleration and iSCSI Direct Data Placement
	(DDP) where the hardware handles the expensive byte touching operations, such		(DDP) where the hardware handles the expensive byte touching operations, such
	as CRC computation and verification, and direct DMA to the final host memory		as CRC computation and verification, and direct DMA to the final host memory
	destination:		destination:
	@@ -31,9 +31,9 @@ destination:
	the TCP segments onto the wire. It handles TCP retransmission if		the TCP segments onto the wire. It handles TCP retransmission if
	needed.		needed.

	On receving, S3 h/w recovers the iSCSI PDU by reassembling TCP		On receiving, S3 h/w recovers the iSCSI PDU by reassembling TCP
	segments, separating the header and data, calculating and verifying		segments, separating the header and data, calculating and verifying
	the digests, then forwards the header to the host. The payload data,		the digests, then forwarding the header to the host. The payload data,
	if possible, will be directly placed into the pre-posted host DDP		if possible, will be directly placed into the pre-posted host DDP
	buffer. Otherwise, the payload data will be sent to the host too.		buffer. Otherwise, the payload data will be sent to the host too.

	@@ -68,9 +68,8 @@ The following steps need to be taken to accelerates the open-iscsi initiator:
	sure the ip address is unique in the network.		sure the ip address is unique in the network.

	3. edit /etc/iscsi/iscsid.conf		3. edit /etc/iscsi/iscsid.conf
	The default setting for MaxRecvDataSegmentLength (131072) is too big,		The default setting for MaxRecvDataSegmentLength (131072) is too big;
	replace "node.conn[0].iscsi.MaxRecvDataSegmentLength" to be a value no		replace with a value no bigger than 15360 (for example 8192):
	bigger than 15360 (for example 8192):

	node.conn[0].iscsi.MaxRecvDataSegmentLength = 8192		node.conn[0].iscsi.MaxRecvDataSegmentLength = 8192