Update to UBUNTU: Ubuntu-azure-5.4.0-1085.90

[grwilson]

Resolve merge conflict:

diff --cc fs/nfsd/filecache.c
index 79ad6b2c9608,d88313196a90..000000000000
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@@ -645,12 -579,8 +645,12 @@@ nfsd_file_cache_init(void
  	if (nfsd_file_hashtbl)
  		return 0;

 +	nfsd_filecache_wq = alloc_workqueue("nfsd_filecache", 0, 0);
 +	if (!nfsd_filecache_wq)
 +		goto out;
 +
- 	nfsd_file_hashtbl = kcalloc(NFSD_FILE_HASH_SIZE,
- 				sizeof(*nfsd_file_hashtbl), GFP_KERNEL);
+ 	nfsd_file_hashtbl = kvzalloc(array_size(NFSD_FILE_HASH_SIZE,
+ 				sizeof(*nfsd_file_hashtbl)), GFP_KERNEL);
  	if (!nfsd_file_hashtbl) {
  		pr_err("nfsd: unable to allocate nfsd_file_hashtbl\n");
  		goto out_err;
@@@ -716,10 -646,8 +716,10 @@@ out_err
  	nfsd_file_slab = NULL;
  	kmem_cache_destroy(nfsd_file_mark_slab);
  	nfsd_file_mark_slab = NULL;
- 	kfree(nfsd_file_hashtbl);
+ 	kvfree(nfsd_file_hashtbl);
  	nfsd_file_hashtbl = NULL;
 +	destroy_workqueue(nfsd_filecache_wq);
 +	nfsd_filecache_wq = NULL;
  	goto out;
  }

@@@ -864,10 -710,8 +864,10 @@@ nfsd_file_cache_shutdown(void
  	fsnotify_wait_marks_destroyed();
  	kmem_cache_destroy(nfsd_file_mark_slab);
  	nfsd_file_mark_slab = NULL;
- 	kfree(nfsd_file_hashtbl);
+ 	kvfree(nfsd_file_hashtbl);
  	nfsd_file_hashtbl = NULL;
 +	destroy_workqueue(nfsd_filecache_wq);
 +	nfsd_filecache_wq = NULL;
  }

[grwilson]

ab-pre-push: http://selfservice.jenkins.delphix.com/job/appliance-build-orchestrator-pre-push/2308/