1. 10 4月, 2011 12 次提交
  2. 09 4月, 2011 2 次提交
  3. 07 4月, 2011 1 次提交
  4. 06 4月, 2011 3 次提交
  5. 31 3月, 2011 2 次提交
  6. 30 3月, 2011 1 次提交
  7. 19 3月, 2011 15 次提交
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 99759619
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: label: remove #include of ACPI header to avoid warnings
        PCI: label: Fix compilation error when CONFIG_ACPI is unset
        PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
        PCI: introduce reset_resource()
        PCI: data structure agnostic free list function
        PCI: refactor io size calculation code
        PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
        PCI hotplug: acpiphp: set current_state to D0 in register_slot
        PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
        PCI: add more checking to ICH region quirks
        PCI: aer-inject: Override PCIe AER Mask Registers
        PCI: fix tlan build when CONFIG_PCI is not enabled
        PCI: remove quirk for pre-production systems
        PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
        PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
        PCI: sysfs: Fix failure path for addition of "vpd" attribute
      99759619
    • L
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · b061c59c
      Linus Torvalds 提交于
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
        spi/dw_spi: move dw_spi.h into drivers/spi
        spi/dw_spi: Fix missing header
        gpio/langwell: Clear edge bit before handling
        gpio/langwell: Simplify demux loop
        gpio/langwell: Convert irq name space
        gpio/langwell: Fix broken irq_eoi change.
        gpio; Make Intel chipset gpio drivers depend on x86
        gpio/cs5535-gpio: Fix section mismatch
        spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices
        spi/davinci: Support DMA transfers larger than 65535 words
        spi/davinci: Use correct length parameter to dma_map_single calls
        gpio: Use __devexit at necessary places
        gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio
        gpio/mcp23s08: support mcp23s17 variant
        of_mmc_spi: add card detect irq support
        spi/omap_mcspi: catch xfers of non-multiple SPI word size
        spi/omap_mcspi: Off-by-one error in finding the right divisor
        gpio/pca953x: Fix wrong pointer type
        spi/pl022: rid dangling labels
        spi: add support for SuperH SPI
        ...
      b061c59c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 99f4065b
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use alloc_workqueue function
        dlm: increase default hash table sizes
        dlm: record full callback state
      99f4065b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · f539abec
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        fs: call security_d_instantiate in d_obtain_alias V2
        lose 'mounting_here' argument in ->d_manage()
        don't pass 'mounting_here' flag to follow_down()
        change the locking order for namespace_sem
        fix deadlock in pivot_root()
        vfs: split off vfsmount-related parts of vfs_kern_mount()
        Some fixes for pstore
        kill simple_set_mnt()
      f539abec
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs · 3f6f7e6d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
        omfs: make readdir stop when filldir says so
        omfs: merge unlink() and rmdir(), close leak in rename()
        omfs: stop playing silly buggers with omfs_unlink() in ->rename()
        omfs: rename() needs to mark old_inode dirty after ctime update
      3f6f7e6d
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 8f627a8a
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6: (25 commits)
        UBIFS: clean-up commentaries
        UBIFS: save 128KiB or more RAM
        UBIFS: allocate orphans scan buffer on demand
        UBIFS: allocate lpt dump buffer on demand
        UBIFS: allocate ltab checking buffer on demand
        UBIFS: allocate scanning buffer on demand
        UBIFS: allocate dump buffer on demand
        UBIFS: do not check data crc by default
        UBIFS: simplify UBIFS Kconfig menu
        UBIFS: print max. index node size
        UBIFS: handle allocation failures in UBIFS write path
        UBIFS: use max_write_size during recovery
        UBIFS: use max_write_size for write-buffers
        UBIFS: introduce write-buffer size field
        UBI: incorporate LEB offset information
        UBIFS: incorporate maximum write size
        UBI: provide LEB offset information
        UBI: incorporate maximum write size
        UBIFS: fix LEB number in printk
        UBIFS: restrict world-writable debugfs files
        ...
      8f627a8a
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · fd57ed02
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: make tests modes dynamic
        UBI: make self-checks dynamic
        UBI: make debugging messages dynamic
        UBI: remove UBI_IO_DEBUG macro
        UBI: kill debugging buffer
        UBI: allocate erase checking buffer on demand
        UBI: allocate write checking buffer on demand
        UBI: always re-read in case of read failures
        UBI: cleanup comments about corrupted PEBs
        UBI: add slab cache for ubi_scan_leb objects
        UBI: use raw mtd read function in debugging code
        UBI: try to reveal buggy MTD drivers
        UBI: add a commentary about allocating VID header buffer on stack
        UBI: cleanup LEB start calculations
        UBI: fix NOR erase preparation quirk
      fd57ed02
    • A
      MAINTAINERS: Add serial · ca749e2a
      Alan Cox 提交于
      Add an entry for serial maintainers.
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ca749e2a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · d3e458d7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
        ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
        ALSA: aloop - Fix possible IRQ lock inversion
        ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
        ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
        ALSA: firewire - msleep needs delay.h
        ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
        ALSA: firewire-lib: allocate DMA buffer separately
        ALSA: firewire-lib: use no-info SYT for packets without SYT sample
        ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
        ALSA: hda - Remove an unused variable in patch_realtek.c
        ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
        ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
        ALSA: hda - Move default input-src selection to init part
        ALSA: hda - Initialize special cases for input src in init phase
        ALSA: ctxfi - Clear input settings before initialization
        ALSA: ctxfi - Fix SPDIF status retrieval
        ALSA: ctxfi - Fix incorrect SPDIF status bit mask
        ALSA: ctxfi - Fix microphone boost codes/comments
        ALSA: atiixp - Fix wrong time-out checks during ac-link reset
        ALSA: intel8x0m: append 'm' to "r_intel8x0"
        ...
      d3e458d7
    • L
      Merge branch 'x86-fixes-for-linus' of... · f2e1fbb5
      Linus Torvalds 提交于
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Flush TLB if PGD entry is changed in i386 PAE mode
        x86, dumpstack: Correct stack dump info when frame pointer is available
        x86: Clean up csum-copy_64.S a bit
        x86: Fix common misspellings
        x86: Fix misspelling and align params
        x86: Use PentiumPro-optimized partial_csum() on VIA C7
      f2e1fbb5
    • L
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of... · 508996b6
      Linus Torvalds 提交于
      Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix incorrect unlock in __setup_irq()
        cris: Use generic show_interrupts()
        genirq: show_interrupts: Check desc->name before printing it blindly
        cris: Use accessor functions to set IRQ_PER_CPU flag
        cris: Fix irq conversion fallout
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched, kernel-doc: Fix runqueue_is_locked() description
      508996b6
    • L
      Merge branch 'perf-fixes-for-linus' of... · 61929785
      Linus Torvalds 提交于
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
        trace, filters: Initialize the match variable in process_ops() properly
        trace, documentation: Fix branch profiling location in debugfs
        oprofile, s390: Cleanups
        oprofile, s390: Remove hwsampler_files.c and merge it into init.c
        perf: Fix tear-down of inherited group events
        perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
        perf: Handle stopped state with tracepoints
        perf: Fix the software events state check
        perf, powerpc: Handle events that raise an exception without overflowing
        perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
        perf, x86: Clean up SandyBridge PEBS events
        perf lock: Fix sorting by wait_min
        perf tools: Version incorrect with some versions of grep
        perf evlist: New command to list the names of events present in a perf.data file
        perf script: Add support for H/W and S/W events
        perf script: Add support for dumping symbols
        perf script: Support custom field selection for output
        perf script: Move printing of 'common' data from print_event and rename
        perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
        perf script: Change process_event prototype
        ...
      61929785
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · e16b396c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
        doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
        Update cpuset info & webiste for cgroups
        dcdbas: force SMI to happen when expected
        arch/arm/Kconfig: remove one to many l's in the word.
        asm-generic/user.h: Fix spelling in comment
        drm: fix printk typo 'sracth'
        Remove one to many n's in a word
        Documentation/filesystems/romfs.txt: fixing link to genromfs
        drivers:scsi Change printk typo initate -> initiate
        serial, pch uart: Remove duplicate inclusion of linux/pci.h header
        fs/eventpoll.c: fix spelling
        mm: Fix out-of-date comments which refers non-existent functions
        drm: Fix printk typo 'failled'
        coh901318.c: Change initate to initiate.
        mbox-db5500.c Change initate to initiate.
        edac: correct i82975x error-info reported
        edac: correct i82975x mci initialisation
        edac: correct commented info
        fs: update comments to point correct document
        target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
        ...
      
      Trivial conflict in fs/eventpoll.c (spelling vs addition)
      e16b396c
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7fd23a24
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
        HID: add support for Logitech Driving Force Pro wheel
        HID: hid-ortek: remove spurious reference
        HID: add support for Ortek PKB-1700
        HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
        HID: hid-ntrig: init settle and mode check
        HID: merge hid-egalax into hid-multitouch
        HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
        HID: ntrig remove if and drop an indent
        HID: ACRUX - activate the device immediately after binding
        HID: ntrig: apply NO_INIT_REPORTS quirk
        HID: hid-magicmouse: Correct touch orientation direction
        HID: ntrig don't dereference unclaimed hidinput
        HID: Do not create input devices for feature reports
        HID: bt hidp: send Output reports using SET_REPORT on the Control channel
        HID: hid-sony.c: Fix sending Output reports to the Sixaxis
        HID: add support for Keytouch IEC 60945
        HID: Add HID Report Descriptor to sysfs
        HID: add IRTOUCH infrared USB to hid_have_special_driver
        HID: kernel oops in out_cleanup in function hidinput_connect
        HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
        ...
      7fd23a24
    • G
      spi/dw_spi: move dw_spi.h into drivers/spi · 568a60ed
      Grant Likely 提交于
      include/linux/dw_spi.h only includes driver internal data.  It doesn't
      expose a platform_data configuration structure or similar (at least
      nothing in-tree).  This patch moves the header into drivers/spi so
      that the scope is limited to only the dw_spi_*.c driver files
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      Cc: Feng Tang <feng.tang@intel.com>
      Cc: spi-devel-general@lists.sourceforge.net
      568a60ed
  8. 18 3月, 2011 4 次提交
    • J
      spi/dw_spi: Fix missing header · 46165a3d
      Jiri Slaby 提交于
      Currently, build on PPC dies with:
      In file included from drivers/spi/dw_spi_mmio.c:16:
      include/linux/spi/dw_spi.h:147: error: field ‘tx_sgl’ has incomplete type
      include/linux/spi/dw_spi.h:149: error: field ‘rx_sgl’ has incomplete type
      
      Add linux/scatterlist.h include to dw_spi.h, because we need to know
      the contents of the structure.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      46165a3d
    • J
      fs: call security_d_instantiate in d_obtain_alias V2 · 24ff6663
      Josef Bacik 提交于
      While trying to track down some NFS problems with BTRFS, I kept noticing I was
      getting -EACCESS for no apparent reason.  Eric Paris and printk() helped me
      figure out that it was SELinux that was giving me grief, with the following
      denial
      
      type=AVC msg=audit(1290013638.413:95): avc:  denied  { 0x800000 } for  pid=1772
      comm="nfsd" name="" dev=sda1 ino=256 scontext=system_u:system_r:kernel_t:s0
      tcontext=system_u:object_r:unlabeled_t:s0 tclass=file
      
      Turns out this is because in d_obtain_alias if we can't find an alias we create
      one and do all the normal instantiation stuff, but we don't do the
      security_d_instantiate.
      
      Usually we are protected from getting a hashed dentry that hasn't yet run
      security_d_instantiate() by the parent's i_mutex, but obviously this isn't an
      option there, so in order to deal with the case that a second thread comes in
      and finds our new dentry before we get to run security_d_instantiate(), we go
      ahead and call it if we find a dentry already.  Eric assures me that this is ok
      as the code checks to see if the dentry has been initialized already so calling
      security_d_instantiate() against the same dentry multiple times is ok.  With
      this patch I'm no longer getting errant -EACCESS values.
      Signed-off-by: NJosef Bacik <josef@redhat.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      24ff6663
    • A
      lose 'mounting_here' argument in ->d_manage() · 1aed3e42
      Al Viro 提交于
      it's always false...
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      1aed3e42
    • I
      trace, filters: Initialize the match variable in process_ops() properly · 1ef1d1c2
      Ingo Molnar 提交于
      Make sure the 'match' variable always has a value.
      
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      1ef1d1c2