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

Commit 1d8ce7bc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/include/asm/fixmap_64.h
parents 3a450de1 16b71fdf
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -298,3 +298,15 @@ over a rather long period of time, but improvements are always welcome!

	Note that, rcu_assign_pointer() and rcu_dereference() relate to
	SRCU just as they do to other forms of RCU.

15.	The whole point of call_rcu(), synchronize_rcu(), and friends
	is to wait until all pre-existing readers have finished before
	carrying out some otherwise-destructive operation.  It is
	therefore critically important to -first- remove any path
	that readers can follow that could be affected by the
	destructive operation, and -only- -then- invoke call_rcu(),
	synchronize_rcu(), or friends.

	Because these primitives only wait for pre-existing readers,
	it is the caller's responsibility to guarantee safety to
	any subsequent readers.
+9 −0
Original line number Diff line number Diff line
@@ -335,3 +335,12 @@ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net"
	Secmark, it is time to deprecate the older mechanism and start the
	process of removing the old code.
Who:	Paul Moore <paul.moore@hp.com>
---------------------------

What:	sysfs ui for changing p4-clockmod parameters
When:	September 2009
Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
	e088e4c9cdb618675874becb91b2fd581ee707e6.
	Removal is subject to fixing any remaining bugs in ACPI which may
	cause the thermal throttling not to happen at the right time.
Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Squashfs filesystem features versus Cramfs:

				Squashfs		Cramfs

Max filesystem size:		2^64			16 MiB
Max filesystem size:		2^64			256 MiB
Max file size:			~ 2 TiB			16 MiB
Max files:			unlimited		unlimited
Max directories:		unlimited		unlimited
+35 −0
Original line number Diff line number Diff line

Options for the ipv6 module are supplied as parameters at load time.

Module options may be given as command line arguments to the insmod
or modprobe command, but are usually specified in either the
/etc/modules.conf or /etc/modprobe.conf configuration file, or in a
distro-specific configuration file.

The available ipv6 module parameters are listed below.  If a parameter
is not specified the default value is used.

The parameters are as follows:

disable

	Specifies whether to load the IPv6 module, but disable all
	its functionality.  This might be used when another module
	has a dependency on the IPv6 module being loaded, but no
	IPv6 addresses or operations are desired.

	The possible values and their effects are:

	0
		IPv6 is enabled.

		This is the default value.

	1
		IPv6 is disabled.

		No IPv6 addresses will be added to interfaces, and
		it will not be possible to open an IPv6 socket.

		A reboot is required to enable IPv6.
+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 29
EXTRAVERSION = -rc6
EXTRAVERSION = -rc7
NAME = Erotic Pickled Herring

# *DOCUMENTATION*
Loading