Commit 4553f0b9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/rcu' into perf/core 



Steve Rostedt asked for the merge of a single commit, into both
the RCU and the perf/tracing tree:

 | Josh made a change to the tracing code that affects both the
 | work Paul McKenney and I are currently doing. At the last
 | Kernel Summit back in August, Linus said when such a case
 | exists, it is best to make a separate branch based off of his
 | tree and place the change there. This way, the repositories
 | that need to share the change can both pull them in and the
 | SHA1 will match for both. Whichever branch is pulled in first
 | by Linus will also pull in the necessary change for the other
 | branch as well.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents be267be8 7ece55a4

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.



What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more 
----------------------------



What:	at91-mci driver ("CONFIG_MMC_AT91")

When:	3.7

When:	3.8

Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support

	was added to atmel-mci as a first step to support more chips.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

Documentation/watchdog/src/watchdog-test.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void keep_alive(void) 
 * or "-e" to enable the card.

 */



void term(int sig)

static void term(int sig)

{

    close(fd);

    fprintf(stderr, "Stopping watchdog ticks...\n");

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config ARM 
	select HAVE_DMA_API_DEBUG

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

CRA Git | Maintained and supported by SUSTech CRA and CCSE