From: Willy Tarreau <willy@w.ods.org>
To: guorke <gourke@gmail.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: I confused about diff(simple question)
Date: Sun, 10 Jul 2005 08:11:48 +0200 [thread overview]
Message-ID: <20050710061147.GO8907@alpha.home.local> (raw)
In-Reply-To: <d73ab4d005070922413fb0dbba@mail.gmail.com>
On Sun, Jul 10, 2005 at 01:41:40PM +0800, guorke wrote:
> like:
>
> /*
> @@ -220,9 +232,8(HERE: why not -220,9 +220,8) @@ fastcall notrace void
> do_page_fault(stru
> struct vm_area_struct * vma;
> unsigned long address;
> unsigned long page;
> - int write;
> - siginfo_t info;
> -
> + int write, si_code;
> +
(...)
> I think the old file from the line 220,and have 9 lines,then the
> newfile have 8 lines
> so must delete one line. but why +232,it from the line 232 ?
> like this..
because there was another chunk before this one, which added 12 lines,
so the offset in the old file is 220, and the offset in the new file is
232 because of the previous chunk.
Willy
next prev parent reply other threads:[~2005-07-10 6:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-10 5:41 guorke
2005-07-10 5:42 ` guorke
2005-07-10 6:11 ` Willy Tarreau [this message]
2005-07-10 6:13 ` randy_dunlap
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=20050710061147.GO8907@alpha.home.local \
--to=willy@w.ods.org \
--cc=gourke@gmail.com \
--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®