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

Commit ea2aca08 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:

	Documentation/feature-removal-schedule.txt
	drivers/net/wan/hdlc_fr.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
parents f3032be9 c5a78ac0

.gitignore

+9 −2
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# subdirectories here. Add them in the ".gitignore" file

# 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

#

.*
@@ -18,18 +22,21 @@ 
*.lst

*.symtypes

*.order

*.elf

*.bin

*.gz



#

# Top-level generic files

#

tags

TAGS

vmlinux*

!vmlinux.lds.S

vmlinux

System.map

Module.markers

Module.symvers

!.gitignore

!.mailmap



#

# Generated include files

Documentation/DocBook/kgdb.tmpl

+6 −14
Original line number Diff line number Diff line
@@ -84,10 +84,9 @@ 
    runs an instance of gdb against the vmlinux file which contains

    the symbols (not boot image such as bzImage, zImage, uImage...).

    In gdb the developer specifies the connection parameters and

    connects to kgdb.  Depending on which kgdb I/O modules exist in

    the kernel for a given architecture, it may be possible to debug

    the test machine's kernel with the development machine using a

    rs232 or ethernet connection.

    connects to kgdb.  The type of connection a developer makes with

    gdb depends on the availability of kgdb I/O modules compiled as

    builtin's or kernel modules in the test machine's kernel.

    </para>

  </chapter>

  <chapter id="CompilingAKernel">
@@ -223,7 +222,7 @@ 
  </para>

  <para>

  IMPORTANT NOTE: Using this option with kgdb over the console

  (kgdboc) or kgdb over ethernet (kgdboe) is not supported.

  (kgdboc) is not supported.

  </para>

  </sect1>

  </chapter>
@@ -249,18 +248,11 @@ 
    (gdb) target remote /dev/ttyS0

    </programlisting>

    <para>

    Example (kgdb to a terminal server):

    Example (kgdb to a terminal server on tcp port 2012):

    </para>

    <programlisting>

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    </programlisting>

    <para>

    Example (kgdb over ethernet):

    </para>

    <programlisting>

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    (gdb) target remote 192.168.2.2:2012

    </programlisting>

    <para>

    Once connected, you can debug a kernel the way you would debug an

Documentation/cpusets.txt

+1 −1
Original line number 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.

   3  : search cpus in a node [= system wide on non-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

belongs to.  Therefore if the flag 'sched_load_balance' of a cpuset

Documentation/feature-removal-schedule.txt

+9 −0
Original line number 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

	the new options.

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 Diff line number Diff line
@@ -36,6 +36,7 @@ files, each with their own function. 
       local_cpus	   nearby CPU mask (cpumask, ro)

       resource		   PCI resource host addresses (ascii, ro)

       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)

       subsystem_device	   PCI subsystem device (ascii, ro)

       subsystem_vendor	   PCI subsystem vendor (ascii, ro)