From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: "Hiremath, Vaibhav" <hvaibhav@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"linux-fbdev@vger.kernel.org" <linux-fbdev@vger.kernel.org>,
Tony Lindgren <tony@atomide.com>,
"Taneja, Archit" <archit@ti.com>
Subject: RE: [PATCHv2 2/3] OMAP: move arch/arm/plat-omap/include/plat/vrfb.h
Date: Tue, 09 Oct 2012 12:57:10 +0000 [thread overview]
Message-ID: <1349787430.2409.30.camel@deskari> (raw)
In-Reply-To: <79CD15C6BA57404B839C016229A409A83EB3A082@DBDE01.ent.ti.com>
[-- Attachment #1: Type: text/plain, Size: 1786 bytes --]
On Tue, 2012-10-09 at 12:54 +0000, Hiremath, Vaibhav wrote:
> On Tue, Oct 09, 2012 at 18:00:25, Valkeinen, Tomi wrote:
> > Now that vrfb driver is not omap dependent anymore, we can move vrfb.h
> > from arch/arm/plat-omap/include/plat to include/video/omapvrfb.h.
> >
>
> Which baseline you are using? I tried it with linux-omap/master, patch[1/3] is failing -
It's based on omapdss master, which is what I've sent in the pull
request for 3.7.
> patching file arch/arm/plat-omap/include/plat/vrfb.h
> patching file drivers/media/video/omap/omap_vout.c
> Hunk #1 FAILED at 45.
> 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_vout.c.rej
> patching file drivers/media/video/omap/omap_vout_vrfb.c
> Hunk #1 FAILED at 17.
> 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_vout_vrfb.c.rej
> patching file drivers/media/video/omap/omap_voutdef.h
> Hunk #1 FAILED at 12.
> 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_voutdef.h.rej
> patching file drivers/video/omap2/omapfb/omapfb-ioctl.c
> patching file drivers/video/omap2/omapfb/omapfb-main.c
> Hunk #1 succeeded at 33 with fuzz 2 (offset 1 line).
> patching file drivers/video/omap2/omapfb/omapfb-sysfs.c
> patching file drivers/video/omap2/vrfb.c
> patching file include/video/omapvrfb.h
>
>
>
> Note that, the directory structure has been changed in the mainline,
> Now V4L2 OMAP Display driver is in "drivers/media/platform/omap/"
>
> You have to rebase the patches and resend it.
Yep, I'll rebase it on top of 3.7-rc1 when that's out, so that Tony can
pull that branch into his tree also. I guess the omap_vout changes
should apply easily, as it's just include filename changes.
Tomi
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-10-09 12:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 12:30 [PATCHv2 0/3] OMAP: VRFB: convert to platform device Tomi Valkeinen
2012-10-09 12:30 ` [PATCHv2 1/3] OMAP: VRFB: convert vrfb " Tomi Valkeinen
2012-10-09 20:37 ` Kevin Hilman
2012-10-10 4:07 ` Tomi Valkeinen
2012-10-10 18:12 ` Kevin Hilman
2012-10-09 12:30 ` [PATCHv2 2/3] OMAP: move arch/arm/plat-omap/include/plat/vrfb.h Tomi Valkeinen
2012-10-09 12:54 ` Hiremath, Vaibhav
2012-10-09 12:57 ` Tomi Valkeinen [this message]
2012-10-09 12:30 ` [PATCHv2 3/3] OMAP: SDRC: remove VRFB code Tomi Valkeinen
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=1349787430.2409.30.camel@deskari \
--to=tomi.valkeinen@ti.com \
--cc=archit@ti.com \
--cc=hvaibhav@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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).