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

Commit e9ffb3d7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'from-linus' into upstream

parents 8b941101 e9fa4f7b

Documentation/cpu-freq/user-guide.txt

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ scaling_min_freq and 
scaling_max_freq		show the current "policy limits" (in

				kHz). By echoing new values into these

				files, you can change these limits.

				NOTE: when setting a policy you need to

				first set scaling_max_freq, then

				scaling_min_freq.





If you have selected the "userspace" governor which allows you to

Documentation/kobject.txt

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ the object-specific fields, which include: 
- default_attrs: Default attributes to be exported via sysfs when the

  object is registered.Note that the last attribute has to be

  initialized to NULL ! You can find a complete implementation

  in drivers/block/genhd.c

  in block/genhd.c





Instances of struct kobj_type are not registered; only referenced by

Documentation/sysctl/kernel.txt

+2 −3
Original line number Diff line number Diff line
@@ -211,9 +211,8 @@ Controls the kernel's behaviour when an oops or BUG is encountered. 


0: try to continue operation



1: delay a few seconds (to give klogd time to record the oops output) and

   then panic.  If the `panic' sysctl is also non-zero then the machine will

   be rebooted.

1: panic immediatly.  If the `panic' sysctl is also non-zero then the

   machine will be rebooted.



==============================================================

MAINTAINERS

+23 −0
Original line number Diff line number Diff line
@@ -298,6 +298,13 @@ L: info-linux@geode.amd.com 
W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html

S:	Supported



AOA (Apple Onboard Audio) ALSA DRIVER

P:	Johannes Berg

M:	johannes@sipsolutions.net

L:	linuxppc-dev@ozlabs.org

L:	alsa-devel@alsa-project.org

S:	Maintained



APM DRIVER

P:	Stephen Rothwell

M:	sfr@canb.auug.org.au
@@ -2653,6 +2660,22 @@ M: dbrownell@users.sourceforge.net 
L:	spi-devel-general@lists.sourceforge.net

S:	Maintained



STABLE BRANCH:

P:	Greg Kroah-Hartman

M:	greg@kroah.com

P:	Chris Wright

M:	chrisw@sous-sol.org

L:	stable@kernel.org

S:	Maintained



STABLE BRANCH:

P:	Greg Kroah-Hartman

M:	greg@kroah.com

P:	Chris Wright

M:	chrisw@sous-sol.org

L:	stable@kernel.org

S:	Maintained



TPM DEVICE DRIVER

P:	Kylene Hall

M:	kjhall@us.ibm.com

Makefile

+19 −7
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 18

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*
@@ -436,12 +436,13 @@ core-y := usr/ 
endif # KBUILD_EXTMOD



ifeq ($(dot-config),1)

# In this section, we need .config

# Read in config

-include include/config/auto.conf



ifeq ($(KBUILD_EXTMOD),)

# Read in dependencies to all Kconfig* files, make sure to run

# oldconfig if changes are detected.

-include include/config/auto.conf.cmd

-include include/config/auto.conf



# To avoid any implicit rule to kick in, define an empty command

$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
@@ -451,16 +452,27 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; 
# if auto.conf.cmd is missing then we are probably in a cleaned tree so

# we execute the config step to be sure to catch updated Kconfig files

include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd

ifeq ($(KBUILD_EXTMOD),)

	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig

else

	$(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it)

endif

# external modules needs include/linux/autoconf.h and include/config/auto.conf

# but do not care if they are up-to-date. Use auto.conf to trigger the test

PHONY += include/config/auto.conf



include/config/auto.conf:

	$(Q)test -e include/linux/autoconf.h -a -e $@ || (		\

	echo;								\

	echo "  ERROR: Kernel configuration is invalid.";		\

	echo "         include/linux/autoconf.h or $@ are missing.";	\

	echo "         Run 'make oldconfig && make prepare' on kernel src to fix it.";	\

	echo;								\

	/bin/false)



endif # KBUILD_EXTMOD



else

# Dummy target needed, because used as prerequisite

include/config/auto.conf: ;

endif

endif # $(dot-config)



# The all: target is the default when no target is given on the

# command line.