... of doubled commit
Hi,
Tony Jones found that the following commit:
perf: Fix parsing of __print_flags() in TP_printk()
is applied to 3.0 twice.
Once as:
commit 248f3235861683bb1ffc7316b56bf783b162666f
Author: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400
perf: Fix parsing of __print_flags() in TP_printk()
commit d06c27b22aa66e48e32f03f9387328a9af9b0625 upstream.
===== and =====
The second one is this:
commit 2431496fbdd142ccc83138d94f3f510a36ce9270
Author: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400
perf: Fix parsing of __print_flags() in TP_printk()
commit 49908a1b25d448d68fd26faca260e1850201575f upstream.
=====
The latter is not an upstream commit, it is from pm-fixes, hence the difference in commit SHAs.
2431496fbdd142ccc83138d94f3f510a36ce9270 needs to be reverted as it is applied to a wrong function.
thanks,
Signature · 2 lines
js suse labs
Quoted 21 lines · Jiri Slaby
Hi,
Tony Jones found that the following commit:
perf: Fix parsing of__print_flags()inTP_printk()
is applied to 3.0 twice.Once as:
commit248f3235861683bb1ffc7316b56bf783b162666fAuthor: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400perf: Fix parsing of
__print_flags()inTP_printk()commit
d06c27b22aa66e48e32f03f9387328a9af9b0625upstream.===== and =====
The second one is this:
commit2431496fbdd142ccc83138d94f3f510a36ce9270Author: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400
Quoted 8 lines
perf: Fix parsing of
__print_flags()inTP_printk()commit
49908a1b25d448d68fd26faca260e1850201575fupstream.=====
The latter is not an upstream commit, it is from pm-fixes, hence the difference in commit SHAs.
git command I used was not perfect. It is an upstream commit (git is kind of confused with these two commit. So am I.). However the rest of the email is correct.
Quoted 4 lines
2431496fbdd142ccc83138d94f3f510a36ce9270needs to be reverted as it is applied to a wrong function.thanks,
Signature · 2 lines
js suse labs
Quoted 26 lines · Jiri Slaby
Quoted 25 lines · Jiri Slaby
Hi,
Tony Jones found that the following commit:
perf: Fix parsing of__print_flags()inTP_printk()
is applied to 3.0 twice.Once as:
commit248f3235861683bb1ffc7316b56bf783b162666fAuthor: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400perf: Fix parsing of
__print_flags()inTP_printk()commit
d06c27b22aa66e48e32f03f9387328a9af9b0625upstream.===== and =====
The second one is this:
commit2431496fbdd142ccc83138d94f3f510a36ce9270Author: Steven Rostedt <[email protected]> Date: Fri Nov 4 16:32:25 2011 -0400perf: Fix parsing of
__print_flags()inTP_printk()commit
49908a1b25d448d68fd26faca260e1850201575fupstream.
Quoted 8 lines
Quoted 4 lines
=====
The latter is not an upstream commit, it is from pm-fixes, hence the difference in commit SHAs.
git command I used was not perfect. It is an upstream commit (git is kind of confused with these two commit. So am I.). However the rest of the email is correct.
Thanks for pointing this out, now reverted.
greg k-h