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

Commit 93022136 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.26-rc9' into x86/cpu

parents c49c412a b7279469
Loading
Loading
Loading
Loading
+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
+3 −2
Original line number Original line Diff line number Diff line
@@ -2611,8 +2611,9 @@ S: Perth, Western Australia
S: Australia
S: Australia


N: Miguel Ojeda Sandonis
N: Miguel Ojeda Sandonis
E: maxextreme@gmail.com
E: miguel.ojeda.sandonis@gmail.com
W: http://maxextreme.googlepages.com/
W: http://miguelojeda.es
W: http://jair.lab.fi.uva.es/~migojed/
D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.
D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.
D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
S: C/ Mieses 20, 9-B
S: C/ Mieses 20, 9-B
+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
+46 −0
Original line number Original line Diff line number Diff line
@@ -327,6 +327,52 @@ Some people also put extra tags at the end. They'll just be ignored for
now, but you can do this to mark internal company procedures or just
now, but you can do this to mark internal company procedures or just
point out some special detail about the sign-off. 
point out some special detail about the sign-off. 


If you are a subsystem or branch maintainer, sometimes you need to slightly
modify patches you receive in order to merge them, because the code is not
exactly the same in your tree and the submitters'. If you stick strictly to
rule (c), you should ask the submitter to rediff, but this is a totally
counter-productive waste of time and energy. Rule (b) allows you to adjust
the code, but then it is very impolite to change one submitter's code and
make him endorse your bugs. To solve this problem, it is recommended that
you add a line between the last Signed-off-by header and yours, indicating
the nature of your changes. While there is nothing mandatory about this, it
seems like prepending the description with your mail and/or name, all
enclosed in square brackets, is noticeable enough to make it obvious that
you are responsible for last-minute changes. Example :

	Signed-off-by: Random J Developer <random@developer.example.org>
	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
	Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>

This practise is particularly helpful if you maintain a stable branch and
want at the same time to credit the author, track changes, merge the fix,
and protect the submitter from complaints. Note that under no circumstances
can you change the author's identity (the From header), as it is the one
which appears in the changelog.

Special note to back-porters: It seems to be a common and useful practise
to insert an indication of the origin of a patch at the top of the commit
message (just after the subject line) to facilitate tracking. For instance,
here's what we see in 2.6-stable :

    Date:   Tue May 13 19:10:30 2008 +0000

        SCSI: libiscsi regression in 2.6.25: fix nop timer handling

        commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream

And here's what appears in 2.4 :

    Date:   Tue May 13 22:12:27 2008 +0200

        wireless, airo: waitbusy() won't delay

        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]

Whatever the format, this information provides a valuable help to people
tracking your trees, and to people trying to trouble-shoot bugs in your
tree.



13) When to use Acked-by: and Cc:
13) When to use Acked-by: and Cc:


+6 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ There are three different groups of fields in the struct taskstats:


4) Per-task and per-thread context switch count statistics
4) Per-task and per-thread context switch count statistics


5) Time accounting for SMT machines

Future extension should add fields to the end of the taskstats struct, and
Future extension should add fields to the end of the taskstats struct, and
should not change the relative position of each field within the struct.
should not change the relative position of each field within the struct.


@@ -164,4 +166,8 @@ struct taskstats {
	__u64	nvcsw;			/* Context voluntary switch counter */
	__u64	nvcsw;			/* Context voluntary switch counter */
	__u64	nivcsw;			/* Context involuntary switch counter */
	__u64	nivcsw;			/* Context involuntary switch counter */


5) Time accounting for SMT machines
	__u64	ac_utimescaled;		/* utime scaled on frequency etc */
	__u64	ac_stimescaled;		/* stime scaled on frequency etc */
	__u64	cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
}
}
Loading