1. 25 Jul, 2007 33 commits
  2. 24 Jul, 2007 7 commits
    • Jens Axboe's avatar
      ocfs2: bad kunmap_atomic() · 3836df6b
      Jens Axboe authored
      kunmap_atomic() takes the virtual address, not the mapped page as
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      Cc: Mark Fasheh <mark.fasheh@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 2f66b529
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
        [MIPS] ARC: Remove unused arch/mips/arc/console.c
        [MIPS] SNI: sniprom
        [MIPS] Jazz: remove unneeded reset functions
        [MIPS] Whitespace cleanup.
        [MIPS] Make resources for ds1742 "static __initdata"
        [MIPS] Replace __attribute_used__ with __used
        [MIPS] Jazz: Remove unused arch/mips/jazz/io.c
        [MIPS] Mark prom_free_prom_memory as __init_refok
        [MIPS] MIPSsim: Fix cflags
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 1e66239e
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_hpt37x: Fix 2.6.22 clock PLL regression
        pata_ali: Correct HP detect
        ata_piix: fix suspend/resume for some TOSHIBA laptops
        PCI: export __pci_reenable_device()
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 7742c0bc
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (26 commits)
        netdev: i82596 Ethernet needs <asm/cacheflush.h>
        forcedeth: mcp73 device addition
        forcedeth: new device ids in pci_ids.h
        atl1: make atl1_init_ring_ptrs static
        eHEA: net_poll support
        drivers/net/acenic.c: fix check-after-use
        defxx: Use __maybe_unused rather than a local hack
        Fix error checking in Vitesse IRQ config
        ps3: reduce allocation size of rx skb buffers
        atl1: use kernel provided ethernet length constants
        atl1: fix typo in dma_req_block
        atl1: change cmb write threshold
        atl1: fix typo in DMA engine setup
        atl1: change tpd_avail function name
        ps3: fix rare issue that reenabling rx DMA fails
        ps3: removed calling netif_poll_enable() in open()
        ps3: use ethX as the name of irq
        ps3: use net_device_stats of net_device structure
        ps3: removed conditional ethtool support
        ps3: removed defines no longer used
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 9e72ea82
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok
        [SPARC32]: Fix bug in sparc optimized memset.
        [SPARC64]: Update defconfig.
        [SPARC]: Add missing NOTES section.
        [SPARC32]: missing exports
        [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 03746bad
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [8021Q]: vlan_ioctl_handler: fix return value
        [GENETLINK]: Correctly report errors while registering a multicast group
        [GENETLINK]: Fix adjustment of number of multicast groups
        [GENETLINK]: Fix race in genl_unregister_mc_groups()
        [NETFILTER]: Clean up duplicate includes in net/netfilter/
        [NETFILTER]: Clean up duplicate includes in net/bridge/
        [NETFILTER]: Fix logging regression
        [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic.
    • Andrew Morton's avatar
      [8021Q]: vlan_ioctl_handler: fix return value · 3f5f4346
      Andrew Morton authored
      net/8021q/vlan.c: In function 'vlan_ioctl_handler':
      net/8021q/vlan.c:700: warning: 'err' may be used uninitialized in this function
      The warning is incorrect, but from my reading this ioctl will return -EINVAL
      on success.
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>