public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Vincent McIntyre <vincent.mcintyre@gmail.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
	Devin Heitmueller <dheitmueller@kernellabs.com>,
	linux-media@vger.kernel.org
Subject: Re: [patch] addition to v2.6.35_i2c_new_probed_device.patch (was: Re: Debug code in HG repositories)
Date: Thu, 13 Jan 2011 10:43:23 -0200	[thread overview]
Message-ID: <4D2EF36B.8050007@redhat.com> (raw)
In-Reply-To: <AANLkTin6g15UzWuN8XHRUwwGUPWpSnWwVAU1GxvXCcNz@mail.gmail.com>

Em 13-01-2011 02:43, Vincent McIntyre escreveu:
> On 1/12/11, Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
> 
>>> which on the face of it suggests
>>>   btty-input.c
> 
> already handled, my mistake.
> 
>>>   cx88-input.c
> the search string was in a comment
> 
>>>   hdpvr-i2c.c
> see below
> 
> 
>> I have no time currently to touch on it, since I still have lots of patches
>> to
>> take a look and submit for the merge window. So, if you have some time,
>> could you please prepare and submit a patch fixing it?
> 
> This seems to be a relatively simple patch, inline below.
> This is against the linux-media tree,  I could not figure out how
> to turn it into a clean patch of
> media_build/backports/v2.6.35_i2c_new_probed_device.patch
> I did look for guidance on how to do this in
> media_build/README.patches  but could not find anything that looked
> relevant.

Well, there are two ways for doing it:

1) with two copies of linux/, one without your changes, and the other with
your changes;

2) you may create a temporary tree, just to do your patch. That's the way
I use. To avoid causing any confusion, I generally create the second
tree with mercurial.

Something like:

	$ cd media_build/linux/
	$ hg init
	$ hg add *
	$ hg commit

Then, I change the files, and I do:

	$ hg diff > ../backports/my_new_patch.patch

In this specific case, before actually changing the files, I would do:

	$ patch -p1 -i ../backports/v2.6.35_i2c_new_probed_device.patch -R
	$ hg commit
	$ patch -p1 -i ../backports/v2.6.35_i2c_new_probed_device.patch
	<edit the files>
	$ hg diff > ../backports/v2.6.35_i2c_new_probed_device.patch

> The code now compiles for me but I don't know if it will actually
> work, I don't have the hardware.

Ok, I did the above procedure, adding your patch to the diff. Please test.

Thanks,
Mauro

  reply	other threads:[~2011-01-13 12:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-13  4:43 [patch] addition to v2.6.35_i2c_new_probed_device.patch (was: Re: Debug code in HG repositories) Vincent McIntyre
2011-01-13 12:43 ` Mauro Carvalho Chehab [this message]
2011-01-14 12:09   ` Vincent McIntyre

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=4D2EF36B.8050007@redhat.com \
    --to=mchehab@redhat.com \
    --cc=dheitmueller@kernellabs.com \
    --cc=hverkuil@xs4all.nl \
    --cc=linux-media@vger.kernel.org \
    --cc=vincent.mcintyre@gmail.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