From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Myungjoo Ham <myungjoo.ham@samsung.com>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the mfd tree
Date: Mon, 4 Feb 2013 10:27:04 -0800 [thread overview]
Message-ID: <20130204182704.GD3219@kroah.com> (raw)
In-Reply-To: <20130204161241.9ba53f0389122d30a2b32ed4@canb.auug.org.au>
On Mon, Feb 04, 2013 at 04:12:41PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/mfd/wm5102-tables.c between commit d078377faf5f ("mfd: wm5102:
> Refresh register defaults") from the mfd tree and commit 689557d3c704
> ("mfd: wm5102: Add microphone clamp control registers") from the
> char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks for this, it looks fine to me.
greg k-h
next prev parent reply other threads:[~2013-02-04 18:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-04 5:12 linux-next: manual merge of the char-misc tree with the mfd tree Stephen Rothwell
2013-02-04 18:27 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-28 8:39 Stephen Rothwell
2022-02-28 9:01 ` Lee Jones
2022-02-28 10:46 ` Greg KH
2022-02-28 12:46 ` Lee Jones
2022-02-28 21:26 ` Greg KH
2022-03-01 9:37 ` Lee Jones
2022-03-01 10:35 ` Greg KH
2022-03-01 10:54 ` Lee Jones
2022-03-01 21:19 ` Greg KH
2022-03-02 8:00 ` Lee Jones
2022-03-02 8:49 ` Lee Jones
2022-03-02 10:13 ` Robert Marko
2022-03-01 23:09 ` Robert Marko
2022-03-02 8:37 ` Lee Jones
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=20130204182704.GD3219@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=sameo@linux.intel.com \
--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.