Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
sound/soc/fsl/fsl_ssi.c between commit 147dfe90f730 ("ASoC: p1022ds: fix
incorrect referencing of device tree properties") from the sound tree and
commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
resource_size(ptr)") from the trivial tree.
The former supercedes the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpZLapXVdJ0S.pgp
Description: PGP signature
