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

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

Merge branch 'linus' into perfcounters/core 



Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 0990b1c6 65795efb

.gitignore

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

# in that subdirectory instead.

#

# NOTE! Please use 'git-ls-files -i --exclude-standard'

# 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.

#
@@ -25,6 +25,8 @@ 
*.elf

*.bin

*.gz

*.lzma

*.patch



#

# Top-level generic files
@@ -62,6 +64,12 @@ series 
cscope.*

ncscope.*



# gnu global files

GPATH

GRTAGS

GSYMS

GTAGS



*.orig

*~

\#*#

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7 
S: Sterling Heights, Michigan 48313

S: USA



N: Wolfgang Grandegger

E: wg@grandegger.com

D: Controller Area Network (device drivers)



N: William Greathouse

E: wgreathouse@smva.com

E: wgreathouse@myfavoritei.com

Documentation/Changes

+17 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ hardware, for example, you probably needn't concern yourself with 
isdn4k-utils.



o  Gnu C                  3.2                     # gcc --version

o  Gnu make               3.79.1                  # make --version

o  Gnu make               3.80                    # make --version

o  binutils               2.12                    # ld -v

o  util-linux             2.10o                   # fdformat --version

o  module-init-tools      0.9.10                  # depmod -V
@@ -48,6 +48,7 @@ o procps 3.2.0 # ps --version 
o  oprofile               0.9                     # oprofiled --version

o  udev                   081                     # udevinfo -V

o  grub                   0.93                    # grub --version

o  mcelog		  0.6



Kernel compilation

==================
@@ -61,7 +62,7 @@ computer. 
Make

----



You will need Gnu make 3.79.1 or later to build the kernel.

You will need Gnu make 3.80 or later to build the kernel.



Binutils

--------
@@ -276,6 +277,16 @@ before running exportfs or mountd. It is recommended that all NFS 
services be protected from the internet-at-large by a firewall where

that is possible.



mcelog

------



In Linux 2.6.31+ the i386 kernel needs to run the mcelog utility

as a regular cronjob similar to the x86-64 kernel to process and log

machine check events when CONFIG_X86_NEW_MCE is enabled. Machine check

events are errors reported by the CPU. Processing them is strongly encouraged.

All x86-64 kernels since 2.6.4 require the mcelog utility to

process machine checks.



Getting updated software

========================
@@ -365,6 +376,10 @@ FUSE 
----

o <http://sourceforge.net/projects/fuse>



mcelog

------

o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/mcelog/>



Networking

**********

Documentation/CodingStyle

+2 −2
Original line number Diff line number Diff line
@@ -698,8 +698,8 @@ very often is not. Abundant use of the inline keyword leads to a much bigger 
kernel, which in turn slows the system as a whole down, due to a bigger

icache footprint for the CPU and simply because there is less memory

available for the pagecache. Just think about it; a pagecache miss causes a

disk seek, which easily takes 5 miliseconds. There are a LOT of cpu cycles

that can go into these 5 miliseconds.

disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles

that can go into these 5 milliseconds.



A reasonable rule of thumb is to not put inline at functions that have more

than 3 lines of code in them. An exception to this rule are the cases where

Documentation/DMA-API.txt

+2 −2
Original line number Diff line number Diff line
@@ -676,8 +676,8 @@ this directory the following files can currently be found: 
	dma-api/all_errors	This file contains a numeric value. If this

				value is not equal to zero the debugging code

				will print a warning for every error it finds

				into the kernel log. Be carefull with this

				option. It can easily flood your logs.

				into the kernel log. Be careful with this

				option, as it can easily flood your logs.



	dma-api/disabled	This read-only file contains the character 'Y'

				if the debugging code is disabled. This can