linux-next: manual merge of the w1 tree with the char-misc.current tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/w1/masters/ds2482.c

between commit:

  e4f673632fa82 ("w1: ds2482: set the strong pull-up with its byte")

from the char-misc.current tree and commit:

  8847bbf3adfc5 ("w1: fix spelling mistakes in comments across the subsystem")

from the w1 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.

diff --cc drivers/w1/masters/ds2482.c
index 5498bb04f7cec,70854336a1731..0000000000000
--- a/drivers/w1/masters/ds2482.c
+++ b/drivers/w1/masters/ds2482.c
@@@ -437,16 -423,24 +437,16 @@@ static u8 ds2482_w1_set_pullup(void *da
  
  	/* if delay is non-zero activate the pullup,
  	 * the strong pullup will be automatically deactivated
- 	 * by the master, so do not explicitly deactive it
+ 	 * by the master, so do not explicitly deactivate it
 +	 *
 +	 * The setting is used up by the next byte on any channel of the chip:
 +	 * ds2482_w1_write_byte() makes it, in one go with the byte.
  	 */
 -	if (delay) {
 -		/* both waits are crucial, otherwise devices might not be
 -		 * powered long enough, causing e.g. a w1_therm sensor to
 -		 * provide wrong conversion results
 -		 */
 -		ds2482_wait_1wire_idle(pdev);
 -		/* note: it seems like both SPU and APU have to be set! */
 -		retval = ds2482_send_cmd_data(pdev, DS2482_CMD_WRITE_CONFIG,
 -			ds2482_calculate_config(DS2482_REG_CFG_SPU |
 -						DS2482_REG_CFG_APU));
 -		ds2482_wait_1wire_idle(pdev);
 -	}
 +	if (!delay)
 +		return 1;
  
 -	return retval;
 +	pchan->spu = true;
 +	return 0;
  }
  
  

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