From: Laxman Dewangan <ldewangan@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: Re: linux-next: manual merge of the regulator tree with the mfd tree
Date: Mon, 26 Nov 2012 12:17:21 +0530 [thread overview]
Message-ID: <50B31079.5060309@nvidia.com> (raw)
In-Reply-To: <20121126164412.653f0cb43bb55775475f6ed3@canb.auug.org.au>
On Monday 26 November 2012 11:14 AM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi all,
>
> Today's linux-next merge of the regulator tree got a conflict in
> include/linux/mfd/tps65090.h between commit 3863db3e800c ("mfd: tps65090:
> Remove unused member of struct tps65090") from the mfd tree and commit
> 24282a1ca33b ("regulator: tps65090: Register all regulators in single
> probe call") from the regulator tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary (no action
> is required).
>
The merges looks fine.
next prev parent reply other threads:[~2012-11-26 6:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 5:44 linux-next: manual merge of the regulator tree with the mfd tree Stephen Rothwell
2012-11-26 6:47 ` Laxman Dewangan [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-10 2:51 Stephen Rothwell
2024-09-18 2:05 ` Stephen Rothwell
2012-07-17 2:30 Stephen Rothwell
2012-07-17 2:19 Stephen Rothwell
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=50B31079.5060309@nvidia.com \
--to=ldewangan@nvidia.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@ti.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.