From: Thierry Reding <thierry.reding@avionic-design.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bill Pemberton <wfp5p@virginia.edu>, Greg KH <greg@kroah.com>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Subject: Re: linux-next: manual merge of the pwm tree with the driver-core tree
Date: Thu, 29 Nov 2012 07:48:32 +0100 [thread overview]
Message-ID: <20121129064831.GD28582@avionic-0098.adnet.avionic-design.de> (raw)
In-Reply-To: <20121129162945.ee9cf8d7620477159e038ccf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
On Thu, Nov 29, 2012 at 04:29:45PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> drivers/pwm/pwm-twl6030.c between commit fd1091125a1d ("pwm: remove use
> of __devexit_p") from the driver-core tree and commit 6179a58ec7e2 ("pwm:
> Remove pwm-twl6030 driver") from the pwm tree.
>
> I fixed it up (the latter removed the file) and can carry the fix as
> necessary (no action is required).
Great, thanks!
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-11-29 6:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 5:29 linux-next: manual merge of the pwm tree with the driver-core tree Stephen Rothwell
2012-11-29 6:48 ` Thierry Reding [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 5:27 Stephen Rothwell
2012-11-29 6:46 ` Thierry Reding
2012-11-29 5:25 Stephen Rothwell
2012-11-29 6:45 ` Thierry Reding
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=20121129064831.GD28582@avionic-0098.adnet.avionic-design.de \
--to=thierry.reding@avionic-design.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=sfr@canb.auug.org.au \
--cc=wfp5p@virginia.edu \
/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 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).