1. 28 Jan, 2009 30 commits
  2. 27 Jan, 2009 1 commit
  3. 26 Jan, 2009 9 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 53760710
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
        [ARM] fix section-based ioremap
        [NET] am79c961a: fix spin_lock usage
        [ARM] omap: usb: thou shalt not provide empty release functions
        [ARM] omap: watchdog: allow OMAP watchdog driver on OMAP34xx platforms
        [ARM] 5369/1: omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
        [ARM] clkdev: fix clock matching
        [ARM] 5370/1: at91: fix rm9200 watchdog
        [ARM] 5368/1: arch/arm/mach-davinci/usb.c buildfix
        [ARM] 5365/1: s3cmci: Use new include path of dma.h
        [ARM] fix StrongARM-11x0 page copy implementation
        [ARM] omap: ensure OMAP drivers pass a struct device to clk_get()
        ARM: OMAP: Fix compile for h3 MMC
        ARM: OMAP: Remove unused platform devices, v3
        ARM: OMAP: Fix ASoC by enabling writes to XCCR and RCCR McBSP registers, v3
        ARM: OMAP: Fix OSK ASoC by registering I2C board info for tlvaic23
        ARM: OMAP: remove duplicated #include's
        ARM: OMAP: Fix DMA CCR programming for request line > 63, v3
        ARM: OMAP: Fix gpio.c compile on 15xx with CONFIG_DEBUGFS
        ARM: OMAP: Fix compile for beagle
        ARM: OMAP: Fix gpio by switching to generic gpio calls, v2
        ...
      53760710
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · cfb901bf
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Warn on deprecated binding model use
        eeprom: More consistent symbol names
        eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom
        spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom
        i2c: Move old eeprom driver to /drivers/misc/eeprom
        i2c: Move at24 to drivers/misc/eeprom
        i2c: Quilt tree has moved
        i2c: Delete many unused adapter IDs
        i2c: Delete 10 unused driver IDs
      cfb901bf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 2034563c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild: fix kbuild.txt typos
        kbuild: print usage with no arguments in scripts/config
        Revert "kbuild: strip generated symbols from *.ko"
      2034563c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 924d26df
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (92 commits)
        gianfar: Revive VLAN support
        vlan: Export symbols as non GPL symbols.
        bnx2x: tx_has_work should not wait for FW
        netxen: reduce memory footprint
        netxen: fix vlan tso/checksum offload
        net: Fix linux/if_frad.h's suitability for userspace.
        net: Move config NET_NS to from net/Kconfig to init/Kconfig
        isdn: Fix missing ifdef in isdn_ppp
        networking: document "nc" in addition to "netcat" in netconsole.txt
        e1000e: workaround hw errata
        af_key: initialize xfrm encap_oa
        virtio_net: Fix MAX_PACKET_LEN to support 802.1Q VLANs
        lcs: fix compilation for !CONFIG_IP_MULTICAST
        rtl8187: Add termination packet to prevent stall
        iwlwifi: fix rs_get_rate WARN_ON()
        p54usb: fix packet loss with first generation devices
        sctp: Fix another socket race during accept/peeloff
        sctp: Properly timestamp outgoing data chunks for rtx purposes
        sctp: Correctly start rtx timer on new packet transmissions.
        sctp: Fix crc32c calculations on big-endian arhes.
        ...
      924d26df
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · 66673f13
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc64: Fix DAX handling via userspace access from kernel.
        sparc64: Annotate sparc64 specific syscalls with SYSCALL_DEFINEx()
        [CVE-2009-0029] sparc: Enable syscall wrappers for 64-bit
        sparc64: Initialize FHC/CLOCK LED platform_device 'id' field correctly.
        sparc64: fix modpost failure
        sparc64: fix readout of cpu/fpu type
      66673f13
    • Anton Vorontsov's avatar
      gianfar: Revive VLAN support · cd1f55a5
      Anton Vorontsov authored
      commit 77ecaf2d ("gianfar: Fix VLAN
      HW feature related frame/buffer size calculation") wrongly removed
      priv->vlgrp assignment, and now priv->vlgrp is always NULL.
      
      This patch fixes the issue, plus fixes following sparse warning
      introduced by the same commit:
      gianfar.c:1406:13: warning: context imbalance in 'gfar_vlan_rx_register' - wrong count at exit
      
      gfar_vlan_rx_register() checks for "if (old_grp == grp)" and tries
      to return w/o dropping the lock.
      
      According to net/8021q/vlan.c VLAN core issues rx_register() callback:
      1. In register_vlan_dev() only on a newly created group;
      2. In unregister_vlan_dev() only if the group becomes empty.
      
      Thus the check in the gianfar driver isn't needed.
      Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
      Acked-by: default avatarAndy Fleming <afleming@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cd1f55a5
    • Ben Greear's avatar
      vlan: Export symbols as non GPL symbols. · 116cb428
      Ben Greear authored
      In previous kernels, any kernel module could get access to the
      'real-device' and the VLAN-ID for a particular VLAN.  In more recent
      kernels, the code was restructured such that this is hard to do
      without accessing private .h files for any module that cannot use
      GPL-only symbols.
      
      Attached is a patch to once again allow non-GPL modules the ability to
      access the real-device and VLAN id for VLANs.
      Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
      Acked-by: default avatarPatrick McHardy <kaber@trash.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      116cb428
    • Vladislav Zolotarov's avatar
      bnx2x: tx_has_work should not wait for FW · e8b5fc51
      Vladislav Zolotarov authored
      The current tx_has_work waited until all packets sent by the driver
      are marked as completed by the FW. This is too greedy and it causes
      the bnx2x_poll to spin in vain. The driver should only check that all
      packets FW already completed are freed - only in unload flow the
      driver should make sure that transmit queue is empty
      Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
      Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e8b5fc51
    • Dhananjay Phadke's avatar
      netxen: reduce memory footprint · 32ec8033
      Dhananjay Phadke authored
      o reduce rx ring size from 8192 to 4096.
      o cut down old huge lro buffers.
      Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32ec8033