Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (ea2aca08) · Commits · jan.koester / Linux

.gitignore

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,10 @@
	# subdirectories here. Add them in the ".gitignore" file		# subdirectories here. Add them in the ".gitignore" file
	# in that subdirectory instead.		# in that subdirectory instead.
	#		#
			# NOTE! Please use 'git-ls-files -i --exclude-standard'
			# command after changing this file, to see if there are
			# any tracked files which get ignored after the change.
			#
	# Normal rules		# Normal rules
	#		#
	.*		.*
	@@ -18,18 +22,21 @@
	*.lst		*.lst
	*.symtypes		*.symtypes
	*.order		*.order
			*.elf
			*.bin
			*.gz

	#		#
	# Top-level generic files		# Top-level generic files
	#		#
	tags		tags
	TAGS		TAGS
	vmlinux*		vmlinux
	!vmlinux.lds.S
	System.map		System.map
	Module.markers		Module.markers
	Module.symvers		Module.symvers
	!.gitignore		!.gitignore
			!.mailmap

	#		#
	# Generated include files		# Generated include files

Documentation/DocBook/kgdb.tmpl

+6 −14

Original line number	Original line	Diff line number	Diff line
	@@ -84,10 +84,9 @@
	runs an instance of gdb against the vmlinux file which contains		runs an instance of gdb against the vmlinux file which contains
	the symbols (not boot image such as bzImage, zImage, uImage...).		the symbols (not boot image such as bzImage, zImage, uImage...).
	In gdb the developer specifies the connection parameters and		In gdb the developer specifies the connection parameters and
	connects to kgdb. Depending on which kgdb I/O modules exist in		connects to kgdb. The type of connection a developer makes with
	the kernel for a given architecture, it may be possible to debug		gdb depends on the availability of kgdb I/O modules compiled as
	the test machine's kernel with the development machine using a		builtin's or kernel modules in the test machine's kernel.
	rs232 or ethernet connection.
	</para>		</para>
	</chapter>		</chapter>
	<chapter id="CompilingAKernel">		<chapter id="CompilingAKernel">
	@@ -223,7 +222,7 @@
	</para>		</para>
	<para>		<para>
	IMPORTANT NOTE: Using this option with kgdb over the console		IMPORTANT NOTE: Using this option with kgdb over the console
	(kgdboc) or kgdb over ethernet (kgdboe) is not supported.		(kgdboc) is not supported.
	</para>		</para>
	</sect1>		</sect1>
	</chapter>		</chapter>
	@@ -249,18 +248,11 @@
	(gdb) target remote /dev/ttyS0		(gdb) target remote /dev/ttyS0
	</programlisting>		</programlisting>
	<para>		<para>
	Example (kgdb to a terminal server):		Example (kgdb to a terminal server on tcp port 2012):
	</para>		</para>
	<programlisting>		<programlisting>
	% gdb ./vmlinux		% gdb ./vmlinux
	(gdb) target remote udp:192.168.2.2:6443		(gdb) target remote 192.168.2.2:2012
	</programlisting>
	<para>
	Example (kgdb over ethernet):
	</para>
	<programlisting>
	% gdb ./vmlinux
	(gdb) target remote udp:192.168.2.2:6443
	</programlisting>		</programlisting>
	<para>		<para>
	Once connected, you can debug a kernel the way you would debug an		Once connected, you can debug a kernel the way you would debug an

Documentation/cpusets.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -542,7 +542,7 @@ otherwise initial value -1 that indicates the cpuset has no request.
	2 : search cores in a package.		2 : search cores in a package.
	3 : search cpus in a node [= system wide on non-NUMA system]		3 : search cpus in a node [= system wide on non-NUMA system]
	( 4 : search nodes in a chunk of node [on NUMA system] )		( 4 : search nodes in a chunk of node [on NUMA system] )
	( 5~ : search system wide [on NUMA system])		( 5 : search system wide [on NUMA system] )

	This file is per-cpuset and affect the sched domain where the cpuset		This file is per-cpuset and affect the sched domain where the cpuset
	belongs to. Therefore if the flag 'sched_load_balance' of a cpuset		belongs to. Therefore if the flag 'sched_load_balance' of a cpuset

Documentation/feature-removal-schedule.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -324,3 +324,12 @@ Why: A newer version of the options have been introduced in 2005 that
	space app that directly uses the old options should convert to using		space app that directly uses the old options should convert to using
	the new options.		the new options.
	Who: Vlad Yasevich <vladislav.yasevich@hp.com>		Who: Vlad Yasevich <vladislav.yasevich@hp.com>

			---------------------------

			What: CONFIG_THERMAL_HWMON
			When: January 2009
			Why: This option was introduced just to allow older lm-sensors userspace
			to keep working over the upgrade to 2.6.26. At the scheduled time of
			removal fixed lm-sensors (2.x or 3.x) should be readily available.
			Who: Rene Herman <rene.herman@gmail.com>

Documentation/filesystems/sysfs-pci.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ files, each with their own function.
	local_cpus nearby CPU mask (cpumask, ro)		local_cpus nearby CPU mask (cpumask, ro)
	resource PCI resource host addresses (ascii, ro)		resource PCI resource host addresses (ascii, ro)
	resource0..N PCI resource N, if present (binary, mmap)		resource0..N PCI resource N, if present (binary, mmap)
			resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap)
	rom PCI ROM resource, if present (binary, ro)		rom PCI ROM resource, if present (binary, ro)
	subsystem_device PCI subsystem device (ascii, ro)		subsystem_device PCI subsystem device (ascii, ro)
	subsystem_vendor PCI subsystem vendor (ascii, ro)		subsystem_vendor PCI subsystem vendor (ascii, ro)