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

Commit 0e2f65ee authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/pebs 



Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents da7878d7 fb2e405f

.gitignore

+9 −3
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,19 +22,21 @@ 
*.lst

*.symtypes

*.order

*.elf

*.bin

*.gz



#

# Top-level generic files

#

tags

TAGS

vmlinux*

!vmlinux.lds.S

!vmlinux.lds.h

vmlinux

System.map

Module.markers

Module.symvers

!.gitignore

!.mailmap



#

# Generated include files

CREDITS

+12 −4
Original line number Diff line number Diff line
@@ -317,6 +317,14 @@ S: 2322 37th Ave SW 
S: Seattle, Washington 98126-2010

S: USA



N: Muli Ben-Yehuda

E: mulix@mulix.org

E: muli@il.ibm.com

W: http://www.mulix.org

D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU,

D: KVM and Xen bits and other misc. hackery.

S: Haifa, Israel



N: Johannes Berg

E: johannes@sipsolutions.net

W: http://johannes.sipsolutions.net/
@@ -2611,8 +2619,9 @@ S: Perth, Western Australia 
S: Australia



N: Miguel Ojeda Sandonis

E: maxextreme@gmail.com

W: http://maxextreme.googlepages.com/

E: miguel.ojeda.sandonis@gmail.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: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B
@@ -3343,8 +3352,7 @@ S: Spain 
N: Linus Torvalds

E: torvalds@linux-foundation.org

D: Original kernel hacker

S: 12725 SW Millikan Way, Suite 400

S: Beaverton, Oregon 97005

S: Portland, Oregon 97005

S: USA



N: Marcelo Tosatti

Documentation/ABI/testing/sysfs-block

+34 −0
Original line number Diff line number Diff line
@@ -26,3 +26,37 @@ Description: 
		I/O statistics of partition <part>. The format is the

		same as the above-written /sys/block/<disk>/stat

		format.





What:		/sys/block/<disk>/integrity/format

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Metadata format for integrity capable block device.

		E.g. T10-DIF-TYPE1-CRC.





What:		/sys/block/<disk>/integrity/read_verify

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Indicates whether the block layer should verify the

		integrity of read requests serviced by devices that

		support sending integrity metadata.





What:		/sys/block/<disk>/integrity/tag_size

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Number of bytes of integrity tag space available per

		512 bytes of data.





What:		/sys/block/<disk>/integrity/write_generate

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Indicates whether the block layer should automatically

		generate checksums for write requests bound for

		devices that support receiving integrity metadata.

Documentation/ABI/testing/sysfs-bus-css

0 → 100644
+35 −0
Original line number Diff line number Diff line 
What:		/sys/bus/css/devices/.../type

Date:		March 2008

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the subchannel type, as reported by the hardware.

		This attribute is present for all subchannel types.



What:		/sys/bus/css/devices/.../modalias

Date:		March 2008

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the module alias as reported with uevents.

		It is of the format css:t<type> and present for all

		subchannel types.



What:		/sys/bus/css/drivers/io_subchannel/.../chpids

Date:		December 2002

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the ids of the channel paths used by this

		subchannel, as reported by the channel subsystem

		during subchannel recognition.

		Note: This is an I/O-subchannel specific attribute.

Users:		s390-tools, HAL



What:		/sys/bus/css/drivers/io_subchannel/.../pimpampom

Date:		December 2002

Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>

		linux-s390@vger.kernel.org

Description:	Contains the PIM/PAM/POM values, as reported by the

		channel subsystem when last queried by the common I/O

		layer (this implies that this attribute is not neccessarily

		in sync with the values current in the channel subsystem).

		Note: This is an I/O-subchannel specific attribute.

Users:		s390-tools, HAL

Documentation/ABI/testing/sysfs-dev

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/dev

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Dan Williams <dan.j.williams@intel.com>

Description:	The /sys/dev tree provides a method to look up the sysfs

		path for a device using the information returned from

		stat(2).  There are two directories, 'block' and 'char',

		beneath /sys/dev containing symbolic links with names of

		the form "<major>:<minor>".  These links point to the

		corresponding sysfs path for the given device.



		Example:

		$ readlink /sys/dev/block/8:32

		../../block/sdc



		Entries in /sys/dev/char and /sys/dev/block will be

		dynamically created and destroyed as devices enter and

		leave the system.



Users:		mdadm <linux-raid@vger.kernel.org>