1. 04 Mar, 2010 2 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 03a2c4d7
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits)
        vga_switcheroo: disable default y by new rules.
        drm/nouveau: fix *staging* driver build with switcheroo off.
        drm/radeon: fix typo in Makefile
        vga_switcheroo: fix build on platforms with no ACPI
        drm/radeon: Fix printf type warning in 64bit system.
        drm/radeon/kms: bump the KMS version number for square tiling support.
        vga_switcheroo: initial implementation (v15)
        drm/radeon/kms: do not disable audio engine twice
        Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"
        drm/radeon/kms: do not preset audio stuff and start timer when not using audio
        drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond
        drm/ttm: fix function prototype to match implementation
        drm/radeon: use ALIGN instead of open coding it
        drm/radeon/kms: initialize set_surface_reg reg for rs600 asic
        drm/i915: Use a dmi quirk to skip a broken SDVO TV output.
        drm/i915: enable/disable LVDS port at DPMS time
        drm/i915: check for multiple write domains in pin_and_relocate
        drm/i915: clean-up i915_gem_flush_gpu_write_domain
        drm/i915: reuse i915_gpu_idle helper
        drm/i915: ensure lru ordering of fence_list
        ...
      
      Fixed trivial conflicts in drivers/gpu/vga/Kconfig
      03a2c4d7
    • Linus Torvalds's avatar
      Prioritize synchronous signals over 'normal' signals · a27341cd
      Linus Torvalds authored
      This makes sure that we pick the synchronous signals caused by a
      processor fault over any pending regular asynchronous signals sent to
      use by [t]kill().
      
      This is not strictly required semantics, but it makes it _much_ easier
      for programs like Wine that expect to find the fault information in the
      signal stack.
      
      Without this, if a non-synchronous signal gets picked first, the delayed
      asynchronous signal will have its signal context pointing to the new
      signal invocation, rather than the instruction that caused the SIGSEGV
      or SIGBUS in the first place.
      
      This is not all that pretty, and we're discussing making the synchronous
      signals more explicit rather than have these kinds of implicit
      preferences of SIGSEGV and friends.  See for example
      
      	http://bugzilla.kernel.org/show_bug.cgi?id=15395
      
      for some of the discussion.  But in the meantime this is a simple and
      fairly straightforward work-around, and the whole
      
      	if (x & Y)
      		x &= Y;
      
      thing can be compiled into (and gcc does do it) just three instructions:
      
      	movq    %rdx, %rax
      	andl    $Y, %eax
      	cmovne  %rax, %rdx
      
      so it is at least a simple solution to a subtle issue.
      Reported-and-tested-by: default avatarPavel Vilim <wylda@volny.cz>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a27341cd
  2. 03 Mar, 2010 17 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · eaa5eec7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: Simplify ECC override handling
      eaa5eec7
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 2a32f2db
      Linus Torvalds authored
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        resource: Fix broken indentation
        resource: Fix generic page_is_ram() for partial RAM pages
        x86, paravirt: Remove kmap_atomic_pte paravirt op.
        x86, vmi: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
        x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
      2a32f2db
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · feaf77d5
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        nilfs2: add reader's lock for cno in nilfs_ioctl_sync
        nilfs2: delete unnecessary condition in load_segment_summary
        nilfs2: move iterator to write log into segment buffer
        nilfs2: get rid of s_dirt flag use
        nilfs2: get rid of nilfs_segctor_req struct
        nilfs2: delete unnecessary condition in nilfs_dat_translate
        nilfs2: fix potential hang in nilfs_error on errors=remount-ro
        nilfs2: use mnt_want_write in ioctls where write access is needed
        nilfs2: issue discard request after cleaning segments
      feaf77d5
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · eca281aa
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (36 commits)
        Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h
        ocfs2: send SIGXFSZ if new filesize exceeds limit -v2
        ocfs2/userdlm: Add tracing in userdlm
        ocfs2: Use a separate masklog for AST and BASTs
        dlm: allow dlm do recovery during shutdown
        ocfs2: Only bug out in direct io write for reflinked extent.
        ocfs2: fix warning in ocfs2_file_aio_write()
        ocfs2_dlmfs: Enable the use of user cluster stacks.
        ocfs2_dlmfs: Use the stackglue.
        ocfs2_dlmfs: Don't honor truncate.  The size of a dlmfs file is LVB_LEN
        ocfs2: Pass the locking protocol into ocfs2_cluster_connect().
        ocfs2: Remove the ast pointers from ocfs2_stack_plugins
        ocfs2: Hang the locking proto on the cluster conn and use it in asts.
        ocfs2: Attach the connection to the lksb
        ocfs2: Pass lksbs back from stackglue ast/bast functions.
        ocfs2_dlmfs: Move to its own directory
        ocfs2_dlmfs: Use poll() to signify BASTs.
        ocfs2_dlmfs: Add capabilities parameter.
        ocfs2: Handle errors while setting external xattr values.
        ocfs2: Set inline xattr entries with ocfs2_xa_set()
        ...
      eca281aa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7f5b09c1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (220 commits)
        USB: backlight, appledisplay: fix incomplete registration failure handling
        USB: pl2303: remove unnecessary reset of usb_device in urbs
        USB: ftdi_sio: remove obsolete check in unthrottle
        USB: ftdi_sio: remove unused tx_bytes counter
        USB: qcaux: driver for auxiliary serial ports on Qualcomm devices
        USB: pl2303: initial TIOCGSERIAL support
        USB: option: add Longcheer/Longsung vendor ID
        USB: fix I2C API usage in ohci-pnx4008.
        USB: usbmon: mask seconds properly in text API
        USB: sisusbvga: no unnecessary GFP_ATOMIC
        USB: storage: onetouch: unnecessary GFP_ATOMIC
        USB: serial: ftdi: add CONTEC vendor and product id
        USB: remove references to port->port.count from the serial drivers
        USB: tty: Prune uses of tty_request_room in the USB layer
        USB: tty: Add a function to insert a string of characters with the same flag
        USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration()
        USB: tty: kill request_room for USB ACM class
        USB: tty: sort out the request_room handling for whiteheat
        USB: storage: fix misplaced parenthesis
        USB: vstusb.c: removal of driver for Vernier Software & Technology, Inc., devices and spectrometers
        ...
      7f5b09c1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 94468080
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
        jsm: fixing error if the driver fails to load
        jsm: removing the uart structure and filename on error
        tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call
        tty: Keep the default buffering to sub-page units
        tty: Fix up char drivers request_room usage
        tty: Fix the ldisc hangup race
        serial: timberdale: Remove dependancies
        nozomi: Tidy up the PCI table
        nozomi: Fix mutex handling
        nozomi: Add tty_port usage
        sdio_uart: Use kfifo instead of the messy circ stuff
        serial: bcm63xx_uart: allow more than one uart to be registered.
        serial: bcm63xx_uart: don't use kfree() on non kmalloced area.
        serial: bfin_5xx: pull in linux/io.h for ioremap prototypes
        serial: bfin_5xx: kgdboc should accept gdb break only when it is active
        serial: bfin_5xx: need to disable DMA TX interrupt too
        serial: bfin_5xx: remove useless gpio handling with hard flow control
        Char: synclink, remove unnecessary checks
        tty: declare MODULE_FIRMWARE in various drivers
        ip2: Add module parameter.
        ...
      94468080
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of... · fb7b096d
      Linus Torvalds authored
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
        x86: Fix out of order of gsi
        x86: apic: Fix mismerge, add arch_probe_nr_irqs() again
        x86, irq: Keep chip_data in create_irq_nr and destroy_irq
        xen: Remove unnecessary arch specific xen irq functions.
        smp: Use nr_cpus= to set nr_cpu_ids early
        x86, irq: Remove arch_probe_nr_irqs
        sparseirq: Use radix_tree instead of ptrs array
        sparseirq: Change irq_desc_ptrs to static
        init: Move radix_tree_init() early
        irq: Remove unnecessary bootmem code
        x86: Add iMac9,1 to pci_reboot_dmi_table
        x86: Convert i8259_lock to raw_spinlock
        x86: Convert nmi_lock to raw_spinlock
        x86: Convert ioapic_lock and vector_lock to raw_spinlock
        x86: Avoid race condition in pci_enable_msix()
        x86: Fix SCI on IOAPIC != 0
        x86, ia32_aout: do not kill argument mapping
        x86, irq: Move __setup_vector_irq() before the first irq enable in cpu online path
        x86, irq: Update the vector domain for legacy irqs handled by io-apic
        x86, irq: Don't block IRQ0_VECTOR..IRQ15_VECTOR's on all cpu's
        ...
      fb7b096d
    • Linus Torvalds's avatar
      Merge branch 'x86-bootmem-for-linus' of... · a626b46e
      Linus Torvalds authored
      Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        early_res: Need to save the allocation name in drop_range_partial()
        sparsemem: Fix compilation on PowerPC
        early_res: Add free_early_partial()
        x86: Fix non-bootmem compilation on PowerPC
        core: Move early_res from arch/x86 to kernel/
        x86: Add find_fw_memmap_area
        Move round_up/down to kernel.h
        x86: Make 32bit support NO_BOOTMEM
        early_res: Enhance check_and_double_early_res
        x86: Move back find_e820_area to e820.c
        x86: Add find_early_area_size
        x86: Separate early_res related code from e820.c
        x86: Move bios page reserve early to head32/64.c
        sparsemem: Put mem map for one node together.
        sparsemem: Put usemap for one node together
        x86: Make 64 bit use early_res instead of bootmem before slab
        x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA
        x86: Make early_node_mem get mem > 4 GB if possible
        x86: Dynamically increase early_res array size
        x86: Introduce max_early_res and early_res_count
        ...
      a626b46e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · c1dcb4bb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
        firewire: ohci: extend initialization log message
        firewire: ohci: fix IR/IT context mask mixup
        firewire: ohci: add module parameter to activate quirk fixes
        firewire: ohci: use an ID table for quirks detection
        firewire: ohci: reorder struct fw_ohci for better cache efficiency
        firewire: ohci: remove unused dualbuffer IR code
        firewire: core: combine a bit of repeated code
        firewire: core: change type of a data buffer
        firewire: cdev: increment ABI version number
        firewire: cdev: add more flexible cycle timer ioctl
        firewire: core: rename an internal function
        firewire: core: fix an information leak
        firewire: core: increase stack size of config ROM reader
        firewire: core: don't fail device creation in case of too large config ROM blocks
        firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
        firewire: remove incomplete Bus_Time CSR support
        firewire: get_cycle_timer optimization and cleanup
        firewire: ohci: enable cycle timer fix on ALi and NEC controllers
        firewire: ohci: work around cycle timer bugs on VIA controllers
        firewire: make PCI device id constant
        ...
      c1dcb4bb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 60f8a8d4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix large stack use
        fuse: cleanup in fuse_notify_inval_...()
      60f8a8d4
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · b037bba7
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (45 commits)
        compal-laptop: Make it depend on CONFIG_RFKILL
        classmate-laptop: Added some keys present in other devices
        MAINTAINERS: Add git tree to x86 Platform Drivers
        asus-acpi: remove duplicate comparison of asus_model strings
        toshiba-acpi: fix multimedia keys on some machines
        dell-laptop: Fix errors on failure and exit paths
        dell-laptop: Fix build error by making buffer_mutex static
        asus-laptop: fix style problems reported by checkpath.pl
        asus-laptop: use device_create_file() instead of platform_group
        asus-laptop: clean led code
        asus-laptop: add gps rfkill
        asus-laptop: set initial lcd state
        asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init()
        asus-laptop: add backlight changes notifications
        asus-laptop: add bluetooth keys found on M9V
        asus-laptop: switch to sparse keymap library
        asus-laptop: rename wireless_status to wlan_status to avoid confusion
        asus-laptop: add error check for write_acpi_int calls
        asus-laptop: stop using ASUS_HANDLE and use relative methods instead
        asus-laptop: rename function talking directly to acpi with asus_xxx scheme
        ...
      b037bba7
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · a03696e9
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Document the message size limit
        i2c-algo-pca: Drop duplicate variable
        i2c: Hook up runtime PM support
        i2c-parport-light: Add SMBus alert support
        i2c-parport: Add SMBus alert support
        i2c: Separate Kconfig option for i2c-smbus
        i2c: Add SMBus alert support
        i2c-parport: Give powered devices some time to settle
        i2c-tiny-usb: Fix a comment on bus frequency
        i2c-i801: Add Intel Cougar Point device IDs
        i2c: Make PCI device ids constant
      a03696e9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 0a135ba1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: add __percpu sparse annotations to what's left
        percpu: add __percpu sparse annotations to fs
        percpu: add __percpu sparse annotations to core kernel subsystems
        local_t: Remove leftover local.h
        this_cpu: Remove pageset_notifier
        this_cpu: Page allocator conversion
        percpu, x86: Generic inc / dec percpu instructions
        local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c
        module: Use this_cpu_xx to dynamically allocate counters
        local_t: Remove cpu_local_xx macros
        percpu: refactor the code in pcpu_[de]populate_chunk()
        percpu: remove compile warnings caused by __verify_pcpu_ptr()
        percpu: make accessors check for percpu pointer in sparse
        percpu: add __percpu for sparse.
        percpu: make access macros universal
        percpu: remove per_cpu__ prefix.
      0a135ba1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 4850f524
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: print glock numbers in hex
        GFS2: ordered writes are backwards
        GFS2: Remove old, unused linked list code from quota
        GFS2: Remove loopy umount code
        GFS2: Metadata address space clean up
      4850f524
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 3ff1562e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (48 commits)
        IB/srp: Clean up error path in srp_create_target_ib()
        IB/srp: Split send and recieve CQs to reduce number of interrupts
        RDMA/nes: Add support for KR device id 0x0110
        IB/uverbs: Use anon_inodes instead of private infinibandeventfs
        IB/core: Fix and clean up ib_ud_header_init()
        RDMA/cxgb3: Mark RDMA device with CXIO_ERROR_FATAL when removing
        RDMA/cxgb3: Don't allocate the SW queue for user mode CQs
        RDMA/cxgb3: Increase the max CQ depth
        RDMA/cxgb3: Doorbell overflow avoidance and recovery
        IB/core: Pack struct ib_device a little tighter
        IB/ucm: Clean whitespace errors
        IB/ucm: Increase maximum devices supported
        IB/ucm: Use stack variable 'base' in ib_ucm_add_one
        IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one
        IB/umad: Clean whitespace
        IB/umad: Increase maximum devices supported
        IB/umad: Use stack variable 'base' in ib_umad_init_port
        IB/umad: Use stack variable 'devnum' in ib_umad_init_port
        IB/umad: Remove port_table[]
        IB/umad: Convert *cdev to cdev in struct ib_umad_port
        ...
      3ff1562e
    • Randy Dunlap's avatar
      docbook: fix errors from x86 headers merger · 88b68033
      Randy Dunlap authored
      Fix docbook errors for x86 headers that were recently merged:
      
      docproc: arch/x86/include/asm/atomic_32.h: No such file or directory
      docproc: arch/x86/include/asm/io_32.h: No such file or directory
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Brian Gerst <brgerst@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      88b68033
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 4846546f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] pSesInfo->sesSem is used as mutex. Rename it to session_mutex and
        [CIFS] Use unsigned ea length for clarity
        cifs: set server_eof in cifs_fattr_to_inode
        [CIFS] Minor cleanup to EA patch
        cifs: merge CIFSSMBQueryEA with CIFSSMBQAllEAs
        cifs: verify lengths of QueryAllEAs reply
        cifs: increase maximum buffer size in CIFSSMBQAllEAs
        cifs: rename name_len to list_len in CIFSSMBQAllEAs
        cifs: clean up indentation in CIFSSMBQAllEAs
        cifs: add parens around smb_var in BCC macros
      4846546f
  3. 02 Mar, 2010 21 commits