Skip to content
  1. Jan 07, 2013
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 5ce2955e
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Various fixes across the tree.  The modpost error due to
        virt_addr_valid() not being usable from modules required a number of
        preparatory cleanups so a clean fix was possible."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: 64-bit: Fix build if !CONFIG_MODULES
        MIPS: Wire up finit_module syscall.
        MIPS: Fix modpost error in modules attepting to use virt_addr_valid().
        MIPS: page.h: Remove now unnecessary #ifndef __ASSEMBLY__ wrapper.
        MIPS: Switch remaining assembler PAGE_SIZE users to <asm/asm-offsets.h>.
        MIPS: Include PAGE_S{IZE,HIFT} in <asm/offset.h>.
        MIPS: Don't include <asm/page.h> unnecessarily.
        MIPS: Fix comment.
        Revert "MIPS: Optimise TLB handlers for MIPS32/64 R2 cores."
        MIPS: perf: Fix build failure in XLP perf support.
        MIPS: Alchemy: Make 32kHz and r4k timer coexist peacefully
      5ce2955e
    • Linus Torvalds's avatar
      Merge branch 'akpm' (fixes from Andrew) · d0631c6e
      Linus Torvalds authored
      Merge emailed fixes from Andrew Morton:
       "Bunch of fixes:
      
         - delayed IPC updates.  I held back on this because of some possible
           outstanding bug reports, but they appear to have been addressed in
           later versions
      
         - A bunch of MAINTAINERS updates
      
         - Yet Another RTC driver.  I'd held this back while a couple of
           little issues were being worked out.
      
        I'm expecting an intrusive-but-simple patchset from Joe Perches which
        splits up printk.c into kernel/printk/*.  That will be a pig to
        maintain for two months so if it passes testing I'd like to get it
        upstream after a week or so."
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
        printk: fix incorrect length from print_time() when seconds > 99999
        drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
        drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
        rtc: add RTC driver for TPS6586x
        MAINTAINERS: fix drivers/staging/sm7xx/
        MAINTAINERS: remove include/linux/of_pwm.h
        MAINTAINERS: remove arch/*/lib/perf_event*.c
        MAINTAINERS: remove drivers/mmc/host/imxmmc.*
        MAINTAINERS: fix Documentation/mei/
        MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
        MAINTAINERS: remove firmware/isci/
        MAINTAINERS: fix drivers/ieee802154/
        MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
        MAINTAINERS: remove drivers/video/epson1355fb.c
        MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
        MAINTAINERS: adjust for UAPI
        MAINTAINERS: fix drivers/media/platform/atmel-isi.c
        MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
        MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
        MAINTAINERS: remove arch/arm/plat-s5p/
        ...
      d0631c6e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · de9ac5ce
      Linus Torvalds authored
      Pull microblaze update from Michal Simek:
       "This fixes noMMU kernel and I have also added defconfig updates which
        fix issue with one external dependency and enable all xilinx device
        drivers for 0-day testing system.
      
        Additionally wire up finit_module system call, and do highmem fixup
        and pci warnings reported by the 0-day testing system"
      
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Update microblaze defconfigs
        microblaze: Fix pci compilation and sparse warnings
        microblaze: Add finit_module syscall
        microblaze: Kill __kmap_atomic()
        microblaze: Change section flags for noMMU
        microblaze: Microblaze wants sys_fork for noMMU too
      de9ac5ce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 7991b03d
      Linus Torvalds authored
      Pull integrity subsystem regression fix from James Morris:
       "Commit fdf90729 "ima: support new kernel module syscall" by error
        modified init_module() to return INTEGRITY_UNKNOWN (which is 4) to
        user space if the kernel was built with CONFIG_IMA_APPRAISE=y.
      
        As a result, user space can no longer load kernel modules using
        init_module().  This commit fixes this regression."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: fallback to MODULE_SIG_ENFORCE for existing kernel module syscall
      7991b03d
    • James Morris's avatar
      Merge branch 'for-Linus' of... · ade24c93
      James Morris authored
      Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      
      Pulled from Mimi's tree.
      ade24c93
  2. Jan 06, 2013
  3. Jan 05, 2013