17 Jan, 2010

1 commit

  • This patch adds the ov511, quickcam_messenger, w9968cf, stv680 and ovcamchip
    v4l1 drivers to the feature removal schedule as the devices they support
    are now all also supported by v4l2 gspca sub drivers.

    This patch also adds the v4l2 vc0301 driver for removal as it duplicates
    functionality of the gspca_zc3xx driver, zc0301 only supports 2 USB-ID's
    (because it only supports a limited set of sensors) wich are also
    supported
    by the gspca_zc3xx driver (which supports 53 USB-ID's in total).

    [mchehab@redhat.com: change "when" to 2.6.35]

    Signed-off-by: Hans de Goede
    Signed-off-by: Mauro Carvalho Chehab

    Hans de Goede
     

13 Jan, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
    sky2: Fix oops in sky2_xmit_frame() after TX timeout
    Documentation/3c509: document ethtool support
    af_packet: Don't use skb after dev_queue_xmit()
    vxge: use pci_dma_mapping_error to test return value
    netfilter: ebtables: enforce CAP_NET_ADMIN
    e1000e: fix and commonize code for setting the receive address registers
    e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
    e1000e: perform 10/100 adaptive IFS only on parts that support it
    e1000e: don't accumulate PHY statistics on PHY read failure
    e1000e: call pci_save_state() after pci_restore_state()
    netxen: update version to 4.0.72
    netxen: fix set mac addr
    netxen: fix smatch warning
    netxen: fix tx ring memory leak
    tcp: update the netstamp_needed counter when cloning sockets
    TI DaVinci EMAC: Handle emac module clock correctly.
    dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
    ixgbe: Fix compiler warning about variable being used uninitialized
    netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
    mv643xx_eth: don't include cache padding in rx desc buffer size
    ...

    Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c

    Linus Torvalds
     

12 Jan, 2010

7 commits

  • 3c509 was changed to support ethtool in 2002, making the 'xcvr' module
    parameter obsolete in most cases. More recently 3c509 was converted
    to the modern driver model and this parameter was removed. Fix the
    documentation to refer to ethtool rather than the module parameter.

    Signed-off-by: Ben Hutchings
    Signed-off-by: David S. Miller

    Ben Hutchings
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: Make PCI device ids constant
    hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
    hwmon: (k10temp) Blacklist more family 10h processors
    hwmon: (asus_atk0110) Add debugfs interface
    hwmon: (asus_atk0110) Refactor interface probe code
    hwmon: (adt7462) Fix pin 28 monitoring

    Linus Torvalds
     
  • Remove comments about function short descriptions not allowed to be on
    multiple lines (that was fixed/changed recently).

    Add comments that function "section header:" names need to be unique per
    function/struct/union/typedef/enum.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix typos, grammos, spellos, hyphenation.

    Signed-off-by: Randy Dunlap
    Acked-by: Steven Rostedt
    Cc: Mel Gorman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Signed-off-by:
    Cc: Jean Delvare
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tomaz Mertelj
     
  • Commit d899bf7b (procfs: provide stack information for threads) introduced
    to show stack information in /proc/{pid}/status. But it cause large
    performance regression. Unfortunately /proc/{pid}/status is used ps
    command too and ps is one of most important component. Because both to
    take mmap_sem and page table walk are heavily operation.

    If many process run, the ps performance is,

    [before d899bf7b]

    % perf stat ps >/dev/null

    Performance counter stats for 'ps':

    4090.435806 task-clock-msecs # 0.032 CPUs
    229 context-switches # 0.000 M/sec
    0 CPU-migrations # 0.000 M/sec
    234 page-faults # 0.000 M/sec
    8587565207 cycles # 2099.425 M/sec
    9866662403 instructions # 1.149 IPC
    3789415411 cache-references # 926.409 M/sec
    30419509 cache-misses # 7.437 M/sec

    128.859521955 seconds time elapsed

    [after d899bf7b]

    % perf stat ps > /dev/null

    Performance counter stats for 'ps':

    4305.081146 task-clock-msecs # 0.028 CPUs
    480 context-switches # 0.000 M/sec
    2 CPU-migrations # 0.000 M/sec
    237 page-faults # 0.000 M/sec
    9021211334 cycles # 2095.480 M/sec
    10605887536 instructions # 1.176 IPC
    3612650999 cache-references # 839.160 M/sec
    23917502 cache-misses # 5.556 M/sec

    152.277819582 seconds time elapsed

    Thus, this patch revert it. Fortunately /proc/{pid}/task/{tid}/smaps
    provide almost same information. we can use it.

    Commit d899bf7b introduced two features:

    1) Add the annotattion of [thread stack: xxxx] mark to
    /proc/{pid}/task/{tid}/maps.
    2) Add StackUsage field to /proc/{pid}/status.

    I only revert (2), because I haven't seen (1) cause regression.

    Signed-off-by: KOSAKI Motohiro
    Cc: Stefani Seibold
    Cc: Ingo Molnar
    Cc: Peter Zijlstra
    Cc: Alexey Dobriyan
    Cc: "Eric W. Biederman"
    Cc: Randy Dunlap
    Cc: Andrew Morton
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • Add many ioctl definitions to ioctl-number.txt.
    Fix some whitespace/formatting.
    Correct some filenames/paths.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

