1. 15 Jul, 2006 33 commits
  2. 14 Jul, 2006 1 commit
    • Linus Torvalds's avatar
      Fix nasty /proc vulnerability · 18b0bbd8
      Linus Torvalds authored
      We have a bad interaction with both the kernel and user space being able
      to change some of the /proc file status.  This fixes the most obvious
      part of it, but I expect we'll also make it harder for users to modify
      even their "own" files in /proc.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      18b0bbd8
  3. 13 Jul, 2006 6 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · ab6cf0d0
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (53 commits)
        [MIPS] sparsemem: fix crash in show_mem
        [MIPS] vr41xx: Update workpad setup function
        [MIPS] vr41xx: Update e55 setup function
        [MIPS] vr41xx: Removed old v2.4 VRC4173 driver
        [MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
        [MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
        [MIPS] Remove unused code.
        [MIPS] IP22 Fix brown paper bag in RTC code.
        [MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
        [MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
        [MIPS] Nuke redeclarations of board_time_init.
        [MIPS] Remove redeclarations of setup_irq().
        [MIPS] Nuke redeclarations of board_timer_setup.
        [MIPS] Print out TLB handler assembly for debugging.
        [MIPS] SMTC: Reformat to Linux style.
        [MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
        [MIPS] IP27: Reformatting.
        [MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
        [MIPS] IP27: irq_chip startup method returns unsigned int.
        [MIPS] IP27: struct irq_desc member handler was renamed to chip.
        ...
      ab6cf0d0
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · 300c215a
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] Change SDHCI version error to a warning
        [MMC] Fix incorrect register access
      300c215a
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · 7b69a4c3
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [SERIAL] 8250: sysrq deadlock fix
        [SERIAL] 8250: add tsi108 serial support
        [SERIAL] IP22: fix serial console hangs
        [SERIAL] dz: Fix compilation error
      7b69a4c3
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a23f4636
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
        [ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
        [ARM] 3725/1: sharpsl_pm: warn about wrong temperature
        [ARM] 3723/1: collie charging
        [ARM] 3728/1: Restore missing CPU Hotplug irq helper
        [ARM] 3727/1: fix ucb initialization on collie
        [ARM] Allow Versatile to be built for AB and PB
        [ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1
        [ARM] 3721/1: Small cleanup for locomo.c
      a23f4636
    • Ingo Molnar's avatar
      [PATCH] revert slab.c locking change · fc818301
      Ingo Molnar authored
      Chandra Seetharaman reported SLAB crashes caused by the slab.c lock
      annotation patch.  There is only one chunk of that patch that has a
      material effect on the slab logic - this patch undoes that chunk.
      
      This was confirmed to fix the slab problem by Chandra.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Tested-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      fc818301