From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Aug 2010 19:54:46 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: upstream/snapshot3+hdmi~13721
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fc7995d19139d6f99203b43c161968f3f554a15;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* 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
---

1fc7995d19139d6f99203b43c161968f3f554a15
diff --cc fs/cifs/cifsfs.c
index 5ac541a,2a0c892..a5ed10c
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -934,22 -933,18 +933,13 @@@ init_cifs(void
  	if (rc)
  		goto out_unregister_filesystem;
  #endif
- #ifdef CONFIG_CIFS_DFS_UPCALL
- 	rc = cifs_init_dns_resolver();
 -	rc = slow_work_register_user(THIS_MODULE);
--	if (rc)
--		goto out_unregister_key_type;
- #endif
  
  	return 0;
  
- #ifdef CONFIG_CIFS_DFS_UPCALL
-- out_unregister_key_type:
- #endif
  #ifdef CONFIG_CIFS_UPCALL
--	unregister_key_type(&cifs_spnego_key_type);
   out_unregister_filesystem:
--#endif
  	unregister_filesystem(&cifs_fs_type);
++#endif
   out_destroy_request_bufs:
  	cifs_destroy_request_bufs();
   out_destroy_mids: