From: Felipe Balbi <felipe.balbi@nokia.com>
To: "ext balajitk@ti.com" <balajitk@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"lrg@slimlogic.co.uk" <lrg@slimlogic.co.uk>,
"sameo@linux.intel.com" <sameo@linux.intel.com>,
"broonie@opensource.wolfsonmicro.com"
<broonie@opensource.wolfsonmicro.com>,
"tony@atomide.co" <tony@atomide.co>,
"sfr@canb.auug.org.au" <sfr@canb.auug.org.au>
Subject: Re: [PATCH] mfd: twl: fix twl4030 rename for remaining driver, board files
Date: Tue, 15 Dec 2009 15:05:46 +0200 [thread overview]
Message-ID: <20091215130546.GK3689@nokia.com> (raw)
In-Reply-To: <1260881723-17255-1-git-send-email-balajitk@ti.com>
On Tue, Dec 15, 2009 at 01:55:23PM +0100, ext balajitk@ti.com wrote:
>From: Balaji T K <balajitk@ti.com>
>
> This patch renames include twl4030.h to include twl.h
> and also renames twl4030_i2c_ routines
remove the spaces above.
also, this patch doesn't apply neither on top of linus's master nor
tony's master:
$ git am ~/check.diff
Applying: mfd: twl: fix twl4030 rename for remaining driver, board files
error: patch failed: drivers/video/omap/lcd_omap2evm.c:24
error: drivers/video/omap/lcd_omap2evm.c: patch does not apply
error: patch failed: drivers/video/omap/lcd_omap3beagle.c:23
error: drivers/video/omap/lcd_omap3beagle.c: patch does not apply
error: patch failed: drivers/video/omap/lcd_omap3evm.c:23
error: drivers/video/omap/lcd_omap3evm.c: patch does not apply
Patch failed at 0001 mfd: twl: fix twl4030 rename for remaining driver, board files
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
please rebase.
--
balbi
next prev parent reply other threads:[~2009-12-15 13:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 12:55 [PATCH] mfd: twl: fix twl4030 rename for remaining driver, board files balajitk
2009-12-15 13:05 ` Felipe Balbi [this message]
2009-12-15 13:11 ` Felipe Balbi
2009-12-15 17:31 ` Tony Lindgren
2009-12-15 13:06 ` Mark Brown
2009-12-16 7:28 ` Peter Ujfalusi
2009-12-16 16:49 ` Krishnamoorthy, Balaji T
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=20091215130546.GK3689@nokia.com \
--to=felipe.balbi@nokia.com \
--cc=balajitk@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.co \
/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