11 Jan, 2010

1 commit

  • The latest version of the Revision Guide for AMD Family 10h Processors
    lists two more processor revisions which may be affected by erratum 319.
    Change the blacklisting code to correctly detect those processors, by
    implementing AMD's recommended algorithm.

    Signed-off-by: Clemens Ladisch
    Signed-off-by: Jean Delvare
    Cc: Andreas Herrmann

    Clemens Ladisch
     

05 Jan, 2010

1 commit


03 Jan, 2010

3 commits


02 Jan, 2010

1 commit


01 Jan, 2010

1 commit

  • …nel/git/tip/linux-2.6-tip

    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    tracing: Fix sign fields in ftrace_define_fields_##call()
    tracing/syscalls: Fix typo in SYSCALL_DEFINE0
    tracing/kprobe: Show sign of fields in trace_kprobe format files
    ksym_tracer: Remove trace_stat
    ksym_tracer: Fix race when incrementing count
    ksym_tracer: Fix to allow writing newline to ksym_trace_filter
    ksym_tracer: Fix to make the tracer work
    tracing: Kconfig spelling fixes and cleanups
    tracing: Fix setting tracer specific options
    Documentation: Update ftrace-design.txt
    Documentation: Update tracepoint-analysis.txt
    Documentation: Update mmiotrace.txt

    Linus Torvalds
     

31 Dec, 2009

