From: Dan Carpenter <error27@gmail.com>
To: Sylwester Nawrocki <s.nawrocki@samsung.com>
Cc: 'Mauro Carvalho Chehab' <mchehab@infradead.org>,
'Kyungmin Park' <kyungmin.park@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch 2/3] V4L/DVB: s5p-fimc: make it compile
Date: Fri, 22 Oct 2010 10:11:28 +0200 [thread overview]
Message-ID: <20101022081128.GP5985@bicker> (raw)
In-Reply-To: <000b01cb71ba$58902ad0$09b08070$%nawrocki@samsung.com>
On Fri, Oct 22, 2010 at 09:25:47AM +0200, Sylwester Nawrocki wrote:
>
> This code is properly removed in my original patch. But it has been added
> again during a merge conflict solving. Unfortunately I cannot identify the
> merge commit today in linux-next.
> As for sched.h, it needs a separate patch so I could handle it and add you
> as reported by it is OK.
>
I thought it was probably a merge conflict. Thanks for taking care of
this.
regards,
dan carpenter
> Regards,
> Sylwester
>
> > ret = fimc_register_m2m_device(fimc);
> > if (ret)
> > goto err_irq;
prev parent reply other threads:[~2010-10-22 8:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 19:24 [patch 2/3] V4L/DVB: s5p-fimc: make it compile Dan Carpenter
2010-10-22 7:25 ` Sylwester Nawrocki
2010-10-22 8:11 ` Dan Carpenter [this message]
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=20101022081128.GP5985@bicker \
--to=error27@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@infradead.org \
--cc=s.nawrocki@samsung.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