• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 1fc7995d
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [DNS RESOLVER] Minor typo correction
      DNS: Fixes for the DNS query module
      cifs: Include linux/err.h for IS_ERR and PTR_ERR
      DNS: Make AFS go to the DNS for AFSDB records for unknown cells
      DNS: Separate out CIFS DNS Resolver code
      cifs: account for new creduid=0x%x parameter in spnego upcall string
      cifs: reduce false positives with inode aliasing serverino autodisable
      CIFS: Make cifs_convert_address() take a const src pointer and a length
      cifs: show features compiled in as part of DebugData
      cifs: update README
    
    Fix up trivial conflicts in fs/cifs/cifsfs.c due to workqueue changes
    1fc7995d
Kconfig 6.58 KB