Merge branch 'linux-2.6' (b242a602) · Commits · 戴 / test

Documentation/networking/bonding.txt

+27 −2

Original line number	Diff line number	Diff line
		@@ -554,6 +554,30 @@ xmit_hash_policy

		This algorithm is 802.3ad compliant.

		layer2+3

		This policy uses a combination of layer2 and layer3
		protocol information to generate the hash.

		Uses XOR of hardware MAC addresses and IP addresses to
		generate the hash. The formula is

		(((source IP XOR dest IP) AND 0xffff) XOR
		( source MAC XOR destination MAC ))
		modulo slave count

		This algorithm will place all traffic to a particular
		network peer on the same slave. For non-IP traffic,
		the formula is the same as for the layer2 transmit
		hash policy.

		This policy is intended to provide a more balanced
		distribution of traffic than layer2 alone, especially
		in environments where a layer3 gateway device is
		required to reach most destinations.

		This algorithm is 802.3ad complient.

		layer3+4

		This policy uses upper layer protocol information,
		@@ -589,8 +613,9 @@ xmit_hash_policy
		or may not tolerate this noncompliance.

		The default value is layer2. This option was added in bonding
		version 2.6.3. In earlier versions of bonding, this parameter does
		not exist, and the layer2 policy is the only policy.
		version 2.6.3. In earlier versions of bonding, this parameter
		does not exist, and the layer2 policy is the only policy. The
		layer2+3 value was added for bonding version 3.2.2.


		3. Configuring Bonding Devices

+5 −14

Original line number	Diff line number	Diff line
		@@ -1681,8 +1681,7 @@ S: Maintained
		HARMONY SOUND DRIVER
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		W: http://www.parisc-linux.org/~kyle/harmony/
		L: parisc-linux@lists.parisc-linux.org
		L: linux-parisc@vger.kernel.org
		S: Maintained

		HAYES ESP SERIAL DRIVER
		@@ -2173,7 +2172,7 @@ S: Maintained

		KDUMP
		P: Vivek Goyal
		M: vgoyal@in.ibm.com
		M: vgoyal@redhat.com
		P: Haren Myneni
		M: hbabu@us.ibm.com
		L: kexec@lists.infradead.org
		@@ -2598,13 +2597,6 @@ L: https://tango.0pointer.de/mailman/listinfo/s270-linux
		W: http://0pointer.de/lennart/tchibo.html
		S: Maintained

		MTRR AND SIMILAR SUPPORT [i386]
		P: Richard Gooch
		M: rgooch@atnf.csiro.au
		L: linux-kernel@vger.kernel.org
		W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
		S: Maintained

		MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
		P: Pierre Ossman
		M: drzeus-mmc@drzeus.cx
		@@ -2897,16 +2889,15 @@ W: http://www.torque.net/linux-pp.html
		S: Maintained

		PARISC ARCHITECTURE
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		P: Matthew Wilcox
		M: matthew@wil.cx
		P: Grant Grundler
		M: grundler@parisc-linux.org
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		L: parisc-linux@parisc-linux.org
		L: linux-parisc@vger.kernel.org
		W: http://www.parisc-linux.org/
		T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
		T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
		S: Maintained

		PARAVIRT_OPS INTERFACE

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 24
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Arr Matey! A Hairy Bilge Rat!

		# DOCUMENTATION

+28 −37

Original line number	Diff line number	Diff line
		@@ -6,8 +6,7 @@
		mainmenu "Linux Kernel Configuration"

		config AVR32
		bool
		default y
		def_bool y
		# With EMBEDDED=n, we get lots of stuff automatically selected
		# that we usually don't need on AVR32.
		select EMBEDDED
		@@ -20,51 +19,49 @@ config AVR32
		http://avr32linux.org/.

		config GENERIC_GPIO
		bool
		default y
		def_bool y

		config GENERIC_HARDIRQS
		bool
		default y
		def_bool y

		config STACKTRACE_SUPPORT
		def_bool y

		config LOCKDEP_SUPPORT
		def_bool y

		config TRACE_IRQFLAGS_SUPPORT
		def_bool y

		config HARDIRQS_SW_RESEND
		bool
		default y
		def_bool y

		config GENERIC_IRQ_PROBE
		bool
		default y
		def_bool y

		config RWSEM_GENERIC_SPINLOCK
		bool
		default y
		def_bool y

		config GENERIC_TIME
		bool
		default y
		def_bool y

		config RWSEM_XCHGADD_ALGORITHM
		bool
		def_bool n

		config ARCH_HAS_ILOG2_U32
		bool
		default n
		def_bool n

		config ARCH_HAS_ILOG2_U64
		bool
		default n
		def_bool n

		config GENERIC_HWEIGHT
		bool
		default y
		def_bool y

		config GENERIC_CALIBRATE_DELAY
		bool
		default y
		def_bool y

		config GENERIC_BUG
		bool
		default y
		def_bool y
		depends on BUG

		source "init/Kconfig"
		@@ -139,28 +136,22 @@ config PHYS_OFFSET
		source "kernel/Kconfig.preempt"

		config HAVE_ARCH_BOOTMEM_NODE
		bool
		default n
		def_bool n

		config ARCH_HAVE_MEMORY_PRESENT
		bool
		default n
		def_bool n

		config NEED_NODE_MEMMAP_SIZE
		bool
		default n
		def_bool n

		config ARCH_FLATMEM_ENABLE
		bool
		default y
		def_bool y

		config ARCH_DISCONTIGMEM_ENABLE
		bool
		default n
		def_bool n

		config ARCH_SPARSEMEM_ENABLE
		bool
		default n
		def_bool n

		source "mm/Kconfig"

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ obj-y += signal.o sys_avr32.o process.o time.o
		obj-y += init_task.o switch_to.o cpu.o
		obj-$(CONFIG_MODULES) += module.o avr32_ksyms.o
		obj-$(CONFIG_KPROBES) += kprobes.o
		obj-$(CONFIG_STACKTRACE) += stacktrace.o