25 Sep, 2006

3 commits


24 Sep, 2006

12 commits

  • * git://git.infradead.org/mtd-2.6:
    [MTD] Whitespace cleanup in SSFDC driver.
    [MTD] SSFDC translation layer minor cleanup
    [MTD] Fix dependencies with CONFIG_MTD=m

    Linus Torvalds
     
  • * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
    [ALSA] intel8x0m - Free irq in suspend
    [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
    [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
    [ALSA] ES1938: remove duplicate field initialization
    [ALSA] usb-audio: increase number of packets per URB
    [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
    [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
    [ALSA] hda-codec - Fix mic input with STAC92xx codecs
    [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
    [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
    [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
    [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
    [ALSA] hda-codec - Support multiple headphone pins
    [ALSA] hda_intel prefer 24bit instead of 20bit
    [ALSA] hda-codec - Add vendor ids for Motorola and Conexant
    [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
    [ALSA] Add missing compat ioctls for ALSA control API
    [ALSA] powermac - Fix Oops when conflicting with aoa driver
    [ALSA] aoa: add locking to tas codec
    [ALSA] hda-intel - Fix suspend/resume with MSI
    ...

    Linus Torvalds
     
  • * git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
    NFS: unmark NFS direct I/O as experimental
    NFS: add comments clarifying the use of nfs_post_op_update()
    NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
    NFS: Use SEEK_END instead of hardcoded value
    NFSv4: When mounting with a port=0 argument, substitute port=2049
    NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
    NFSv4: Handle the condition NFS4ERR_FILE_OPEN
    NFSv4: Retry lease recovery if it failed during a synchronous operation.
    NFS: Don't invalidate the symlink we just stuffed into the cache
    NFS: Make read() return an ESTALE if the file has been deleted
    NFSv4: It's perfectly legal for clp to be NULL here....
    NFS: nfs_lookup - don't hash dentry when optimising away the lookup
    SUNRPC: Fix Oops in pmap_getport_done
    SUNRPC: Add refcounting to the struct rpc_xprt
    SUNRPC: Clean up soft task error handling
    SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
    SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
    Fix a referral error Oops
    NFS: NFS_ROOT should use the new rpc_create API
    NFS: Fix up compiler warnings on 64-bit platforms in client.c
    ...

    Manually resolved conflict in net/sunrpc/xprtsock.c

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
    [IPV6] ADDRCONF: Mobile IPv6 Home Address support.
    [IPV6] ADDRCONF: Allow non-DAD'able addresses.
    [IPV6] NDISC: Fix is_router flag setting.
    [IPV6] ADDRCONF: Convert addrconf_lock to RCU.
    [IPV6] NDISC: Add proxy_ndp sysctl.
    [IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
    [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
    [IPV6]: Don't forward packets to proxied link-local address.
    [IPV6] NDISC: Handle NDP messages to proxied addresses.
    [NETFILTER]: PPTP conntrack: fix another GRE keymap leak
    [NETFILTER]: PPTP conntrack: fix GRE keymap leak
    [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
    [NETFILTER]: PPTP conntrack: check call ID before changing state
    [NETFILTER]: PPTP conntrack: clean up debugging cruft
    [NETFILTER]: PPTP conntrack: consolidate header parsing
    [NETFILTER]: PPTP conntrack: consolidate header size checks
    [NETFILTER]: PPTP conntrack: simplify expectation handling
    [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
    [NETFILTER]: PPTP conntrack: fix header definitions
    [NETFILTER]: PPTP conntrack: remove more dead code
    ...

    Linus Torvalds
     
  • The error return values are truncated by unlikely so we need to
    save it first. Thanks to Kyle Moffett for spotting this.

    Signed-off-by: Herbert Xu
    Signed-off-by: Linus Torvalds

    Herbert Xu
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • annotated, fixed a roothole in ->write(). Dereferencing user-supplied pointer
    is a Bad Idea(tm)...

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • #elif CONFIG_44x
    in ibm4xx.h should've been
    #elif defined(CONFIG_44x)

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • indirect chains of includes are arch-specific and can't
    be relied upon... (hell, even attempt to build it for
    itanic would trigger vmalloc.h ones; err.h triggers
    on e.g. alpha).

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • The crypto_hash_update call in hmac_init gave the number 1
    instead of the length of the sg list in bytes. This is a
    missed conversion from the digest => hash change.

    As tcrypt only tests crypto_hash_digest it didn't catch this.

    Signed-off-by: Herbert Xu
    Signed-off-by: Linus Torvalds

    Herbert Xu
     
  • Signed-off-by: David S. Miller
    Signed-off-by: Linus Torvalds

    David Miller
     

23 Sep, 2006

25 commits