linux-next: duplicate patch in the crypto tree

[Stephen Rothwell]

Hi all,

The following commit is also in the crypto-current tree as a different
commit (but the same patch):

  6100da511bd2 ("crypto: lib/mpi - Fix an "Uninitialized scalar variable" issue")

This is commit

  cd843399d706 ("crypto: lib/mpi - Fix an "Uninitialized scalar variable" issue")

in the crypto-current tree.

-- 
Cheers,
Stephen Rothwell

diff --cc block/elevator.c
index 9430cde13d1a,d6b4eb5443d9..000000000000
--- a/block/elevator.c
+++ b/block/elevator.c
@@@ -708,23 -709,12 +708,21 @@@ void elv_iosched_load_module(struct gen
  			    size_t count)
  {
  	char elevator_name[ELV_NAME_MAX];
 +	struct elevator_type *found;
 +	const char *name;
  
  	if (!elv_support_iosched(disk->queue))
- 		return -EOPNOTSUPP;
+ 		return;
  
  	strscpy(elevator_name, buf, sizeof(elevator_name));
 -	request_module("%s-iosched", strstrip(elevator_name));
 +	name = strstrip(elevator_name);
 +
 +	spin_lock(&elv_list_lock);
 +	found = __elevator_find(name);
 +	spin_unlock(&elv_list_lock);
 +
 +	if (!found)
 +		request_module("%s-iosched", name);
- 
- 	return 0;
  }
  
  ssize_t elv_iosched_store(struct gendisk *disk, const char *buf,

Attachment: pgpmxF1QDqGOG.pgp
Description: OpenPGP digital signature