1. 12 Oct, 2008 31 commits
  2. 11 Oct, 2008 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · fd048088
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (43 commits)
        ext4: Rename ext4dev to ext4
        ext4: Avoid double dirtying of super block in ext4_put_super()
        Update ext4 MAINTAINERS file
        Hook ext4 to the vfs fiemap interface.
        generic block based fiemap implementation
        ocfs2: fiemap support
        vfs: vfs-level fiemap interface
        ext4: fix xattr deadlock
        jbd2: Fix buffer head leak when writing the commit block
        ext4: Add debugging markers that can be used by systemtap
        jbd2: abort instead of waiting for nonexistent transaction
        ext4: fix initialization of UNINIT bitmap blocks
        ext4: Remove old legacy block allocator
        ext4: Use readahead when reading an inode from the inode table
        ext4: Improve the documentation for ext4's /proc tunables
        ext4: Combine proc file handling into a single set of functions
        ext4: move /proc setup and teardown out of mballoc.c
        ext4: Don't use 'struct dentry' for internal lookups
        ext4/jbd2: Avoid WARN() messages when failing to write to the superblock
        ext4: use percpu data structures for lg_prealloc_list
        ...
      fd048088
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 5c3c4d9b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (71 commits)
        ide: Remove ide_spin_wait_hwgroup() and use special requests instead
        ide: move IDE{FLOPPY,TAPE}_WAIT_CMD defines to <linux/ide.h>
        ide: add ide_do_test_unit_ready() helper
        ide: add ide_do_start_stop() helper
        ide: add ide_set_media_lock() helper
        ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c
        ide-floppy: ->{srfp,wp} -> IDE_AFLAG_{SRFP,WP}
        ide: add ide_queue_pc_tail() helper
        ide: add ide_queue_pc_head() helper
        ide: add ide_init_pc() helper
        ide-tape: add ide_tape_set_media_lock() helper
        ide-floppy: add ide_floppy_set_media_lock() helper
        ide: add ide_io_buffers() helper
        ide-scsi: cleanup ide_scsi_io_buffers()
        ide-floppy: remove MODE_SENSE_* defines
        ide-{floppy,tape}: remove packet command stack
        ide-{floppy,tape}: remove request stack
        ide-generic: handle probing of legacy io-ports v5
        ide-floppy: use scatterlists for pio transfers
        ide-tape: remove idetape_init_rq()
        ...
      5c3c4d9b
    • Linus Torvalds's avatar
      Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of... · ead9d23d
      Linus Torvalds authored
      Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-v28-for-linus-phase4-D' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (186 commits)
        x86, debug: print more information about unknown CPUs
        x86 setup: handle more than 8 CPU flag words
        x86: cpuid, fix typo
        x86: move transmeta cap read to early_init_transmeta()
        x86: identify_cpu_without_cpuid v2
        x86: extended "flags" to show virtualization HW feature in /proc/cpuinfo
        x86: move VMX MSRs to msr-index.h
        x86: centaur_64.c remove duplicated setting of CONSTANT_TSC
        x86: intel.c put workaround for old cpus together
        x86: let intel 64-bit use intel.c
        x86: make intel_64.c the same as intel.c
        x86: make intel.c have 64-bit support code
        x86: little clean up of intel.c/intel_64.c
        x86: make 64 bit to use amd.c
        x86: make amd_64 have 32 bit code
        x86: make amd.c have 64bit support code
        x86: merge header in amd_64.c
        x86: add srat_detect_node for amd64
        x86: remove duplicated force_mwait
        x86: cpu make amd.c more like amd_64.c v2
        ...
      ead9d23d
    • Ingo Molnar's avatar
      Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D · 0afe2db2
      Ingo Molnar authored
      Conflicts:
      	arch/x86/kernel/cpu/common.c
      	arch/x86/kernel/signal_64.c
      	include/asm-x86/cpufeature.h
      0afe2db2
    • Ingo Molnar's avatar
      Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B · d8470596
      Ingo Molnar authored
      Conflicts:
      	arch/x86/kernel/apic_32.c
      	arch/x86/kernel/apic_64.c
      	arch/x86/kernel/setup.c
      	drivers/pci/intel-iommu.c
      	include/asm-x86/cpufeature.h
      	include/asm-x86/dma-mapping.h
      d8470596
    • Linus Torvalds's avatar
      Merge phase #3 (IOMMU) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · bf6f51e3
      Linus Torvalds authored
      * 'x86-v28-for-linus-phase3-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
        AMD IOMMU: use iommu_device_max_index, fix
        AMD IOMMU: use iommu_device_max_index
        x86: add PCI IDs for AMD Barcelona PCI devices
        x86/iommu: use __GFP_ZERO instead of memset for GART
        x86/iommu: convert GART need_flush to bool
        x86/iommu: make GART driver checkpatch clean
        x86 gart: remove unnecessary initialization
        x86: restore old GART alloc_coherent behavior
        revert "x86: make GART to respect device's dma_mask about virtual mappings"
        x86: export pci-nommu's alloc_coherent
        iommu: remove fullflush and nofullflush in IOMMU generic option
        x86: remove set_bit_string()
        iommu: export iommu_area_reserve helper function
        AMD IOMMU: use coherent_dma_mask in alloc_coherent
        add AMD IOMMU tree to MAINTAINERS file
        AMD IOMMU: use cmd_buf_size when freeing the command buffer
        AMD IOMMU: calculate IVHD size with a function
        AMD IOMMU: remove unnecessary cast to u64 in the init code
        AMD IOMMU: free domain bitmap with its allocation order
        AMD IOMMU: simplify dma_mask_to_pages
        ...
      bf6f51e3
    • Linus Torvalds's avatar
      Merge phase #2 (PAT updates) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · ec8deffa
      Linus Torvalds authored
      * 'x86-v28-for-linus-phase2-B' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
        x86, cpa: make the kernel physical mapping initialization a two pass sequence, fix
        x86, pat: cleanups
        x86: fix pagetable init 64-bit breakage
        x86: track memtype for RAM in page struct
        x86, cpa: srlz cpa(), global flush tlb after splitting big page and before doing cpa
        x86, cpa: remove cpa pool code
        x86, cpa: no need to check alias for __set_pages_p/__set_pages_np
        x86, cpa: dont use large pages for kernel identity mapping with DEBUG_PAGEALLOC
        x86, cpa: make the kernel physical mapping initialization a two pass sequence
        x86, cpa: remove USER permission from the very early identity mapping attribute
        x86, cpa: rename PTE attribute macros for kernel direct mapping in early boot
        x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious
        linux-next: fix x86 tree build failure
        x86: have set_memory_array_{uc,wb} coalesce memtypes, fix
        agp: enable optimized agp_alloc_pages methods
        x86: have set_memory_array_{uc,wb} coalesce memtypes.
        x86: {reverve,free}_memtype() take a physical address
        x86: fix pageattr-test
        agp: add agp_generic_destroy_pages()
        agp: generic_alloc_pages()
        ...
      ec8deffa
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 7cc4e87f
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
        [ARM] 5300/1: fixup spitz reset during boot
        [ARM] 5295/1: make ZONE_DMA optional
        [ARM] 5239/1: Palm Zire 72 power management support
        [ARM] 5298/1: Drop desc_handle_irq()
        [ARM] 5297/1: [KS8695] Fix two compile-time warnings
        [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
        [ARM] pxa: allow multi-machine PCMCIA builds
        [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
        [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
        [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
        [ARM] pxa/zylonite: add support for USB OHCI
        [ARM] ohci-pxa27x: use ioremap() and offset for register access
        [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
        [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
        [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
        [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
        [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
        [ARM] pxa: simplify DMA register definitions
        [ARM] pxa: make additional DCSR bits valid for PXA3xx
        [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
        ...
      
      Fixed up conflicts in
      	arch/arm/mach-versatile/core.c
      	sound/soc/pxa/pxa2xx-ac97.c
      	sound/soc/pxa/pxa2xx-i2s.c
      manually.
      7cc4e87f
    • Arjan van de Ven's avatar
      security: avoid calling a NULL function pointer in drivers/video/tvaudio.c · 5ba2f67a
      Arjan van de Ven authored
      NULL function pointers are very bad security wise. This one got caught by
      kerneloops.org quite a few times, so it's happening in the field....
      
      Fix is simple, check the function pointer for NULL, like 6 other places
      in the same function are already doing.
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5ba2f67a