Re: linux-next: manual merge of the soundwire tree with the sound-asoc-fixes tree

[Stephen Rothwell]

Hi all,

On Tue, 22 Jun 2021 17:19:36 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the soundwire tree got a conflict in:
> 
>   include/linux/soundwire/sdw.h
> 
> between commit:
> 
>   d38ebaf2c884 ("soundwire: export sdw_update() and sdw_update_no_pm()")
> 
> from the sound-asoc-fixes tree and commit:
> 
>   031e668bc1ad ("soundwire: bus: Make sdw_nwrite() data pointer argument const")
> 
> from the soundwire 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 include/linux/soundwire/sdw.h
> index de9802a24e7e,ddbeb00799e4..000000000000
> --- a/include/linux/soundwire/sdw.h
> +++ b/include/linux/soundwire/sdw.h
> @@@ -1040,10 -1039,7 +1039,10 @@@ int sdw_write(struct sdw_slave *slave, 
>   int sdw_write_no_pm(struct sdw_slave *slave, u32 addr, u8 value);
>   int sdw_read_no_pm(struct sdw_slave *slave, u32 addr);
>   int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
> - int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val);
> + int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val);
>  +int sdw_update(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
>  +int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val);
>  +
>   int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id);
>   void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id);
>   

This is now a conflict between the char-misc tree and the
sound-asoc-fixes tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpqE4NsyqWXk.pgp
Description: OpenPGP digital signature