8 commits

  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    ACPI: introduce kernel parameter acpi_sleep=sci_force_enable
    ACPI: WMI: Survive BIOS with duplicate GUIDs
    dell-wmi - fix condition to abort driver loading
    wmi: check find_guid() return value to prevent oops
    dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value
    ACPI: hp-wmi, msi-wmi: clarify that wmi_install_notify_handler() returns an acpi_status
    dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should
    ACPI video: correct error-handling code
    ACPI video: no warning message if "acpi_backlight=vendor" is used
    ACPI: fix ACPI=n allmodconfig build
    thinkpad-acpi: improve Kconfig help text
    thinkpad-acpi: update volume subdriver documentation
    thinkpad-acpi: make volume subdriver optional
    thinkpad-acpi: don't fail to load the entire module due to ALSA problems
    thinkpad-acpi: don't take the first ALSA slot by default

    Linus Torvalds
     
  • Len Brown
     
  • Introduce kernel parameter acpi_sleep=sci_force_enable

    some laptop requires SCI_EN being set directly on resume,
    or else they hung somewhere in the resume code path.

    We already have a blacklist for these laptops but we still need
    this option, especially when debugging some suspend/resume problems,
    in case there are systems that need this workaround and are not yet
    in the blacklist.

    Signed-off-by: Zhang Rui
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Len Brown

    Zhang Rui
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: Patch up how we claim metadata blocks for quota purposes
    ext4: Ensure zeroout blocks have no dirty metadata
    ext4: return correct wbc.nr_to_write in ext4_da_writepages
    ext4: Update documentation to correct the inode_readahead_blks option name
    jbd2: don't use __GFP_NOFAIL in journal_init_common()
    ext4: flush delalloc blocks when space is low
    fs-writeback: Add helper function to start writeback if idle
    ext4: Eliminate potential double free on error path
    ext4: fix unsigned long long printk warning in super.c
    ext4, jbd2: Add barriers for file systems with exernal journals
    ext4: replace BUG() with return -EIO in ext4_ext_get_blocks
    ext4: add module aliases for ext2 and ext3
    ext4: Don't ask about supporting ext2/3 in ext4 if ext4 is not configured
    ext4: remove unused #include

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    PCI/cardbus: Add a fixup hook and fix powerpc
    PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
    PCI: change PCI nomenclature in drivers/pci/ (comment changes)
    PCI: fix section mismatch on update_res()
    PCI: add Intel 82599 Virtual Function specific reset method
    PCI: add Intel USB specific reset method
    PCI: support device-specific reset methods
    PCI: Handle case when no pci device can provide cache line size hint
    PCI/PM: Propagate wake-up enable for PCIe devices too
    vgaarbiter: fix a typo in the vgaarbiter Documentation

    Linus Torvalds
     
  • * 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: get rid of kvm_create_vm() unused label warning on s390
    KVM: powerpc: Fix mtsrin in book3s_64 mmu
    KVM: ia64: fix build breakage due to host spinlock change
    KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates
    KVM: LAPIC: make sure IRR bitmap is scanned after vm load
    KVM: Fix possible circular locking in kvm_vm_ioctl_assign_device()
    KVM: MMU: remove prefault from invlpg handler

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Fix Oops at reloading beep devices
    ALSA: hda - Don't cache beep controls
    ALSA: Fix a typo in Procfile.txt
    ALSA: sound/arm: Fix build failure caused by missing struct aaci definition
    ALSA: hda - use snd_hda_jack_detect() again in patch_sigmatel.c
    ALSA: hda - Disable tigger at pin-sensing on AD codecs
    ALSA: hda - HDMI sticky stream tag support
    ALSA: Fix indentation in pcm_native.c

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
    block: blk_rq_err_sectors cleanup
    block: Honor the gfp_mask for alloc_page() in blkdev_issue_discard()
    block: Fix incorrect alignment offset reporting and update documentation
    cfq-iosched: don't regard requests with long distance as close
    aoe: switch to the new bio_flush_dcache_pages() interface
    drivers/block/mg_disk.c: use resource_size()
    drivers/block/DAC960.c: use DAC960_V2_Controller
    block: Fix topology stacking for data and discard alignment
    drbd: remove unused #include
    drbd: remove duplicated #include
    drbd: Fix test of unsigned in _drbd_fault_random()
    drbd: Constify struct file_operations
    cfq-iosched: Remove prio_change logic for workload selection
    cfq-iosched: Get rid of nr_groups
    cfq-iosched: Remove the check for same cfq group from allow_merge
    drbd: fix test of unsigned in _drbd_fault_random()
    block: remove Documentation/block/as-iosched.txt

    Linus Torvalds
     

27 Dec, 2009

3 commits


25 Dec, 2009

1 commit


24 Dec, 2009

