1. 29 Jun, 2009 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight · 1bfd4d58
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
        backlight: Fix tdo24m crash on kmalloc
      1bfd4d58
    • Ingo Molnar's avatar
      eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS · 44b3615b
      Ingo Molnar authored
      FYI, there's a post-rc1 build regression with certain configs:
      
       drivers/built-in.o: In function `pci_hp_deregister':
       (.text+0xb166): undefined reference to `pci_hp_remove_module_link'
       drivers/built-in.o: In function `pci_hp_deregister':
       (.text+0xb19f): undefined reference to `pci_destroy_slot'
       drivers/built-in.o: In function `__pci_hp_register':
       (.text+0xb583): undefined reference to `pci_create_slot'
       drivers/built-in.o: In function `__pci_hp_register':
       (.text+0xb5b1): undefined reference to `pci_hp_create_module_link'
       make: *** [.tmp_vmlinux1] Error 1
      
      Caused by:
      
      | 2b121bc2 is first bad commit
      | commit 2b121bc2
      | Date:   Thu Jun 25 13:25:36 2009 +0200
      |
      |     eeepc-laptop: Register as a pci-hotplug device
      
      which changed the driver to use the PCI hotplug infrastructure, but
      didn't do a good job on the Kconfig rules.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Acked-by: default avatarLen Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      44b3615b
    • Alan Cox's avatar
      tty: Fix the leak in tty_ldisc_release · aef29bc2
      Alan Cox authored
      Currently we reinit the ldisc on final tty close which is what the old code
      did to ensure that if the device retained its termios settings then it had the
      right ldisc. tty_ldisc_reinit does that but also leaves us with the reset
      ldisc reference which is then leaked.
      
      At this point we know the port will be recycled so we can kill the ldisc
      off completely rather than try and add another ldisc free up when the kref
      count hits zero.
      
      At this point it is safe to keep the ldisc closed as tty_ldisc waiting
      methods are only used from the user side, and as the final close we are
      the last such reference. Interrupt/driver side methods will always use the
      non wait version and get back a NULL.
      
      Found with kmemleak and investigated/identified by Catalin Marinas.
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      aef29bc2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 52989765
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        be2net: Fix to avoid a crash seen on PPC with LRO and Jumbo frames.
        gro: Flush GRO packets in napi_disable_pending path
        inet: Call skb_orphan before tproxy activates
        mac80211: Use rcu_barrier() on unload.
        sunrpc: Use rcu_barrier() on unload.
        bridge: Use rcu_barrier() instead of syncronize_net() on unload.
        ipv6: Use rcu_barrier() on module unload.
        decnet: Use rcu_barrier() on module unload.
        sky2: Fix checksum endianness
        mdio add missing GPL flag
        sh_eth: remove redundant test on unsigned
        fsl_pq_mdio: Fix fsl_pq_mdio to work with modules
        ipv6: avoid wraparound for expired preferred lifetime
        tcp: missing check ACK flag of received segment in FIN-WAIT-2 state
        atl1*: add device_set_wakeup_enable to atl1*_set_wol
        Phonet: generate Netlink RTM_DELADDR when destroying a device
        Phonet: publicize the Netlink notification function
        Revert "veth: prevent oops caused by netdev destructor"
        cpmac: fix compilation failure introduced with netdev_ops conversion
        ipsec: Fix name of CAST algorithm
      52989765
    • Ajit Khaparde's avatar
      be2net: Fix to avoid a crash seen on PPC with LRO and Jumbo frames. · bd46cb6c
      Ajit Khaparde authored
      While testing the driver on PPC, we ran into a crash with LRO, Jumbo frames.
      With CONFIG_PPC_64K_PAGES configured (a default in PPC), MAX_SKB_FRAGS drops to 3 and we were crossing the array limits on skb_shinfo(skb)->frags[].
      Now we coalesce the frags from the same physical page into one slot in
      skb_shinfo(skb)->frags[] and go to the next index when the frag is from
      
      different physical page.
      
      This patch is against the net-2.6 tree.
      Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bd46cb6c
  2. 28 Jun, 2009 16 commits
  3. 27 Jun, 2009 3 commits
  4. 26 Jun, 2009 16 commits