1
0
Fork 0
alistair23-linux/arch
Linus Torvalds e61aca5158 Merge branch 'kconfig-diet' from Dave Hansen
Merge Kconfig menu diet patches from Dave Hansen:
 "I think the "Kernel Hacking" menu has gotten a bit out of hand.  It is
  over 120 lines long on my system with everything enabled and options
  are scattered around it haphazardly.

        http://sr71.net/~dave/linux/kconfig-horror.png

  Let's try to introduce some sanity.  This set takes that 120 lines
  down to 55 and makes it vastly easier to find some things.  It's a
  start.

  This set stands on its own, but there is plenty of room for follow-up
  patches.  The arch-specific debug options still end up getting stuck
  in the top-level "kernel hacking" menu.  OPTIMIZE_INLINING, for
  instance, could obviously go in to the "compiler options" menu, but
  the fact that it is defined in arch/ in a separate Kconfig file keeps
  it on its own for the moment.

  The Signed-off-by's in here look funky.  I changed employers while
  working on this set, so I have signoffs from both email addresses"

* emailed patches from Dave Hansen <dave@sr71.net>:
  hang and lockup detection menu
  kconfig: consolidate printk options
  group locking debugging options
  consolidate compilation option configs
  consolidate runtime testing configs
  order memory debugging Kconfig options
  consolidate per-arch stack overflow debugging options
2013-07-04 11:25:51 -07:00
..
alpha mm/ALPHA: clean up unused VALID_PAGE() 2013-07-03 16:07:39 -07:00
arc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
arm Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds 2013-07-03 19:55:33 -07:00
arm64 mm/microblaze: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:36 -07:00
avr32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
blackfin Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
c6x Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
cris Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
frv Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
h8300 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
hexagon mm/hexagon: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:36 -07:00
ia64 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
m32r Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
m68k Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
metag Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
microblaze mm/microblaze: clean up unused VALID_PAGE() 2013-07-03 16:07:40 -07:00
mips Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
mn10300 Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
openrisc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
parisc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
powerpc Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
s390 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-07-04 10:29:23 -07:00
score Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
sh mm/SH: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:39 -07:00
sparc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-07-04 10:29:23 -07:00
tile Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
um mm/um: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:37 -07:00
unicore32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
x86 Merge branch 'kconfig-diet' from Dave Hansen 2013-07-04 11:25:51 -07:00
xtensa mm/xtensa: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:38 -07:00
.gitignore
Kconfig mm: soft-dirty bits for user memory changes tracking 2013-07-03 16:07:26 -07:00