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

Commit 659c36fc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Fixes and improvements for perf/core:

. Overhaul the tools/ makefiles, gluing them to the top level Makefile, from
  Borislav Petkov.

. Move the UI files from tools/perf/util/ui/ to tools/perf/ui/. Also move
  the GTK+ browser to tools/perf/ui/gtk/, from Namhyung Kim.

. Only fallback to sw cycles counter on ENOENT for the hw cycles, from
  Robert Richter

. Trivial fixes from Robert Richter

. Handle the autogenerated bison/flex files better, from Namhyung and Jiri Olsa.

. Navigate jump instructions in the annotate browser, just press enter or ->,
  still needs support for a jump navigation history, i.e. to go back.

. Search string in the annotate browser: same keys as vim:
     / forward
     n next backward/forward
     ? backward

. Clarify number of events/samples in the report header, from Ashay Rane

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9521d830 5a7ed29c

Documentation/00-INDEX

+4 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line. 


Following translations are available on the WWW:



   - Japanese, maintained by the JF Project (JF@linux.or.jp), at

     http://www.linux.or.jp/JF/

   - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at

     http://linuxjf.sourceforge.jp/



00-INDEX

	- this file.
@@ -104,6 +104,8 @@ cpuidle/ 
	- info on CPU_IDLE, CPU idle state management subsystem.

cputopology.txt

	- documentation on how CPU topology info is exported via sysfs.

crc32.txt

	- brief tutorial on CRC computation

cris/

	- directory with info about Linux on CRIS architecture.

crypto/

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Date: 09-Jul-2007 
KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		This file is deprecated and scheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

Documentation/ABI/removed/devfs

+1 −1
Original line number Diff line number Diff line 
What:		devfs

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -15,7 +15,7 @@ Description: 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields
@@ -29,7 +29,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test
@@ -42,7 +42,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about
@@ -53,7 +53,7 @@ Description: 


What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

Documentation/ABI/stable/sysfs-module

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Description: 
		The name of the module that is in the kernel.  This

		module name will show up either if the module is built

		directly into the kernel, or if it is loaded as a

		dyanmic module.

		dynamic module.



	/sys/module/MODULENAME/parameters

		This directory contains individual files that are each