mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: jlnance@intrex.net
To: Anthony <aslan@ispdr.net.au>, linux-kernel@vger.kernel.org
Subject: Re: Patch files
Date: Tue, 2 Oct 2001 08:42:10 -0400	[thread overview]
Message-ID: <20011002084210.A1333@bessie.localdomain> (raw)
In-Reply-To: <4.3.2.7.2.20011002021641.02340710@mail.ispdr.net.au>
In-Reply-To: <4.3.2.7.2.20011002021641.02340710@mail.ispdr.net.au>; from aslan@ispdr.net.au on Tue, Oct 02, 2001 at 02:25:12AM +1000

On Tue, Oct 02, 2001 at 02:25:12AM +1000, Anthony wrote:

> about the patch file so I might be able to understand how it works. Can 
> anyone please explain (or point me to the relevant documentation) to me 
> what the following lines mean?:
> 
> --- linux/include/linux/pci_ids.h.netmos	Sat Sep  8 09:44:43 2001
> +++ linux/include/linux/pci_ids.h	Sat Sep  8 09:44:45 2001

This header tells you that the patch was generated by running:

diff -u linux/include/linux/pci_ids.h.netmos linux/include/linux/pci_ids.h

The original file is marked with --- and the new file is marked with +++

> @@ -1664,8 +1664,12 @@

This is used to seperate parts of the patch file.  What it means exactly is
that the file position in the original file was at line 1664 and extended
for 8 lines, and in the new file its at line 1664 and extends for 12 lines.

> And this is from further down in the patch:
> @@ -2831,6 +2839,15 @@

Same as above.  Lines 6 lines starting at 2831 in original file, and 15
lines starting at 2839 in the new file.

Hope this helps.

Thanks,

Jim

      parent reply	other threads:[~2001-10-02 12:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2001-10-01 16:25 Anthony
2001-10-01 16:32 ` Tommy Reynolds
2001-10-02 12:42 ` jlnance [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=20011002084210.A1333@bessie.localdomain \
    --to=jlnance@intrex.net \
    --cc=aslan@ispdr.net.au \
    --cc=linux-kernel@vger.kernel.org \
    /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
all inboxes | Powered by JetHome®