Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that. Now my question is - What "@@ -321,7 +321,8 @@" mean in this snippet from the patch - diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages); -- Shraddha
On 12/19/2012 12:47 AM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
The first number -321 means the line number of the original file that the change takes place. The next number & means that before the change, there were 7 lines of code. The next number +321 is the line number after the change. Since this is the first (and only change) it is the same as the first number. If there multiple changes in a patch, this number can differ greatly from the first number. The last number is the lines of code after the change.
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
-- Shraddha
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html http://www.artima.com/weblogs/viewpost.jsp?thread=164293 -lijo
-- Shraddha
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html http://www.artima.com/weblogs/viewpost.jsp?thread=164293
-lijo
But I don't see any mention of the "index" field here // see line "index 722c620..6abb687 100644". What does this mean ?
-- Shraddha
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
-- Shraddha
On Wed, Dec 19, 2012 at 5:13 AM, Shraddha Kamat <sh2008ka@gmail.com> wrote:
On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html http://www.artima.com/weblogs/viewpost.jsp?thread=164293
-lijo
But I don't see any mention of the "index" field here // see line "index 722c620..6abb687 100644". What does this mean ?
the index 7222...6bbb are may be the git ids or some git's references... 100644 is the file mode.
I think those are git commit IDs. -Avinash On Wed, Dec 19, 2012 at 3:43 PM, Shraddha Kamat <sh2008ka@gmail.com> wrote:
On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
http://www.artima.com/weblogs/viewpost.jsp?thread=164293
-lijo
But I don't see any mention of the "index" field here // see line "index 722c620..6abb687 100644". What does this mean ?
-- Shraddha
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
-- Shraddha
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
On Wed, 19 Dec 2012, Shraddha Kamat wrote:
On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html http://www.artima.com/weblogs/viewpost.jsp?thread=164293
-lijo
But I don't see any mention of the "index" field here // see line "index 722c620..6abb687 100644". What does this mean ?
See "man git-diff" (GENERATING PATCHES WITH -P) for the information. Regards, Tobi
On Wed, Dec 19, 2012 at 2:13 AM, Shraddha Kamat <sh2008ka@gmail.com> wrote:
On Wed, 2012-12-19 at 13:58 +0400, Lijo Antony wrote:
On 12/19/2012 12:47 PM, Shraddha Kamat wrote:
Sorry if this is not relevant to kernel. But since I am patching the kernel - Please consider this as a uber beginner question to ask on this mailing list - forgive me for that.
Now my question is -
What "@@ -321,7 +321,8 @@" mean in this snippet from the patch -
diff --git a/exec.h b/exec.h index 722c620..6abb687 100644 --- a/exec.h +++ b/exec.h @@ -321,7 +321,8 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages);
http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
http://www.artima.com/weblogs/viewpost.jsp?thread=164293
-lijo
But I don't see any mention of the "index" field here // see line "index 722c620..6abb687 100644". What does this mean ?
'722c620' is the commit id in which a/exec.h is part of and '6abb687' is the commit id in which b/exec.h is part of. 'a' and 'b' are not folders. Its just a notation that diff uses for left and right side. to know more on git look here: http://git-scm.com/book and git diff in particular look at the man page or search for "git diff" and you get a lot of links that explains it...
participants (7)
-
Anand Arumugam -
Avinash Patil -
devendra.aaru -
Jeff Kirsher -
Lijo Antony -
Shraddha Kamat -
Tobias Boege