linux-next: manual merge of the reset tree with the sound-current tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2008 bytes --]

Hi all,

Today's linux-next merge of the reset tree got a conflict in:

  drivers/reset/core.c

between commit:

  48d71395896d ("reset: Add reset_control_bulk API")

from the sound-current tree and commit:

  463bdeed6760 ("reset: whitespace fixes")

from the reset tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/reset/core.c
index 71c1c8264b2d,123b0c53a857..000000000000
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@@ -724,29 -610,9 +724,29 @@@ void reset_control_release(struct reset
  }
  EXPORT_SYMBOL_GPL(reset_control_release);
  
 +/**
 + * reset_control_bulk_release() - releases exclusive access to reset controls
 + * @num_rstcs: number of entries in rstcs array
 + * @rstcs: array of struct reset_control_bulk_data with reset controls set
 + *
 + * Releases exclusive access right to reset controls previously obtained by a
 + * call to reset_control_bulk_acquire().
 + *
 + * See also: reset_control_release(), reset_control_bulk_acquire()
 + */
 +void reset_control_bulk_release(int num_rstcs,
 +				struct reset_control_bulk_data *rstcs)
 +{
 +	int i;
 +
 +	for (i = 0; i < num_rstcs; i++)
 +		reset_control_release(rstcs[i].rstc);
 +}
 +EXPORT_SYMBOL_GPL(reset_control_bulk_release);
 +
- static struct reset_control *__reset_control_get_internal(
- 				struct reset_controller_dev *rcdev,
- 				unsigned int index, bool shared, bool acquired)
+ static struct reset_control *
+ __reset_control_get_internal(struct reset_controller_dev *rcdev,
+ 			     unsigned int index, bool shared, bool acquired)
  {
  	struct reset_control *rstc;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]