8 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (30 commits)
    USB: Fix a bug on appledisplay.c regarding signedness
    USB: option: support hi speed for modem Haier CE100
    USB: audio gadget: free alsa devices when unloading
    USB: audio gadget: fix wTotalLength calculation
    usb: otg: isp1301_omap: fix compile error
    USB: musb: workaround Blackfin FIFO anomalies
    USB: musb: Fix array index out of bounds issue
    USB: musb: Fix null pointer dereference issue
    USB: musb: correct DMA address for tx
    USB: musb: gadget_ep0: avoid SetupEnd interrupt
    USB: musb: fix for crash in DM646x USB when (CPPI)DMA is enabled
    USB: musb: do not work if no gadget driver is loaded
    USB: musb: gadget: set otg tranceiver to idle when registering gadget
    USB: musb: Populate the VBUS GPIO with the correct GPIO number
    USB: musb: MAINTAINERS: Fix my tree's address
    USB: musb: fix compiling warning with min() macro
    USB: musb: move musb_remove to __exit
    USB: musb_gadget: fix kernel oops in txstate()
    USB: ftdi_sio: sort PID/VID entries in new ftdi_sio_ids.h header
    USB: ftdi_sio: isolate all device IDs to new ftdi_sio_ids.h header
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    devtmpfs: unlock mutex in case of string allocation error
    Driver core: export platform_device_register_data as a GPL symbol
    driver core: Prevent reference to freed memory on error path
    Driver-core: Fix bogus 0 error return in device_add()
    Driver core: driver_attribute parameters can often be const*
    Driver core: bin_attribute parameters can often be const*
    Driver core: device_attribute parameters can often be const*
    Doc/stable rules: add new cherry-pick logic
    vfs: get_sb_single() - do not pass options twice
    devtmpfs: Convert dirlock to a mutex

    Linus Torvalds
     
  • This patch (as1313) updates the documentation concerning USB power
    management.

    Signed-off-by: Alan Stern
    Signed-off-by: Greg Kroah-Hartman

    Alan Stern
     
  • Many struct driver_attribute descriptors are purely read-only
    structures, and there's no need to change them. Therefore make
    the promise not to, which will let those descriptors be put in
    a ro section.

    Signed-off-by: Phil Carmody
    Signed-off-by: Greg Kroah-Hartman

    Phil Carmody
     
  • Most device_attributes are const, and are begging to be
    put in a ro section. However, the create and remove
    file interfaces were failing to propagate the const promise
    which the only functions they call offer.

    Signed-off-by: Phil Carmody
    Signed-off-by: Greg Kroah-Hartman

    Phil Carmody
     
  • - it is possible to submit patches for the stable queue without sending
    them directly stable@kernel.org. If the tag (Cc: stable@kernel.org) is
    available in the sign-off area than hpa's script will filter them into
    the stable mailbox once it hits Linus' tree.
    - Patches which require others to be applied first can be also specified.
    This was discussued in http://lkml.org/lkml/2009/11/9/474

    Signed-off-by: Sebastian Andrzej Siewior
    Cc: Brandon Philips
    Signed-off-by: Greg Kroah-Hartman

    Sebastian Andrzej Siewior
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: hda - Add STAC9205 PCI_QUIRK for Dell Vostro 1700
    ASoC: Do not write to invalid registers on the wm9712.
    ALSA: hda - Set mixer name after codec patch
    ASoC: add missing parameter to mx27vis_hifi_hw_free()
    ASoC: sh: FSI:: don't check platform_get_irq's return value against zero
    ALSA: sound/core/pcm_timer.c: use lib/gcd.c
    ALSA: hda - Add MSI blacklist
    ALSA: hda - Add support for the new 27 inch IMacs
    ALSA: hda - Fix NULL dereference with enable_beep=0 option

    Linus Torvalds
     
  • Takashi Iwai
     

23 Dec, 2009

4 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PM: Runtime PM documentation update
    PM / Runtime: Use device type and device class callbacks
    PM: Use pm_runtime_put_sync in system resume
    PM: Measure device suspend and resume times
    PM: Make the initcall_debug style timing for suspend/resume complete

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (36 commits)
    powerpc/gc/wii: Remove get_irq_desc()
    powerpc/gc/wii: hlwd-pic: convert irq_desc.lock to raw_spinlock
    powerpc/gamecube/wii: Fix off-by-one error in ugecon/usbgecko_udbg
    powerpc/mpic: Fix problem that affinity is not updated
    powerpc/mm: Fix stupid bug in subpge protection handling
    powerpc/iseries: use DECLARE_COMPLETION_ONSTACK for non-constant completion
    powerpc: Fix MSI support on U4 bridge PCIe slot
    powerpc: Handle VSX alignment faults correctly in little-endian mode
    powerpc/mm: Fix typo of cpumask_clear_cpu()
    powerpc/mm: Fix hash_utils_64.c compile errors with DEBUG enabled.
    powerpc: Convert BUG() to use unreachable()
    powerpc/pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible.
    powerpc/pseries: Don't panic when H_PROD fails during cpu-online.
    powerpc/mm: Fix a WARN_ON() with CONFIG_DEBUG_PAGEALLOC and CONFIG_DEBUG_VM
    powerpc/defconfigs: Set HZ=100 on pseries and ppc64 defconfigs
    powerpc/defconfigs: Disable token ring in powerpc defconfigs
    powerpc/defconfigs: Reduce 64bit vmlinux by making acenic and cramfs modules
    powerpc/pseries: Select XICS and PCI_MSI PSERIES
    powerpc/85xx: Wrong variable returned on error
    powerpc/iseries: Convert to proc_fops
    ...

    Linus Torvalds
     
  • Clean up typos/grammos/spellos in events-kmem.txt.

    Signed-off-by: Randy Dunlap
    Cc: Mel Gorman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • This patch (as1318) updates the runtime PM documentation, adding a
    section discussing the interaction between runtime PM and system sleep.

    [rjw: Rebased and made it agree with the other updates better.]

    Signed-off-by: Alan Stern
    Signed-off-by: Rafael J. Wysocki

    Alan Stern