Merge branch 'omap-fixes-for-linus' into omap-for-linus (80c20d54) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/ima_policy

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ Description:
	lsm: [[subj_user=] [subj_role=] [subj_type=]		lsm: [[subj_user=] [subj_role=] [subj_type=]
	[obj_user=] [obj_role=] [obj_type=]]		[obj_user=] [obj_role=] [obj_type=]]

	base: func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]		base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
	mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]		mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
	fsmagic:= hex value		fsmagic:= hex value
	uid:= decimal value		uid:= decimal value
	@@ -40,11 +40,11 @@ Description:

	measure func=BPRM_CHECK		measure func=BPRM_CHECK
	measure func=FILE_MMAP mask=MAY_EXEC		measure func=FILE_MMAP mask=MAY_EXEC
	measure func=INODE_PERM mask=MAY_READ uid=0		measure func=FILE_CHECK mask=MAY_READ uid=0

	The default policy measures all executables in bprm_check,		The default policy measures all executables in bprm_check,
	all files mmapped executable in file_mmap, and all files		all files mmapped executable in file_mmap, and all files
	open for read by root in inode_permission.		open for read by root in do_filp_open.

	Examples of LSM specific definitions:		Examples of LSM specific definitions:

	@@ -54,8 +54,8 @@ Description:

	dont_measure obj_type=var_log_t		dont_measure obj_type=var_log_t
	dont_measure obj_type=auditd_log_t		dont_measure obj_type=auditd_log_t
	measure subj_user=system_u func=INODE_PERM mask=MAY_READ		measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
	measure subj_role=system_r func=INODE_PERM mask=MAY_READ		measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

	Smack:		Smack:
	measure subj_user=_ func=INODE_PERM mask=MAY_READ		measure subj_user=_ func=FILE_CHECK mask=MAY_READ

Documentation/cpu-freq/governors.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -145,8 +145,8 @@ show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
	up_threshold: defines what the average CPU usage between the samplings		up_threshold: defines what the average CPU usage between the samplings
	of 'sampling_rate' needs to be for the kernel to make a decision on		of 'sampling_rate' needs to be for the kernel to make a decision on
	whether it should increase the frequency. For example when it is set		whether it should increase the frequency. For example when it is set
	to its default value of '80' it means that between the checking		to its default value of '95' it means that between the checking
	intervals the CPU needs to be on average more than 80% in use to then		intervals the CPU needs to be on average more than 95% in use to then
	decide that the CPU frequency needs to be increased.		decide that the CPU frequency needs to be increased.

	ignore_nice_load: this parameter takes a value of '0' or '1'. When		ignore_nice_load: this parameter takes a value of '0' or '1'. When

MAINTAINERS

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3411,8 +3411,10 @@ S: Maintained
	F: drivers/scsi/sym53c8xx_2/		F: drivers/scsi/sym53c8xx_2/

	LTP (Linux Test Project)		LTP (Linux Test Project)
	M: Subrata Modak <subrata@linux.vnet.ibm.com>		M: Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
			M: Garrett Cooper <yanegomi@gmail.com>
	M: Mike Frysinger <vapier@gentoo.org>		M: Mike Frysinger <vapier@gentoo.org>
			M: Subrata Modak <subrata@linux.vnet.ibm.com>
	L: ltp-list@lists.sourceforge.net (subscribers-only)		L: ltp-list@lists.sourceforge.net (subscribers-only)
	W: http://ltp.sourceforge.net/		W: http://ltp.sourceforge.net/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
	@@ -3836,6 +3838,7 @@ NETWORKING DRIVERS
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://www.linuxfoundation.org/en/Net		W: http://www.linuxfoundation.org/en/Net
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
	S: Odd Fixes		S: Odd Fixes
	F: drivers/net/		F: drivers/net/
	F: include/linux/if_*		F: include/linux/if_*

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 33		SUBLEVEL = 33
	EXTRAVERSION = -rc7		EXTRAVERSION = -rc8
	NAME = Man-Eating Seals of Antiquity		NAME = Man-Eating Seals of Antiquity

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/mach-omap2/mux.c

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -961,16 +961,14 @@ static void __init omap_mux_init_list(struct omap_mux *superset)
	while (superset->reg_offset != OMAP_MUX_TERMINATOR) {		while (superset->reg_offset != OMAP_MUX_TERMINATOR) {
	struct omap_mux *entry;		struct omap_mux *entry;

	#ifndef CONFIG_OMAP_MUX		#ifdef CONFIG_OMAP_MUX
	/* Skip pins that are not muxed as GPIO by bootloader */		if (!superset->muxnames \|\| !superset->muxnames[0]) {
	if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
	superset++;		superset++;
	continue;		continue;
	}		}
	#endif		#else
			/* Skip pins that are not muxed as GPIO by bootloader */
	#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS)		if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
	if (!superset->muxnames \|\| !superset->muxnames[0]) {
	superset++;		superset++;
	continue;		continue;
	}		}