29 Oct, 2009

15 commits


24 Oct, 2009

1 commit


16 Oct, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
    vmxnet: fix 2 build problems
    net: add support for STMicroelectronics Ethernet controllers.
    net: ks8851_mll uses mii interfaces
    net/fec_mpc52xx: Fix kernel panic on FEC error
    net: Fix OF platform drivers coldplug/hotplug when compiled as modules
    TI DaVinci EMAC: Clear statistics register properly.
    r8169: partial support and phy init for the 8168d
    irda/sa1100_ir: check return value of startup hook
    udp: Fix udp_poll() and ioctl()
    WAN: fix Cisco HDLC handshaking.
    tcp: fix tcp_defer_accept to consider the timeout
    3c574_cs: spin_lock the set_multicast_list function
    net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs
    netxen: fix pci bar mapping
    ethoc: fix warning from 32bit build
    libertas: fix build
    net: VMware virtual Ethernet NIC driver: vmxnet3
    net: Fix IXP 2000 network driver building.
    libertas: fix build
    mac80211: document ieee80211_rx() context requirement
    ...

    Linus Torvalds
     

15 Oct, 2009

2 commits


13 Oct, 2009

2 commits

  • Add file patterns that match relevant files for this subsystem.

    Signed-off-by: Vincent Legoll
    Cc: Linus Torvalds
    Cc: paulus@samba.org
    Cc: a.p.zijlstra@chello.nl
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Vincent Legoll
     
  • Ethernet NIC driver for VMware's vmxnet3

    From: Shreyas Bhatewara

    This patch adds driver support for VMware's virtual Ethernet NIC: vmxnet3
    Guests running on VMware hypervisors supporting vmxnet3 device will thus have
    access to improved network functionalities and performance.

    Signed-off-by: Shreyas Bhatewara
    Signed-off-by: Bhavesh Davda
    Signed-off-by: Ronghua Zhang
    Signed-off-by: David S. Miller

    Shreyas Bhatewara
     

12 Oct, 2009

