28 Jun, 2011

2 commits

  • The APB timers are an IP block from Synopsys (DesignWare APB timers)
    and are also found in other systems including ARM SoC's. This patch
    adds functions for creating clock_event_devices and clocksources from
    APB timers but does not do the resource allocation. This is handled
    in a higher layer to allow the timers to be created from multiple
    methods such as platform_devices.

    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Jacob Pan
    Signed-off-by: Jamie Iles
    Signed-off-by: John Stultz

    Jamie Iles
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
    HID: hid-multitouch: add support for a new Lumio dual-touch panel
    HID: hid-multitouch: correct VID for Stantum panels
    HID: hid-multitouch: ensure slots are initialized

    Linus Torvalds
     

25 Jun, 2011

2 commits


24 Jun, 2011

22 commits

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    pata_marvell: Add support for 88SE91A0, 88SE91A4
    libata/sas: only set FROZEN flag if new EH is supported
    libata: apply NOSETXFER horkage to the affected Pioneer drives regardless of firmware revision
    drivers/ata/sata_dwc_460ex: Fix typo 'corrresponding'

    Linus Torvalds
     
  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/radeon/kms: handle special cases for vddc
    drm/radeon/kms: fix num_banks tiling config for fusion

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6:
    tcm_fc: Fix conversion spec warning
    tcm_fc: Fix possible lock to unlock type deadlock
    tcm_fc: Fix ft_send_tm LUN lookup OOPs
    target: Fix incorrect strlen() NULL terminator checks
    target: Drop bogus ERR_PTR usage in target_fabric_configfs_init
    target: Fix ERR_PTR dereferencing bugs
    target: Convert transport_deregister_session_configfs nacl_sess_lock to save irq state
    target: Fix transport_get_lun_for_tmr failure cases
    [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions
    [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun
    [SCSI] target: Fix task->task_execute_queue=1 clear bug + LUN_RESET OOPs
    [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release
    [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req
    [SCSI] target: Fix multi task->task_sg[] chaining logic bug

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
    x86/PCI/ACPI: fix type mismatch
    PCI: fix new kernel-doc warning
    PCI: Fix warning in drivers/pci/probe.c on sparc64

    Linus Torvalds
     
  • Signed-off-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     
  • while merging hid-stantum into hid-multitouch, I did not correctly copy/paste
    the VIDs for those devices. This patch fixes it.

    Signed-off-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     
  • In case a device does not provide the feature "Maximum Contact Count",
    or set it at 0, the maxcontacts field may be at 0 while calling
    input_mt_init_slots.

    This patch ensures that hid-multitouch will allways report
    ABS_MT_SLOT and ABS_MT_TRACKING_ID to the user space.

    This corrects a bug found with some Ilitek devices that has been
    integrated in 3.0-rc0.

    Signed-off-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Benjamin Tissoires
     
  • This patch enables support for Marvell IDE PATA controllers found on
    Asus P8P67LE motherboard.

    The formatting has been corrected and I also received a report from two
    users of this motherboard that the patch works.

    Signed-off-by: Paweł Drewniak
    Signed-off-by: Jeff Garzik

    Paweł Drewniak
     
  • A voltage value of 0xff01 requires that the driver
    look up the max voltage for the board based using the
    atom SetVoltage command table.

    Setting the proper voltage should fix stability on
    some newer asics.

    Signed-off-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • The field is encoded:
    0 = 4 banks
    1 = 8 banks
    2 = 16 banks

    Signed-off-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Alex Deucher
     
  • This patch fixes the following conversion specification warning for size_t

    drivers/target/tcm_fc/tfc_io.c: In function ‘ft_queue_data_in’:
    drivers/target/tcm_fc/tfc_io.c:209: warning: format ‘%x’ expects type ‘unsigned int’, but argument 5 has type ‘size_t’

    Reported-by: Randy Dunlap
    Reported-by: Stephen Rothwell
    Signed-off-by: Nicholas Bellinger

    Nicholas Bellinger
     
  • There is a typo here, it should be an unlock instead of a lock. The
    original code will deadlock.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Nicholas Bellinger

    Dan Carpenter
     
  • This patch fixes a bug in ft_send_tm() that was incorrectly calling
    ft_get_lun_for_cmd() -> transport_get_lun_for_cmd(), instead of using
    transport_get_lun_for_tmr() for the proper struct se_lun lookup
    that was triggering an OOPs in the se_cmd->tmr_req failure path.

    This patch fixes the issue by re-arranging the codepath where
    transport_get_lun_for_tmr() is called after tmr request is allocated and
    made it available as part of se_cmd.

    It also drops the now unnecessary ft_get_lun_for_cmd() unpacking code, and
    uses scsilun_to_int() directly ahead of transport_get_lun_for_cmd() and
    transport_get_lun_for_tmr() usage.

    Signed-off-by: Patil, Kiran
    Signed-off-by: Robert Love
    Signed-off-by: Nicholas A. Bellinger

    Kiran Patil
     
  • This patch fixes a number of cases in target core using an incorrectly

    if (strlen(foo) > SOME_MAX_SIZE)

    As strlen() returns the number of characters in the string not counting
    the NULL character at the end. So if you do something like:

    char buf[10];

    if (strlen("0123456789") > 10)
    return -ETOOLONG;
    snprintf(buf, 10, "0123456789");
    printf("%s\n", buf);

    then the last "9" gets chopped off and only "012345678" is printed.

    Plus I threw in one small related cleanup.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Nicholas Bellinger

    Dan Carpenter
     
  • In the original code, there were several places inside the
    target_fabric_configfs_init() function that returned NULL on error
    and one place the returned an ERR_PTR. There are two places that
    call this function and they only check for NULL returns; they don't
    check for ERR_PTRs. So I've changed the ERR_PTR so now the function
    only returns NULL on error.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Nicholas Bellinger

    Dan Carpenter
     
  • transport_init_session() and core_tmr_alloc_req() never return NULL,
    they only return ERR_PTRs on error.

    v2: Fix patch to return PTR_ERR(tl_nexus->se_sess) from Ankit Jain's
    feedback.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Ankit Jain
    Signed-off-by: Nicholas Bellinger

    Dan Carpenter
     
  • This patch converts transport_deregister_session_configfs() to save/restore
    spinlock IRQ state for struct se_node_acl->nacl_sess_lock access as tcm_qla2xxx
    logic expects to call transport_deregister_session_configfs() code with
    irq save already held for struct qla_hw_data.

    Reported-by: Roland Dreier
    Signed-off-by: Nicholas Bellinger

    Roland Dreier
     
  • This patch fixes two possible NULL pointer dereferences in target v4.0
    code where se_tmr release path in core_tmr_release_req() can OOPs upon
    transport_get_lun_for_tmr() failure by attempting to access se_device or
    se_tmr->tmr_list without a valid member of se_device->tmr_list during
    transport_free_se_cmd() release. This patch moves the se_tmr->tmr_dev
    pointer assignment in transport_get_lun_for_tmr() until after possible
    -ENODEV failures during unpacked_lun lookup.

    This addresses an OOPs originally reported with LIO v4.1 upstream on
    .39 code here:

    TARGET_CORE[qla2xxx]: Detected NON_EXISTENT_LUN Access for 0x00000000
    BUG: unable to handle kernel NULL pointer dereference at 0000000000000550
    IP: [] __ticket_spin_trylock+0x4/0x20
    PGD 0
    Oops: 0000 [#1] SMP
    last sysfs file: /sys/devices/system/cpu/cpu23/cache/index2/shared_cpu_map
    CPU 1
    Modules linked in: netconsole target_core_pscsi target_core_file
    tcm_qla2xxx target_core_iblock tcm_loop target_core_mod configfs
    ipmi_devintf ipmi_si ipmi_msghandler serio_raw i7core_edac ioatdma dca
    edac_core ps_bdrv ses enclosure usbhid usb_storage ahci qla2xxx hid
    uas e1000e mpt2sas libahci mlx4_core scsi_transport_fc
    scsi_transport_sas raid_class scsi_tgt [last unloaded: netconsole]

    Pid: 0, comm: kworker/0:0 Tainted: G W 2.6.39+ #1 Xyratex Storage Server
    RIP: 0010:[] []__ticket_spin_trylock+0x4/0x20
    RSP: 0018:ffff88063e803c08 EFLAGS: 00010286
    RAX: ffff880619ab45e0 RBX: 0000000000000550 RCX: 0000000000000000
    RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000550
    RBP: ffff88063e803c08 R08: 0000000000000002 R09: 0000000000000000
    R10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000568
    R13: 0000000000000001 R14: 0000000000000000 R15: ffff88060cd96a20
    FS: 0000000000000000(0000) GS:ffff88063e800000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 0000000000000550 CR3: 0000000001a03000 CR4: 00000000000006e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process kworker/0:0 (pid: 0, threadinfo ffff880619ab8000, task ffff880619ab45e0)
    Stack:
    ffff88063e803c28 ffffffff812cf039 0000000000000550 0000000000000568
    ffff88063e803c58 ffffffff8157071e ffffffffa028a1dc ffff88060f7e4600
    0000000000000550 ffff880616961480 ffff88063e803c78 ffffffffa028a1dc
    Call Trace:

    [] do_raw_spin_trylock+0x19/0x50
    [] _raw_spin_lock+0x3e/0x70
    [] ? core_tmr_release_req+0x2c/0x60 [target_core_mod]
    [] core_tmr_release_req+0x2c/0x60 [target_core_mod]
    [] transport_free_se_cmd+0x22/0x50 [target_core_mod]
    [] transport_release_cmd_to_pool+0x20/0x40 [target_core_mod]
    [] transport_generic_free_cmd+0xa5/0xb0 [target_core_mod]
    [] tcm_qla2xxx_handle_tmr+0xc4/0xd0 [tcm_qla2xxx]
    [] __qla24xx_handle_abts+0xd3/0x150 [qla2xxx]
    [] qla_tgt_response_pkt+0x171/0x520 [qla2xxx]
    [] qla_tgt_response_pkt_all_vps+0x2d/0x220 [qla2xxx]
    [] qla24xx_process_response_queue+0x1a3/0x670 [qla2xxx]
    [] ? qla24xx_atio_pkt+0x81/0x120 [qla2xxx]
    [] ? qla24xx_msix_default+0x45/0x2a0 [qla2xxx]
    [] qla24xx_msix_default+0x1b8/0x2a0 [qla2xxx]
    [] handle_irq_event_percpu+0x54/0x210
    [] handle_irq_event+0x48/0x70
    [] ? handle_edge_irq+0x1e/0x110
    [] handle_edge_irq+0x77/0x110
    [] handle_irq+0x22/0x40
    [] do_IRQ+0x5d/0xe0
    [] common_interrupt+0x13/0x13

    [] ? intel_idle+0xd7/0x130
    [] ? intel_idle+0xd0/0x130
    [] cpuidle_idle_call+0xab/0x1c0
    [] cpu_idle+0xab/0xf0
    [] start_secondary+0x1cb/0x1d2

    Reported-by: Roland Dreier
    Signed-off-by: Nicholas Bellinger

    Nicholas Bellinger
     
  • Now that the generic code handles UIE mode irqs via periodic
    alarm interrupts, no one calls the
    rtc_class_ops->update_irq_enable() method anymore.

    Further the rtc_class_ops doesn't have a update_irq_enable element
    anymore, so this causes a build error.

    This patch removes the driver hooks and implementations of
    update_irq_enable and the associated setup.

    [wsa: updated commit-message and removed update_irq_enable-function, too]
    [jstultz: improve commit message, clarifying build issue]
    Signed-off-by: Alexey Charkov
    Signed-off-by: Wolfram Sang
    Signed-off-by: John Stultz

    Alexey Charkov
     
  • On 16.06.2011 [08:28:39 -0500], Brian King wrote:
    > On 06/16/2011 02:51 AM, Tejun Heo wrote:
    > > On Wed, Jun 15, 2011 at 04:34:17PM -0700, Nishanth Aravamudan wrote:
    > >>> That looks like the right thing to do. For ipr's usage of
    > >>> libata, we don't have the concept of a port frozen state, so this flag
    > >>> should really never get set. The alternate way to fix this would be to
    > >>> only set ATA_PFLAG_FROZEN in ata_port_alloc if ap->ops->error_handler
    > >>> is not NULL.
    > >>
    > >> It seemed like ipr is as you say, but I wasn't sure if it was
    > >> appropriate to make the change above in the common libata-scis code or
    > >> not. I don't want to break some other device on accident.
    > >>
    > >> Also, I tried your suggestion, but I don't think that can happen in
    > >> ata_port_alloc? ata_port_alloc is allocated ap itself, and it seems like
    > >> ap->ops typically gets set only after ata_port_alloc returns?
    > >
    > > Maybe we can test error_handler in ata_sas_port_start()?
    >
    > Good point. Since libsas is converted to the new eh now, we would need to have
    > this test.

    Commit 7b3a24c57d2eeda8dba9c205342b12689c4679f9 ("ahci: don't enable
    port irq before handler is registered") caused a regression for CD-ROMs
    attached to the IPR SATA bus on Power machines:

    ata_port_alloc: ENTER
    ata_port_probe: ata1: bus probe begin
    ata1.00: ata_dev_read_id: ENTER
    ata1.00: failed to IDENTIFY (I/O error, err_mask=0x40)
    ata1.00: ata_dev_read_id: ENTER
    ata1.00: failed to IDENTIFY (I/O error, err_mask=0x40)
    ata1.00: limiting speed to UDMA7:PIO5
    ata1.00: ata_dev_read_id: ENTER
    ata1.00: failed to IDENTIFY (I/O error, err_mask=0x40)
    ata1.00: disabled
    ata_port_probe: ata1: bus probe end
    scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured

    The FROZEN flag added in that commit is only cleared by the new EH code,
    which is not used by ipr. Clear this flag in the SAS code if we don't
    support new EH.

    Reported-by: Benjamin Herrenschmidt
    Signed-off-by: Nishanth Aravamudan
    Signed-off-by: Jeff Garzik

    Nishanth Aravamudan
     
  • regardless of firmware revision

    It's unlikely NOSETXFER works for a revision of drive but doesn't for
    another and pioneer doesn't seem to be fixing firmwares for the
    affected drives. Apply NOSETXFER to the affected pioneer drives
    regardless of firmware revision.

    http://article.gmane.org/gmane.linux.ide/49734

    Signed-off-by: Tejun Heo
    Reported-by: fl-00@gmx.de
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • The patch below fixes a typo.

    Signed-off-by: Justin P. Mattock
    Signed-off-by: Jeff Garzik

    Justin P. Mattock
     

23 Jun, 2011

4 commits

  • The driver went to initialize its waitqueue at the start of the main
    processing thread. However, it is possible that this thread is not
    scheduled on a CPU before the write function is called which leads to a
    following error:

    BUG: spinlock bad magic on CPU#1, swapper/1
    lock: f5f3ebdc, .magic: 00000000, .owner: /-1, .owner_cpu: 0
    Pid: 1, comm: swapper Not tainted 3.0.0-rc2+ #67
    Call Trace:
    [] spin_bug+0xa3/0xf0
    [] do_raw_spin_lock+0x7d/0x150
    [] _raw_spin_lock_irqsave+0x4e/0x60
    [] __wake_up+0x1b/0x50
    [] serial_m3110_con_write+0x55/0x60
    [] __call_console_drivers+0x75/0x90
    [] _call_console_drivers+0x49/0x80
    [] console_unlock+0xca/0x1f0
    [] vprintk+0x18f/0x4f0
    [] printk+0x18/0x1a
    [] register_console+0x2e0/0x350
    [] uart_add_one_port+0x33e/0x3d0
    [] serial_m3110_probe+0x1c2/0x1df
    [] spi_drv_probe+0x17/0x20
    ...

    Fix this by initializing the waitqueue before the main thread is
    created.

    Signed-off-by: Mika Westerberg
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Mika Westerberg
     
  • Change print message to notice instead of error to clean up non critical
    messages showing on startup. The MAX3111 not being present is a normal
    path for end user systems.

    Signed-off-by: William Douglas
    [rebased on 3.0, switched to dev_dbg()]
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    William Douglas
     
  • * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
    PCI / PM: Block races between runtime PM and system sleep
    PM / Domains: Update documentation
    PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset
    PM: Fix async resume following suspend failure
    PM: Free memory bitmaps if opening /dev/snapshot fails
    PM: Rename dev_pm_info.in_suspend to is_prepared
    PM: Update documentation regarding sysdevs
    PM / Runtime: Update doc: usage count no longer incremented across system PM

    Linus Torvalds
     
  • The lock must be held for the saving and restoring of VGA state.

    Signed-off-by: Ben Widawsky
    CC: Alexander Zhaunerchyk
    CC: Andrey Rahmatullin
    Reviewed-by: Chris Wilson
    Signed-off-by: Keith Packard

    Ben Widawsky
     

22 Jun, 2011

8 commits

  • After commit e8665002477f0278f84f898145b1f141ba26ee26
    (PM: Allow pm_runtime_suspend() to succeed during system suspend) it
    is possible that a device resumed by the pm_runtime_resume(dev) in
    pci_pm_prepare() will be suspended immediately from a work item,
    timer function or otherwise, defeating the very purpose of calling
    pm_runtime_resume(dev) from there. To prevent that from happening
    it is necessary to increment the runtime PM usage counter of the
    device by replacing pm_runtime_resume() with pm_runtime_get_sync().
    Moreover, the incremented runtime PM usage counter has to be
    decremented by the corresponding pci_pm_complete(), via
    pm_runtime_put_sync().

    Signed-off-by: Rafael J. Wysocki
    Cc: stable@kernel.org
    Acked-by: Jesse Barnes

    Rafael J. Wysocki
     
  • Commit 85eb8c8d0b0900c073b0e6f89979ac9c439ade1a (PM / Runtime:
    Generic clock manipulation rountines for runtime PM (v6)) converted
    the shmobile platform to using generic code for runtime PM clock
    management, but it changed the behavior for CONFIG_PM_RUNTIME unset
    incorrectly.

    Specifically, for CONFIG_PM_RUNTIME unset pm_runtime_clk_notify()
    should enable clocks for action equal to BUS_NOTIFY_BIND_DRIVER and
    it should disable them for action equal to BUS_NOTIFY_UNBOUND_DRIVER
    (instead of BUS_NOTIFY_ADD_DEVICE and BUS_NOTIFY_DEL_DEVICE,
    respectively). Make this function behave as appropriate.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Magnus Damm

    Rafael J. Wysocki
     
  • The PM core doesn't handle suspend failures correctly when it comes to
    asynchronously suspended devices. These devices are moved onto the
    dpm_suspended_list as soon as the corresponding async thread is
    started up, and they remain on the list even if they fail to suspend
    or the sleep transition is cancelled before they get suspended. As a
    result, when the PM core unwinds the transition, it tries to resume
    the devices even though they were never suspended.

    This patch (as1474) fixes the problem by adding a new "is_suspended"
    flag to dev_pm_info. Devices are resumed only if the flag is set.

    [rjw:
    * Moved the dev->power.is_suspended check into device_resume(),
    because we need to complete dev->power.completion and clear
    dev->power.is_prepared too for devices whose
    dev->power.is_suspended flags are unset.
    * Fixed __device_suspend() to avoid setting dev->power.is_suspended
    if async_error is different from zero.]

    Signed-off-by: Alan Stern
    Signed-off-by: Rafael J. Wysocki
    Cc: stable@kernel.org

    Alan Stern
     
  • This patch (as1473) renames the "in_suspend" field in struct
    dev_pm_info to "is_prepared", in preparation for an upcoming change.
    The new name is more descriptive of what the field really means.

    Signed-off-by: Alan Stern
    Signed-off-by: Rafael J. Wysocki
    Cc: stable@kernel.org

    Alan Stern
     
  • This reverts commit 4a684a4117abd756291969336af454e8a958802f.
    Userland has always been required to set the object's domain to GTT
    before using it through a GTT mapping, it's not something that the
    kernel is supposed to enforce. (The pagefault support is so that we
    can handle multiple mappings without userland having to pin across
    them, not so that userland can use GTT after GPU domains without
    telling the kernel).

    Fixes 19.2% +/- 0.8% (n=6) performance regression in cairo-gl
    firefox-talos-gfx on my T420 latop.

    Signed-off-by: Keith Packard

    Eric Anholt
     
  • ...we need to apply exactly the same workaround for missing interrupts
    from BSD as for the BLT ring, apparently.

    See also commit 498e720b96379d8ee9c294950a01534a73defcf3
    (drm/i915: Fix gen6 (SNB) missed BLT ring interrupts).

    Reported-and-tested-by: nkalkhof@web.de
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38529
    Signed-off-by: Chris Wilson
    Signed-off-by: Keith Packard

    Chris Wilson
     
  • This change got placed in the ironlake path instead of the 9xx path
    during a recent code shuffle.

    Signed-off-by: Keith Packard

    Keith Packard
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
    IB/qib: Ensure that LOS and DFE are being turned off
    RDMA/cxgb4: Couple of abort fixes
    RDMA/cxgb4: Don't truncate MR lengths
    RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs

    Linus Torvalds
     

21 Jun, 2011

2 commits

  • * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm/radeon/kms/r6xx+: voltage fixes
    drm/nouveau: drop leftover debugging
    drm/radeon: avoid warnings from r600/eg irq handlers on powered off card.
    drm/radeon/kms: add missing param for dce3.2 DP transmitter setup
    drm/radeon/kms/atom: fix duallink on some early DCE3.2 cards
    drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync
    drm/nv50/disp: fix gamma with page flipping overlay turned on
    drm/nouveau/pm: Prevent overflow in nouveau_perf_init()
    drm/nouveau: fix big-endian switch

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
    pxa168_eth: fix race in transmit path.
    ipv4, ping: Remove duplicate icmp.h include
    netxen: fix race in skb->len access
    sgi-xp: fix a use after free
    hp100: fix an skb->len race
    netpoll: copy dev name of slaves to struct netpoll
    ipv4: fix multicast losses
    r8169: fix static initializers.
    inet_diag: fix inet_diag_bc_audit()
    gigaset: call module_put before restart of if_open()
    farsync: add module_put to error path in fst_open()
    net: rfs: enable RFS before first data packet is received
    fs_enet: fix freescale FCC ethernet dp buffer alignment
    netdev: bfin_mac: fix memory leak when freeing dma descriptors
    vlan: don't call ndo_vlan_rx_register on hardware that doesn't have vlan support
    caif: Bugfix - XOFF removed channel from caif-mux
    tun: teach the tun/tap driver to support netpoll
    dp83640: drop PHY status frames in the driver.
    dp83640: fix phy status frame event parsing
    phylib: Allow BCM63XX PHY to be selected only on BCM63XX.
    ...

    Linus Torvalds