1. 04 3月, 2010 14 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · c8bf9fec
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits)
        Regulators: wm8400 - cleanup platform driver data handling
        Regulators: wm8994 - clean up driver data after removal
        Regulators: wm831x-xxx - clean up driver data after removal
        Regulators: pcap-regulator - clean up driver data after removal
        Regulators: max8660 - annotate probe and remove methods
        Regulators: max1586 - annotate probe and remove methods
        Regulators: lp3971 - fail if platform data was not supplied
        Regulators: tps6507x-regulator - mark probe method as __devinit
        Regulators: tps65023-regulator - mark probe method as __devinit
        Regulators: twl-regulator - mark probe function as __devinit
        Regulators: fixed - annotate probe and remove methods
        Regulators: ab3100 - fix probe and remove annotations
        Regulators: virtual - use sysfs attribute groups
        twl6030: regulator: Configure STATE register instead of REMAP
        regulator: Provide optional dummy regulator for consumers
        regulator: Assume regulators are enabled if they don't report anything
        regulator: Convert fixed voltage regulator to use enable_time()
        regulator: Add WM8994 regulator support
        regulator: enable max8649 regulator driver
        regulator: trivial: fix typos in user-visible Kconfig text
        ...
      c8bf9fec
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · a2e28fc1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
        pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
        pcmcia: CodingStyle fixes
        pcmcia: alchemy: fixup wrong comments
        pcmcia: remove irq_list parameter from pd6729
        yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
      a2e28fc1
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 03a2c4d7
      Linus Torvalds 提交于
      * '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
    • L
      Prioritize synchronous signals over 'normal' signals · a27341cd
      Linus Torvalds 提交于
      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: NPavel Vilim <wylda@volny.cz>
      Acked-by: NOleg Nesterov <oleg@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a27341cd
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · eaa5eec7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: Simplify ECC override handling
      eaa5eec7
    • L
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 2a32f2db
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · feaf77d5
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · eca281aa
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7f5b09c1
      Linus Torvalds 提交于
      * 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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 94468080
      Linus Torvalds 提交于
      * 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
    • L
      Merge branch 'x86-apic-for-linus' of... · fb7b096d
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'x86-bootmem-for-linus' of... · a626b46e
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · c1dcb4bb
      Linus Torvalds 提交于
      * '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
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 60f8a8d4
      Linus Torvalds 提交于
      * '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
  2. 03 3月, 2010 26 次提交