4 commits

  • Russell King
     
  • Signed-off-by: David S. Miller

    Eric Dumazet
     
  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    hwmon: (s3c-hwmon) Disable build for S3C64xx
    MAINTAINERS: Fix Riku Voipio's address
    hwmon: (asus_atk0110) Enable the EC
    hwmon: (asus_atk0110) Refactor the code
    hwmon: (sht15) Fix spurious section mismatch warning

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
    [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
    [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
    [SCSI] be2iscsi: Moving to pci_pools v3
    [SCSI] libiscsi: iscsi_session_setup to allow for private space
    [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
    [SCSI] zfcp: Fix hang when offlining device with offline chpid
    [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
    [SCSI] zfcp: Fix oops during shutdown of offline device
    [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
    [SCSI] zfcp: correctly initialize unchained requests
    [SCSI] mpt2sas: Bump version 02.100.03.00
    [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
    [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
    [SCSI] mpt2sas: Call init_completion on a per request basis.
    [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
    [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
    [SCSI] mpt2sas: Copyright change to 2009.
    [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
    [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
    [SCSI] bfa: Brocade BFA FC SCSI driver
    ...

    Linus Torvalds
     

10 Oct, 2009

1 commit


09 Oct, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)
    ethoc: limit the number of buffers to 128
    ethoc: use system memory as buffer
    ethoc: align received packet to make IP header at word boundary
    ethoc: fix buffer address mapping
    ethoc: fix typo to compute number of tx descriptors
    au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats()
    netxen: Fix Unlikely(x) > y
    pasemi_mac: ethtool get settings fix
    add maintainer for network drop monitor kernel service
    tg3: Fix phylib locking strategy
    rndis_host: support ETHTOOL_GPERMADDR
    ipv4: arp_notify address list bug
    gigaset: add kerneldoc comments
    gigaset: correct debugging output selection
    gigaset: improve error recovery
    gigaset: fix device ERROR response handling
    gigaset: announce if built with debugging
    gigaset: handle isoc frame errors more gracefully
    gigaset: linearize skb
    gigaset: fix reject/hangup handling
    ...

    Linus Torvalds
     

08 Oct, 2009

2 commits

  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
    agp: parisc-agp.c - use correct page_mask function
    parisc: Fix linker script breakage.
    parisc: convert to asm-generic/hardirq.h
    parisc: Make THREAD_SIZE available to assembly files and linker scripts.
    parisc: correct use of SHF_ALLOC
    parisc: rename parisc's vmalloc_start to parisc_vmalloc_start
    parisc: add me to Maintainers
    parisc: includecheck fix: signal.c
    parisc: HAVE_ARCH_TRACEHOOK
    parisc: add skeleton syscall.h
    parisc: stop using task->ptrace for {single,block}step flags
    parisc: split syscall_trace into two halves
    parisc: add missing TI_TASK macro in syscall.S
    parisc: tracehook_signal_handler
    parisc: tracehook_report_syscall

    Linus Torvalds
     
  • Add the file pattern of drivers/ieee1394/init_ohci1394_dma.c's
    documentation to the maintainers database. init_ohci1394_dma.c is not
    really part of the IEEE 1394 subsystem, but this maintainers contact
    seems to be better than none at all.

    Signed-off-by: Stefan Richter

    Stefan Richter
     

07 Oct, 2009

2 commits


05 Oct, 2009

1 commit


03 Oct, 2009

2 commits

  • * master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits)
    ARM: 5728/1: Proper prefetch abort handling on ARMv6 and ARMv7
    ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()
    ARM: 5740/1: fix valid_phys_addr_range() range check
    ARM: 5739/1: ARM: allow empty ATAG_CORE
    ARM: 5735/1: sa1111: CodingStyle cleanups
    ARM: 5738/1: Correct TCM documentation
    ARM: 5734/1: arm: fix compilation of entry-common.S for older CPUs
    ARM: 5733/1: fix bcmring compile error
    ARM: 5732/1: remove redundant include file
    ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3
    ARM: Ensure do_cache_op takes mmap_sem
    ARM: Fix __cpuexit section mismatch warnings
    ARM: Don't allow highmem on SMP platforms without h/w TLB ops broadcast
    ARM: includecheck fix: mach-davinci, board-dm365-evm.c
    ARM: Remove unused CONFIG SA1100_H3XXX
    ARM: Fix warning: unused variable 'highmem'
    ARM: Fix warning: #warning syscall migrate_pages not implemented
    ARM: Fix SA11x0 clocksource warning
    ARM: Fix SA1100 Neponset serial section mismatch
    ARM: Fix SA1100 Assabet/Neponset PCMCIA section mismatch warnings
    ...

    Linus Torvalds
     
  • Conflicts:
    MAINTAINERS

    Russell King
     

02 Oct, 2009

3 commits


28 Sep, 2009

1 commit

  • It has been suggested that given my proficiency with less popular
    architectures, I should be officially listed as willing to see to the
    care and feeding of this one.

    Signed-off-by: James Bottomley
    Signed-off-by: Kyle McMartin

    James Bottomley
     

25 Sep, 2009

2 commits

  • Conflicts:
    MAINTAINERS

    Russell King
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
    x86/PCI: make 32 bit NUMA node array int, not unsigned char
    x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
    MAINTAINTERS: remove hotplug driver entries
    PCI: pciehp: remove slot capabilities definitions
    PCI: pciehp: remove error message definitions
    PCI: pciehp: remove number field
    PCI: pciehp: remove hpc_ops
    PCI: pciehp: remove pci_dev field
    PCI: pciehp: remove crit_sect mutex
    PCI: pciehp: remove slot_bus field
    PCI: pciehp: remove first_slot field
    PCI: pciehp: remove slot_device_offset field
    PCI: pciehp: remove hp_slot field
    PCI: pciehp: remove device field
    PCI: pciehp: remove bus field
    PCI: pciehp: remove slot_num_inc field
    PCI: pciehp: remove num_slots field
    PCI: pciehp: remove slot_list field
    PCI: fix VGA arbiter header file
    PCI: Disable AER with pci=nomsi
    ...

    Fixed up trivial conflicts in MAINTAINERS

    Linus Torvalds