From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>, Takashi Iwai <tiwai@suse•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Guennadi Liakhovetski <guennadi.liakhovetski@linux•intel.com>,
Philipp Puschmann <philipp.puschmann@emlix•com>
Subject: linux-next: manual merge of the sound-asoc-fixes tree with the sound-current tree
Date: Tue, 5 Mar 2019 07:59:11 +1100 [thread overview]
Message-ID: <20190305075911.4646469f@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2019-03-04 20:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190305075911.4646469f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=guennadi.liakhovetski@linux$(echo .)intel.com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.puschmann@emlix$(echo .)com \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox