Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v2.6.35-rc6-gi…
Commits on Jul 27, 2010
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: Pass the correct end of buffer to p9stat_read
  2. @torvalds

    gpio: fix spurious printk when freeing a gpio

    Jon Povey authored torvalds committed
    When freeing a gpio that has not been exported, gpio_unexport() prints a
    debug message when it should just fall through silently.
    
    Example spurious message:
    
    	gpio_unexport: gpio0 status -22
    
    Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk>
    Cc: David Brownell <david-b@pacbell.net>
    Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
    Cc: Gregory Bean <gbean@codeaurora.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    edac: mpc85xx: fix coldplug/hotplug module autoloading

    Anton Vorontsov authored torvalds committed
    The MPC85xx EDAC driver is missing module device aliases, so the driver
    won't load automatically on boot.  This patch fixes the issue by adding
    proper MODULE_DEVICE_TABLE() macros.
    
    Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
    Cc: Doug Thompson <dougthompson@xmission.com>
    Cc: Peter Tyser <ptyser@xes-inc.com>
    Cc: Dave Jiang <djiang@mvista.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    drivers/rtc/rtc-rx8581.c: fix setdatetime

    Rudolf Marek authored torvalds committed
    Fix the logic while writing new date/time to the chip.  The driver
    incorrectly wrote back register values to different registers and even
    with wrong mask.  The patch adds clearing of the VLF register, which
    should be cleared if all date/time values are set.
    
    Signed-off-by: Rudolf Marek <rudolf.marek@sysgo.com>
    Acked-by: Wan ZongShun <mcuos.com@gmail.com>
    Cc: Martyn Welch <martyn.welch@gefanuc.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @jibaron @torvalds

    dynamic debug: move ddebug_remove_module() down into free_module()

    jibaron authored torvalds committed
    The command
    
    	echo "file ec.c +p" >/sys/kernel/debug/dynamic_debug/control
    
    causes an oops.
    
    Move the call to ddebug_remove_module() down into free_module().  In this
    way it should be called from all error paths.  Currently, we are missing
    the remove if the module init routine fails.
    
    Signed-off-by: Jason Baron <jbaron@redhat.com>
    Reported-by: Thomas Renninger <trenn@suse.de>
    Tested-by: Thomas Renninger <trenn@suse.de>
    Cc: <stable@kernel.org>		[2.6.32+]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @lionkov @ericvh

    9p: Pass the correct end of buffer to p9stat_read

    lionkov authored ericvh committed
    Pass the correct end of the buffer to p9stat_read.
    
    Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  7. @torvalds

    Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/paulus/perf
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf:
      perf, powerpc: Use perf_sample_data_init() for the FSL code
  8. @torvalds

    Merge git://git.infradead.org/users/cbou/battery-2.6.35

    torvalds authored
    * git://git.infradead.org/users/cbou/battery-2.6.35:
      ds2782_battery: Rename get_current to fix build failure / name conflict
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      s2io: fixing DBG_PRINT() macro
      ath9k: fix dma direction for map/unmap in ath_rx_tasklet
      net: dev_forward_skb should call nf_reset
      net sched: fix race in mirred device removal
      tun: avoid BUG, dump packet on GSO errors
      bonding: set device in RLB ARP packet handler
      wimax/i2400m: Add PID & VID for Intel WiMAX 6250
      ipv6: Don't add routes to ipv6 disabled interfaces.
      net: Fix skb_copy_expand() handling of ->csum_start
      net: Fix corruption of skb csum field in pskb_expand_head() of net/core/skbuff.c
      macvtap: Limit packet queue length
      ixgbe/igb: catch invalid VF settings
      bnx2x: Advance a module version
      bnx2x: Protect statistics ramrod and sequence number
      bnx2x: Protect a SM state change
      wireless: use netif_rx_ni in ieee80211_send_layer2_update
  10. @paulusmack

    perf, powerpc: Use perf_sample_data_init() for the FSL code

    Peter Zijlstra authored paulusmack committed
    We should use perf_sample_data_init() to initialize struct
    perf_sample_data.  As explained in the description of commit dc1d628
    ("perf: Provide generic perf_sample_data initialization"), it is
    possible for userspace to get the kernel to dereference data.raw,
    so if it is not initialized, that means that unprivileged userspace
    can possibly oops the kernel.  Using perf_sample_data_init makes sure
    it gets initialized to NULL.
    
    This conversion should have been included in commit dc1d628, but it
    got missed.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Kumar Gala <kumar.gala@freescale.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on Jul 26, 2010
  1. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/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: Do not try to disable hpet if it hasn't been initialized before
      x86, i8259: Only register sysdev if we have a real 8259 PIC
  2. @davem330

    s2io: fixing DBG_PRINT() macro

    Breno Leitao authored davem330 committed
    Patch 9e39f7c changed the
    DBG_PRINT() macro and the if clause was wrongly changed. It means
    that currently all the DBG_PRINT are being printed, flooding the
    kernel log buffer with things like:
    
    s2io: eth6: Next block at: c0000000b9c90000
    s2io: eth6: In Neterion Tx routine
    
    Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
    Acked-by: Sreenivasa Honnur <Sreenivasa.Honnur@neterion.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @torvalds

    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds authored
    …/davej/cpufreq
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] powernow-k8: Limit Pstate transition latency check
      [CPUFREQ] Fix PCC driver error path
      [CPUFREQ] fix double freeing in error path of pcc-cpufreq
      [CPUFREQ] pcc driver should check for pcch method before calling _OSC
      [CPUFREQ] fix memory leak in cpufreq_add_dev
      [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"
  4. @torvalds

    Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-…

    torvalds authored
    …linus
    
    * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Set io_map_base for several PCI bridges lacking it
      MIPS: Alchemy: Define eth platform devices in the correct order
      MIPS: BCM63xx: Prevent second enet registration on BCM6338
      MIPS: Quit using undefined behavior of ADDU in 64-bit atomic operations.
      MIPS: N32: Define getdents64.
      MIPS: MTX-1: Fix PCI on the MeshCube and related boards
      MIPS: Make init_vdso a subsys_initcall.
      MIPS: "Fix" useless 'init_vdso successfully' message.
      MIPS: PowerTV: Move register setup to before reading registers.
      SOUND: Au1000: Fix section mismatch
      VIDEO: Au1100fb: Fix section mismatch
      VIDEO: PMAGB-B: Fix section mismatch
      VIDEO: PMAG-BA: Fix section mismatch
      NET: declance: Fix section mismatches
      VIDEO. gbefb: Fix section mismatches.
  5. @torvalds

    drm/i915: make sure we shut off the panel in eDP configs

    Jesse Barnes authored torvalds committed
    Fix error from the last pull request.  Making sure we shut the panel off
    is more correct and saves power.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @davem330
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    torvalds authored
    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      sysfs: allow creating symlinks from untagged to tagged directories
      sysfs: sysfs_delete_link handle symlinks from untagged to tagged directories.
      sysfs: Don't allow the creation of symlinks we can't remove
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
      USB: musb: tusb6010: fix compile error with n8x0_defconfig
      USB: FTDI: Add support for the RT System VX-7 radio programming cable
      USB: add quirk for Broadcom BT dongle
      USB: usb-storage: fix initializations of urb fields
      USB: xhci: Set Mult field in endpoint context correctly.
      USB: sisusbvga: Fix for USB 3.0
      USB: adds Artisman USB dongle to list of quirky devices
      USB: xhci: Set EP0 dequeue ptr after reset of configured device.
      USB: Fix USB3.0 Port Speed Downgrade after port reset
      USB: xHCI: Fix another bug in link TRB activation change.
      USB: option: Add support for AMOI Skypephone S2
      USB: New PIDs for Qualcomm gobi 2000 (qcserial)
      USB: ftdi_sio: support for Signalyzer tools based on FTDI chips
      USB: s3c2410_udc: be aware of connected gadget driver
      USB: Expose vendor-specific ACM channel on Nokia 5230
      USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c
      USB: option: add support for 1da5:4518
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: fix rs485 for atmel_serial on avr32
  10. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
      drm/i915: add pipe A force quirks to i915 driver
      drm/i915: Fix panel fitting regression since 734b415
      drm/i915: fix deadlock in fb teardown
      drm/i915: don't free non-existent compressed llb on ILK+
      agp/intel: Use the correct mask to detect i830 aperture size.
      drm/i915: disable FBC when more than one pipe is active
      drm/i915: Use the correct scanout alignment for fbcon.
      drm/i915: make sure eDP panel is turned on
      drm/i915: add PANEL_UNLOCK_REGS definition
      drm/i915: Make G4X-style PLL search more permissive
      drm/i915: Clear any existing dither mode prior to enabling spatial dithering
      drm/i915: handle shared framebuffers when flipping
      drm/i915: Explosion following OOM in do_execbuffer.
      gpu/drm/i915: Add a blacklist to omit modeset on LID open
  11. @kernelslacker

    [CPUFREQ] powernow-k8: Limit Pstate transition latency check

    Borislav Petkov authored kernelslacker committed
    The Pstate transition latency check was added for broken F10h BIOSen
    which wrongly contain a value of 0 for transition and bus master
    latency. Fam11h and later, however, (will) have similar transition
    latency so extend that behavior for them too.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  12. @kernelslacker

    [CPUFREQ] Fix PCC driver error path

    Matthew Garrett authored kernelslacker committed
    The PCC cpufreq driver unmaps the mailbox address range if any CPUs fail to
    initialise, but doesn't do anything to remove the registered CPUs from the
    cpufreq core resulting in failures further down the line. We're better off
    simply returning a failure - the cpufreq core will unregister us cleanly if
    we end up with no successfully registered CPUs. Tidy up the failure path
    and also add a sanity check to ensure that the firmware gives us a realistic
    frequency - the core deals badly with that being set to 0.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Cc: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  13. @kernelslacker

    [CPUFREQ] fix double freeing in error path of pcc-cpufreq

    Daniel J Blueman authored kernelslacker committed
    Prevent double freeing on error path.
    
    Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  14. @kernelslacker

    [CPUFREQ] pcc driver should check for pcch method before calling _OSC

    Matthew Garrett authored kernelslacker committed
    The pcc specification documents an _OSC method that's incompatible with the
    one defined as part of the ACPI spec. This shouldn't be a problem as both
    are supposed to be guarded with a UUID. Unfortunately approximately nobody
    (including HP, who wrote this spec) properly check the UUID on entry to the
    _OSC call. Right now this could result in surprising behaviour if the pcc
    driver performs an _OSC call on a machine that doesn't implement the pcc
    specification. Check whether the PCCH method exists first in order to reduce
    this probability.
    
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Cc: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  15. @kernelslacker

    [CPUFREQ] fix memory leak in cpufreq_add_dev

    Xiaotian Feng authored kernelslacker committed
    We didn't free policy->related_cpus in error path err_unlock_policy.
    This is catched by following kmemleak report:
    
    unreferenced object 0xffff88022a0b96d0 (size 512):
      comm "modprobe", pid 886, jiffies 4294689177 (age 780.694s)
      hex dump (first 32 bytes):
        00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
        00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
      backtrace:
        [<ffffffff8111ebe5>] create_object+0x186/0x281
        [<ffffffff814fad4f>] kmemleak_alloc+0x60/0xa7
        [<ffffffff8111127a>] kmem_cache_alloc_node_notrace+0x120/0x142
        [<ffffffff81262e4f>] alloc_cpumask_var_node+0x2c/0xd7
        [<ffffffff81262f0b>] alloc_cpumask_var+0x11/0x13
        [<ffffffff81262f1c>] zalloc_cpumask_var+0xf/0x11
        [<ffffffff8140fac0>] cpufreq_add_dev+0x11f/0x547
        [<ffffffff81334bda>] sysdev_driver_register+0xc2/0x11d
        [<ffffffff8140e334>] cpufreq_register_driver+0xcb/0x1b8
        [<ffffffffa032e040>] 0xffffffffa032e040
        [<ffffffff810021ba>] do_one_initcall+0x5e/0x15c
        [<ffffffff81087f94>] sys_init_module+0xa6/0x1e6
        [<ffffffff81009bc2>] system_call_fastpath+0x16/0x1b
        [<ffffffffffffffff>] 0xffffffffffffffff
    
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Cc: Thomas Renninger <trenn@suse.de>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  16. @nikel123 @kernelslacker

    [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP c…

    nikel123 authored kernelslacker committed
    …all (second call site)"
    
    
    395913d ("[CPUFREQ] remove rwsem lock
    from CPUFREQ_GOV_STOP call (second call site)") is not needed, because
    there is no rwsem lock in cpufreq_ondemand and cpufreq_conservative
    anymore.  Lock should not be released until the work done.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=1594
    
    Signed-off-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Signed-off-by: Dave Jones <davej@redhat.com>
  17. @ebiederm @gregkh

    sysfs: allow creating symlinks from untagged to tagged directories

    ebiederm authored gregkh committed
    Supporting symlinks from untagged to tagged directories is reasonable,
    and needed to support CONFIG_SYSFS_DEPRECATED.  So don't fail a prior
    allowing that case to work.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. @ebiederm @gregkh

    sysfs: sysfs_delete_link handle symlinks from untagged to tagged dire…

    ebiederm authored gregkh committed
    …ctories.
    
    This happens for network devices when SYSFS_DEPRECATED is enabled.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. @ebiederm @gregkh

    sysfs: Don't allow the creation of symlinks we can't remove

    ebiederm authored gregkh committed
    Recently my tagged sysfs support revealed a flaw in the device core
    that a few rare drivers are running into such that we don't always put
    network devices in a class subdirectory named net/.
    
    Since we are not creating the class directory the network devices wind
    up in a non-tagged directory, but the symlinks to the network devices
    from /sys/class/net are in a tagged directory.  All of which works
    until we go to remove or rename the symlink.  When we remove or rename
    a symlink we look in the namespace of the target of the symlink.
    Since the target of the symlink is in a non-tagged sysfs directory we
    don't have a namespace to look in, and we fail to remove the symlink.
    
    Detect this problem up front and simply don't create symlinks we won't
    be able to remove later.  This prevents symlink leakage and fails in
    a much clearer and more understandable way.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. @gregkh

    USB: musb: tusb6010: fix compile error with n8x0_defconfig

    Felipe Balbi authored gregkh committed
    Drop the unnecessary empty stubs in tusb6010.c and avoid
    a compile error when building kernel for n8x0.
    
    Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  21. @cminyard @gregkh

    USB: FTDI: Add support for the RT System VX-7 radio programming cable

    cminyard authored gregkh committed
    RT Systems has put out bunch of ham radio cables based on the FT232RL
    chip.  Each cable type has a unique PID, this adds one for the Yaesu VX-7
    radios.
    
    Signed-off-by: Corey Minyard <minyard@acm.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22. @gregkh

    USB: add quirk for Broadcom BT dongle

    Oliver Neukum authored gregkh committed
    This device needs to be reset when resuming
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23. @bcopeland @gregkh

    USB: usb-storage: fix initializations of urb fields

    bcopeland authored gregkh committed
    Commit 0ede76f, "USB: remove uses of
    URB_NO_SETUP_DMA_MAP" introduced a regression by inadvertantly removing
    initialization of the transfer flags.  This caused initialization
    failures in the ums-karma driver.  Fix the regression by zeroing it.
    
    While at it, as Alan Stern points out, the initializers for
    actual_length and status are handled by the core and error_count
    only matters for isochronous urbs, so they don't need to be set here.
    Remove them.
    
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24. @gregkh

    USB: xhci: Set Mult field in endpoint context correctly.

    Sarah Sharp authored gregkh committed
    The bmAttributes field of the SuperSpeed Endpoint Companion Descriptor has
    different meanings, depending on the endpoint type.  If the endpoint is
    isochronous, the bmAttributes field is the maximum number of packets
    within a service interval that this endpoint supports.  If the endpoint is
    bulk, it's the number of stream IDs this endpoint supports.
    
    Only set the Mult field of the xHCI endpoint context using the
    bmAttributes field if the endpoint is isochronous, and the device is a
    SuperSpeed device.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25. @gregkh

    USB: sisusbvga: Fix for USB 3.0

    Oliver Neukum authored gregkh committed
    Super speed is also fast enough to let sisusbvga operate.
    Therefor expand the checks.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Something went wrong with that request. Please try again.