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

Commit 508827ff authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
parents 2c3c3d02 72e2240f

Documentation/networking/ipv6.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 


Options for the ipv6 module are supplied as parameters at load time.



Module options may be given as command line arguments to the insmod

or modprobe command, but are usually specified in either the

/etc/modules.conf or /etc/modprobe.conf configuration file, or in a

distro-specific configuration file.



The available ipv6 module parameters are listed below.  If a parameter

is not specified the default value is used.



The parameters are as follows:



disable



	Specifies whether to load the IPv6 module, but disable all

	its functionality.  This might be used when another module

	has a dependency on the IPv6 module being loaded, but no

	IPv6 addresses or operations are desired.



	The possible values and their effects are:



	0

		IPv6 is enabled.



		This is the default value.



	1

		IPv6 is disabled.



		No IPv6 addresses will be added to interfaces, and

		it will not be possible to open an IPv6 socket.



		A reboot is required to enable IPv6.

Documentation/scsi/cxgb3i.txt

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



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

as CRC computation and verification, and direct DMA to the final host memory

destination:
@@ -31,9 +31,9 @@ destination: 
	  the TCP segments onto the wire. It handles TCP retransmission if

	  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

	  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

	  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.



3. edit /etc/iscsi/iscsid.conf

   The default setting for MaxRecvDataSegmentLength (131072) is too big,

   replace "node.conn[0].iscsi.MaxRecvDataSegmentLength" to be a value no

   bigger than 15360 (for example 8192):

   The default setting for MaxRecvDataSegmentLength (131072) is too big;

   replace with a value no bigger than 15360 (for example 8192):



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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2466,7 +2466,7 @@ S: Maintained 


ISDN SUBSYSTEM

P:	Karsten Keil

M:	kkeil@suse.de

M:	isdn@linux-pingi.de

L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)

W:	http://www.isdn4linux.de

T:	git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/arm/kernel/setup.c

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

	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;

			if ((cachetype & (3 << 14)) == 1 << 14)

				cacheid |= CACHEID_ASID_TAGGED;

	} else if (arch >= CPU_ARCH_ARMv6) {

		if (cachetype & (1 << 23))

		} else if (cachetype & (1 << 23))

			cacheid = CACHEID_VIPT_ALIASING;

		else

			cacheid = CACHEID_VIPT_NONALIASING;