From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org,
Randy Dunlap <randy.dunlap@oracle.com>,
Matt LaPlante <kernel1@cyberdogtech.com>
Subject: linux-next: manual merge of the trivial tree with the tree
Date: Thu, 12 Mar 2009 15:43:27 +1100 [thread overview]
Message-ID: <20090312154327.70d7271b.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
init/Kconfig between commit b943c460ff8556a193b28e2145b513f8b978e869
("menu: fix embedded menu snafu") from Linus' tree and commit
2622b54dff6e30d114828648e96777739b764063 ("trivial: fix typos/grammar
errors in Kconfig texts") from the trivial tree.
The former moved the text that the latter modified. I fixed it up (see
below) and carry it for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc init/Kconfig
index 68c23f3,12b1343..0000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -945,21 -897,9 +945,21 @@@ config SLUB_DEBU
SLUB sysfs support. /sys/slab will not exist and there will be
no support for cache validation etc.
+config COMPAT_BRK
+ bool "Disable heap randomization"
+ default y
+ help
+ Randomizing heap placement makes heap exploits harder, but it
+ also breaks ancient binaries (including anything libc5 based).
+ This option changes the bootup default to heap randomization
- disabled, and can be overriden runtime by setting
++ disabled, and can be overridden at runtime by setting
+ /proc/sys/kernel/randomize_va_space to 2.
+
+ On non-ancient distros (post-2000 ones) N is usually a safe choice.
+
choice
prompt "Choose SLAB allocator"
- default SLUB
+ default SLQB
help
This option allows to select a slab allocator.
next reply other threads:[~2009-03-12 4:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-12 4:43 Stephen Rothwell [this message]
2009-03-12 10:27 ` linux-next: manual merge of the trivial tree with the tree Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 4:54 Stephen Rothwell
2012-05-22 9:16 ` Jiri Kosina
2012-05-22 11:53 ` John Crispin
2011-06-14 4:31 Stephen Rothwell
2011-06-14 8:42 ` Jiri Kosina
2011-06-14 4:25 Stephen Rothwell
2010-11-09 2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
2009-11-09 4:43 Stephen Rothwell
2009-11-09 8:45 ` Jiri Kosina
2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25 ` Jiri Kosina
2009-07-31 4:39 Stephen Rothwell
2009-08-08 0:13 ` Jiri Kosina
2009-08-08 0:46 ` Stephen Rothwell
2009-02-04 6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090312154327.70d7271b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jkosina@suse.cz \
--cc=kernel1@cyberdogtech.com \
--cc=linux-next@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.