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

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

Merge branch 'perfcounters/urgent' into perfcounters/core 



Conflicts:
	kernel/perf_counter.c

Merge reason: update to latest upstream (-rc6) and resolve
              the conflict with urgent fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 18408ddc 39e6dd73

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ Code Seq# Include File Comments 
'm'	all	linux/synclink.h	conflict!

'm'	00-1F	net/irda/irmod.h	conflict!

'n'	00-7F	linux/ncp_fs.h

'n'	80-8F	linux/nilfs2_fs.h	NILFS2

'n'	E0-FF	video/matrox.h          matroxfb

'o'	00-1F	fs/ocfs2/ocfs2_fs.h	OCFS2

'o'     00-03   include/mtd/ubi-user.h  conflict! (OCFS2 and UBI overlaps)

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Combinations also work, so libata.dma=3 enables DMA

			for disks and CDROMs, but not CFs.

	

	libata.ignore_hpa=	[LIBATA] Ignore HPA limit

			libata.ignore_hpa=0	  keep BIOS limits (default)

			libata.ignore_hpa=1	  ignore limits, using full disk



	libata.noacpi	[LIBATA] Disables use of ACPI in libata suspend/resume

			when set.

			Format: <int>

Documentation/lockdep-design.txt

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ State 
The validator tracks lock-class usage history into 4n + 1 separate state bits:



- 'ever held in STATE context'

- 'ever head as readlock in STATE context'

- 'ever head with STATE enabled'

- 'ever head as readlock with STATE enabled'

- 'ever held as readlock in STATE context'

- 'ever held with STATE enabled'

- 'ever held as readlock with STATE enabled'



Where STATE can be either one of (kernel/lockdep_states.h)

 - hardirq

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 31

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*

arch/ia64/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ $(error Sorry, you need a newer version of the assember, one that is built from 
		ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)

endif



ifeq ($(call cc-version),0304)

	cflags-$(CONFIG_ITANIUM)	+= -mtune=merced

	cflags-$(CONFIG_MCKINLEY)	+= -mtune=mckinley

endif



KBUILD_CFLAGS += $(cflags-y)

head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o