From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the char-misc tree with the sound-asoc tree
Date: Mon, 28 Jan 2013 19:23:11 +0800 [thread overview]
Message-ID: <20130128112309.GA8301@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20130128215444.98524bf94e5fcd2035833055@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
On Mon, Jan 28, 2013 at 09:54:44PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the char-misc tree got a conflict in
> include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
> arizona: Allow number of channels clocked to be restricted") from the
> sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
> GPIO5 as an input to jack detection") from the char-misc tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-01-28 11:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 10:54 linux-next: manual merge of the char-misc tree with the sound-asoc tree Stephen Rothwell
2013-01-28 11:23 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 8:42 Stephen Rothwell
2012-11-26 19:32 ` Greg KH
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=20130128112309.GA8301@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.