* linux-next: manual merge of the sound-asoc-fixes tree with the sound-current tree
@ 2019-03-04 20:59 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-03-04 20:59 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Takashi Iwai
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Guennadi Liakhovetski, Philipp Puschmann
[-- Attachment #1: Type: text/plain, Size: 851 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc-fixes tree got a conflict in:
sound/soc/codecs/tlv320aic3x.c
between commit:
0bb423f2eaaf ("ASoC: regulator notifier registration should be managed")
from the sound-current tree and commit:
82ad759143ed ("ASoC: tlv320aic3x: fix reset gpio reference counting")
from the sound-asoc-fixes tree.
I fixed it up (I just used the former version which removed some code
modified by the latter) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-03-04 20:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-04 20:59 linux-next: manual merge of the sound-asoc-fixes tree with the sound-current tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).