1. 23 Oct, 2010 25 commits
  2. 22 Oct, 2010 15 commits
    • Linus Torvalds's avatar
      Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · f5d9d249
      Linus Torvalds authored
      * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: fix ni_daq_700 compilation
        pcmcia: IOCARD is also required for using IRQs
      f5d9d249
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · db08bf08
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        asm-generic/io.h: allow people to override individual funcs
        bitops: remove duplicated extern declarations
        bitops: make asm-generic/bitops/find.h more generic
        asm-generic: kdebug.h: Checkpatch cleanup
        asm-generic: fcntl: make exported headers use strict posix types
        asm-generic: cmpxchg does not handle non-long arguments
        asm-generic: make atomic_add_unless a function
      db08bf08
    • Linus Torvalds's avatar
      Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 092e0e7e
      Linus Torvalds authored
      * 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        vfs: make no_llseek the default
        vfs: don't use BKL in default_llseek
        llseek: automatically add .llseek fop
        libfs: use generic_file_llseek for simple_attr
        mac80211: disallow seeks in minstrel debug code
        lirc: make chardev nonseekable
        viotape: use noop_llseek
        raw: use explicit llseek file operations
        ibmasmfs: use generic_file_llseek
        spufs: use llseek in all file operations
        arm/omap: use generic_file_llseek in iommu_debug
        lkdtm: use generic_file_llseek in debugfs
        net/wireless: use generic_file_llseek in debugfs
        drm: use noop_llseek
      092e0e7e
    • Linus Torvalds's avatar
      Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 79f14b7c
      Linus Torvalds authored
      * 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: (30 commits)
        BKL: remove BKL from freevxfs
        BKL: remove BKL from qnx4
        autofs4: Only declare function when CONFIG_COMPAT is defined
        autofs: Only declare function when CONFIG_COMPAT is defined
        ncpfs: Lock socket in ncpfs while setting its callbacks
        fs/locks.c: prepare for BKL removal
        BKL: Remove BKL from ncpfs
        BKL: Remove BKL from OCFS2
        BKL: Remove BKL from squashfs
        BKL: Remove BKL from jffs2
        BKL: Remove BKL from ecryptfs
        BKL: Remove BKL from afs
        BKL: Remove BKL from USB gadgetfs
        BKL: Remove BKL from autofs4
        BKL: Remove BKL from isofs
        BKL: Remove BKL from fat
        BKL: Remove BKL from ext2 filesystem
        BKL: Remove BKL from do_new_mount()
        BKL: Remove BKL from cgroup
        BKL: Remove BKL from NTFS
        ...
      79f14b7c
    • Linus Torvalds's avatar
      Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · c37927d4
      Linus Torvalds authored
      * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        block: autoconvert trivial BKL users to private mutex
        drivers: autoconvert trivial BKL users to private mutex
        ipmi: autoconvert trivial BKL users to private mutex
        mac: autoconvert trivial BKL users to private mutex
        mtd: autoconvert trivial BKL users to private mutex
        scsi: autoconvert trivial BKL users to private mutex
      
      Fix up trivial conflicts (due to addition of private mutex right next to
      deletion of a version string) in drivers/char/pcmcia/cm40[04]0_cs.c
      c37927d4
    • Linus Torvalds's avatar
      Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · 5704e44d
      Linus Torvalds authored
      * 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        BKL: introduce CONFIG_BKL.
        dabusb: remove the BKL
        sunrpc: remove the big kernel lock
        init/main.c: remove BKL notations
        blktrace: remove the big kernel lock
        rtmutex-tester: make it build without BKL
        dvb-core: kill the big kernel lock
        dvb/bt8xx: kill the big kernel lock
        tlclk: remove big kernel lock
        fix rawctl compat ioctls breakage on amd64 and itanic
        uml: kill big kernel lock
        parisc: remove big kernel lock
        cris: autoconvert trivial BKL users
        alpha: kill big kernel lock
        isapnp: BKL removal
        s390/block: kill the big kernel lock
        hpet: kill BKL, add compat_ioctl
      5704e44d
    • Dominik Brodowski's avatar
    • Linus Torvalds's avatar
      Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 91151240
      Linus Torvalds authored
      * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
        x86: Move alloc_desk_mask variables inside ifdef
        x86-32: Align IRQ stacks properly
        x86: Remove CONFIG_4KSTACKS
        x86: Always use irq stacks
      
      Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}
      91151240
    • Linus Torvalds's avatar
      Merge branch 'x86-timers-for-linus' of... · 211baf4f
      Linus Torvalds authored
      Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Hpet: Avoid the comparator readback penalty
      211baf4f
    • Alan Cox's avatar
      bluetooth: Fix missing NULL check · c19483cc
      Alan Cox authored
      Fortunately this is only exploitable on very unusual hardware.
      
      [Reported a while ago but nothing happened so just fixing it]
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c19483cc
    • Dominik Brodowski's avatar
      pcmcia: IOCARD is also required for using IRQs · ff10fca5
      Dominik Brodowski authored
      Dave Hinds pointed out to me that 37979e15 will break b43 and
      ray_cs, as IOCARD is not -- as the name would suggest -- only needed
      for cards using IO ports. Instead, as it re-deines several pins, it
      is also required for using interrupts.
      Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
      ff10fca5
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · d4429f60
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (71 commits)
        powerpc/44x: Update ppc44x_defconfig
        powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option
        fsl_rio: Add comments for sRIO registers.
        powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
        powerpc/fsl-booke: Add p5020 DS board support
        powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
        powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
        powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
        powerpc/85xx: add cache-sram support
        powerpc/85xx: add ngPIXIS FPGA device tree node to the P1022DS board
        powerpc: Fix compile error with paca code on ppc64e
        powerpc/fsl-booke: Add p3041 DS board support
        oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
        powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
        powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
        powerpc/fsl_booke: Add support to boot from core other than 0
        powerpc/p1022: Add probing for individual DMA channels
        powerpc/fsl_soc: Search all global-utilities nodes for rstccr
        powerpc: Fix invalid page flags in create TLB CAM path for PTE_64BIT
        powerpc/mpc83xx: Support for MPC8308 P1M board
        ...
      
      Fix up conflict with the generic irq_work changes in arch/powerpc/kernel/time.c
      d4429f60
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · e10117d3
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (26 commits)
        include/linux/libata.h: fix typo
        pata_bf54x: fix return type of bfin_set_devctl
        Drivers: ata: Makefile: replace the use of <module>-objs with <module>-y
        libahci: fix result_tf handling after an ATA PIO data-in command
        pata_sl82c105: implement sff_irq_check() method
        pata_sil680: implement sff_irq_check() method
        pata_pdc202xx_old: implement sff_irq_check() method
        pata_cmd640: implement sff_irq_check() method
        ata_piix: Add device ID for ICH4-L
        pata_sil680: make sil680_sff_exec_command() 'static'
        ata: Intel IDE-R support
        libata: reorder ata_queued_cmd to remove alignment padding on 64 bit builds
        libata: Signal that our SATL supports WRITE SAME(16) with UNMAP
        ata_piix: remove SIDPR locking
        libata: implement cross-port EH exclusion
        libata: add @ap to ata_wait_register() and introduce ata_msleep()
        ata_piix: implement LPM support
        libata: implement LPM support for port multipliers
        libata: reimplement link power management
        libata: implement sata_link_scr_lpm() and make ata_dev_set_feature() global
        ...
      e10117d3
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · f3270b16
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (48 commits)
        ocfs2: Avoid to evaluate xattr block flags again.
        ocfs2/cluster: Release debugfs file elapsed_time_in_ms
        ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.
        Initialize max_slots early
        When I tried to compile I got the following warning: fs/ocfs2/slot_map.c: In function ‘ocfs2_init_slot_info’: fs/ocfs2/slot_map.c:360: warning: ‘bytes’ may be used uninitialized in this function fs/ocfs2/slot_map.c:360: note: ‘bytes’ was declared here Compiler: gcc version 4.4.3 (GCC) on Mandriva I'm not sure why this warning occurs, I think compiler don't know that variable "bytes" is initialized when it is sent by reference to ocfs2_slot_map_physical_size and it throws that ugly warning. However, a simple initialization of "bytes" variable with 0 will fix it.
        ocfs2: validate bg_free_bits_count after update
        ocfs2/cluster: Bump up dlm protocol to version 1.1
        ocfs2/cluster: Show per region heartbeat elapsed time
        ocfs2/cluster: Add mlogs for heartbeat up/down events
        ocfs2/cluster: Create debugfs dir/files for each region
        ocfs2/cluster: Create debugfs files for live, quorum and failed region bitmaps
        ocfs2/cluster: Maintain bitmap of failed regions
        ocfs2/cluster: Maintain bitmap of quorum regions
        ocfs2/cluster: Track bitmap of live heartbeat regions
        ocfs2/cluster: Track number of global heartbeat regions
        ocfs2/cluster: Maintain live node bitmap per heartbeat region
        ocfs2/cluster: Reorganize o2hb debugfs init
        ocfs2/cluster: Check slots for unconfigured live nodes
        ocfs2/cluster: Print messages when adding/removing nodes
        ocfs2/cluster: Print messages when adding/removing heartbeat regions
        ...
      f3270b16
    • Linus Torvalds's avatar
      Merge branch 'core-memblock-for-linus' of... · 3044100e
      Linus Torvalds authored
      Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (74 commits)
        x86-64: Only set max_pfn_mapped to 512 MiB if we enter via head_64.S
        xen: Cope with unmapped pages when initializing kernel pagetable
        memblock, bootmem: Round pfn properly for memory and reserved regions
        memblock: Annotate memblock functions with __init_memblock
        memblock: Allow memblock_init to be called early
        memblock/arm: Fix memblock_region_is_memory() typo
        x86, memblock: Remove __memblock_x86_find_in_range_size()
        memblock: Fix wraparound in find_region()
        x86-32, memblock: Make add_highpages honor early reserved ranges
        x86, memblock: Fix crashkernel allocation
        arm, memblock: Fix the sparsemem build
        memblock: Fix section mismatch warnings
        powerpc, memblock: Fix memblock API change fallout
        memblock, microblaze: Fix memblock API change fallout
        x86: Remove old bootmem code
        x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
        x86: Remove not used early_res code
        x86, memblock: Replace e820_/_early string with memblock_
        x86: Use memblock to replace early_res
        x86, memblock: Use memblock_debug to control debug message print out
        ...
      
      Fix up trivial conflicts in arch/x86/kernel/setup.c and kernel/Makefile
      3044100e