All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: javier Martin <javier.martin@vista-silicon.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
	linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com,
	hverkuil@xs4all.nl, rusty@rustcorp.com.au, dsd@laptop.org,
	hdegoede@redhat.com
Subject: Re: [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework.
Date: Thu, 25 Oct 2012 13:50:47 -0200	[thread overview]
Message-ID: <20121025135047.30674062@redhat.com> (raw)
In-Reply-To: <CACKLOr0DQZ9q0yN7NEShAtEMaXf50HgWwaq2s1c84yAj7HShSw@mail.gmail.com>

Hi Javier,

Em Thu, 25 Oct 2012 15:27:08 +0200
javier Martin <javier.martin@vista-silicon.com> escreveu:

> Hi Mauro, Jon,
> any more issues related with this series?

Patch doesn't apply anymore:

patching file drivers/media/i2c/ov7670.c
Hunk #2 succeeded at 191 (offset -32 lines).
Hunk #3 succeeded at 220 (offset -35 lines).
Hunk #4 succeeded at 1062 (offset -153 lines).
Hunk #5 succeeded at 1091 (offset -153 lines).
Hunk #6 succeeded at 1127 (offset -153 lines).
Hunk #7 succeeded at 1147 (offset -153 lines).
Hunk #8 succeeded at 1195 (offset -153 lines).
Hunk #9 succeeded at 1211 (offset -153 lines).
Hunk #10 succeeded at 1237 (offset -153 lines).
Hunk #11 succeeded at 1255 (offset -153 lines).
Hunk #12 succeeded at 1351 (offset -153 lines).
Hunk #13 FAILED at 1605.
Hunk #14 FAILED at 1616.
Hunk #15 succeeded at 1434 (offset -189 lines).
2 out of 15 hunks FAILED -- rejects in file drivers/media/i2c/ov7670.c

Could you please rebase it? I tried to force its merge, but
it seemed that the conflicts are not that trivial, so I prefer
if you could do it and test if everything still applies.

Regards,
Mauro
-- 
Regards,
Mauro

  reply	other threads:[~2012-10-25 15:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1348831603-18007-1-git-send-email-javier.martin@vista-silicon.com>
2012-09-29 19:25 ` [PATCH v3 0/4] ov7670: migrate this sensor and its users to ctrl framework Jonathan Corbet
2012-10-25 13:27   ` javier Martin
2012-10-25 15:50     ` Mauro Carvalho Chehab [this message]
2012-10-26  9:21       ` javier Martin

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=20121025135047.30674062@redhat.com \
    --to=mchehab@redhat.com \
    --cc=corbet@lwn.net \
    --cc=dsd@laptop.org \
    --cc=hdegoede@redhat.com \
    --cc=hverkuil@xs4all.nl \
    --cc=javier.martin@vista-silicon.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=rusty@rustcorp.com.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.