Hi all,
Commits
dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
are missing a Signed-off-by from their author.
--
Cheers,
Stephen Rothwell
On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Commits
>
> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
>
> are missing a Signed-off-by from their author.
Hi David.
Any idea what happened here? The version in my git repo has SOB.
https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
Thanks
Andrew
On 09.12.2018 22:11, Andrew Lunn wrote:
> On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Commits
>>
>> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
>> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
>>
>> are missing a Signed-off-by from their author.
>
> Hi David.
>
> Any idea what happened here? The version in my git repo has SOB.
>
> https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
>
Instead of
v2
--
int -> u32 in platform data structure
Signed-off-by: Andrew Lunn <[email protected]>
shouldn't it be
Signed-off-by: Andrew Lunn <[email protected]>
---
v2
- int -> u32 in platform data structure
?
Heiner
> Thanks
> Andrew
>
On Sun, Dec 09, 2018 at 10:33:10PM +0100, Heiner Kallweit wrote:
> On 09.12.2018 22:11, Andrew Lunn wrote:
> > On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Commits
> >>
> >> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
> >> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
> >>
> >> are missing a Signed-off-by from their author.
> >
> > Hi David.
> >
> > Any idea what happened here? The version in my git repo has SOB.
> >
> > https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
> >
> Instead of
> v2
> --
> int -> u32 in platform data structure
>
> Signed-off-by: Andrew Lunn <[email protected]>
>
> shouldn't it be
>
> Signed-off-by: Andrew Lunn <[email protected]>
> ---
> v2
> - int -> u32 in platform data structure
Hi Heiner
David said he wanted to see the version history. So i deliberately put
it above the ---.
I'm just wondering if -- was enough to trigger something in David's
scripts? Or patchwork. The -- has disappeared in the commit which made
it into net-next.
Andrew
2018-12-09, 22:49:07 +0100, Andrew Lunn wrote:
> On Sun, Dec 09, 2018 at 10:33:10PM +0100, Heiner Kallweit wrote:
> > On 09.12.2018 22:11, Andrew Lunn wrote:
> > > On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
> > >> Hi all,
> > >>
> > >> Commits
> > >>
> > >> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
> > >> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
> > >>
> > >> are missing a Signed-off-by from their author.
> > >
> > > Hi David.
> > >
> > > Any idea what happened here? The version in my git repo has SOB.
> > >
> > > https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
> > >
> > Instead of
> > v2
> > --
> > int -> u32 in platform data structure
> >
> > Signed-off-by: Andrew Lunn <[email protected]>
> >
> > shouldn't it be
> >
> > Signed-off-by: Andrew Lunn <[email protected]>
> > ---
> > v2
> > - int -> u32 in platform data structure
>
> Hi Heiner
>
> David said he wanted to see the version history. So i deliberately put
> it above the ---.
>
> I'm just wondering if -- was enough to trigger something in David's
> scripts? Or patchwork. The -- has disappeared in the commit which made
> it into net-next.
>
> Andrew
If you fetch the mbox from patchwork at
https://patchwork.ozlabs.org/patch/1009811/mbox/
it contains:
-------- 8< --------
v2
Reviewed-by: Florian Fainelli <[email protected]>
---
int -> u32 in platform data structure
Signed-off-by: Andrew Lunn <[email protected]>
---
[diffstat]
-------- 8< --------
That's 3 dashes instead of the 2 from your mail. If you "git am" that,
the sign-off and actual history will get chopped off.
Maybe Stephen's script to detect those missing sign-offs could be run
as a commit/apply hook by David? This happens regularly, sometimes
dropping more than just a sign-off.
--
Sabrina
From: Heiner Kallweit <[email protected]>
Date: Sun, 9 Dec 2018 22:33:10 +0100
> On 09.12.2018 22:11, Andrew Lunn wrote:
>> On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Commits
>>>
>>> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
>>> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
>>>
>>> are missing a Signed-off-by from their author.
>>
>> Hi David.
>>
>> Any idea what happened here? The version in my git repo has SOB.
>>
>> https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
>>
> Instead of
> v2
> --
> int -> u32 in platform data structure
>
> Signed-off-by: Andrew Lunn <[email protected]>
>
> shouldn't it be
>
> Signed-off-by: Andrew Lunn <[email protected]>
> ---
> v2
> - int -> u32 in platform data structure
No, I want the changelog to actually appear in the commit message.
I'm kinda tired of saying this.
Keep changelog information in the commit message, everyone.
The problem here is the '--' delimiter, Andrew should have either
used nothing or something else.
From: Andrew Lunn <[email protected]>
Date: Sun, 9 Dec 2018 22:11:39 +0100
> On Mon, Dec 10, 2018 at 08:00:45AM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Commits
>>
>> dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data")
>> 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask")
>>
>> are missing a Signed-off-by from their author.
>
> Hi David.
>
> Any idea what happened here? The version in my git repo has SOB.
>
> https://patchwork.ozlabs.org/patch/1009811/ also has my SOB.
I wonder if "git am" ate it. :-/
Yeah it's the '--' I think.
From: Sabrina Dubroca <[email protected]>
Date: Mon, 10 Dec 2018 00:27:22 +0100
> Maybe Stephen's script to detect those missing sign-offs could be run
> as a commit/apply hook by David? This happens regularly, sometimes
> dropping more than just a sign-off.
Yeah, that would probably be a good idea, maybe something even on the
git.kernel.org side that won't let me push if I'm sending commits that
have this problem.
Hi Dave,
On Sun, 09 Dec 2018 16:31:52 -0800 (PST) David Miller <[email protected]> wrote:
>
> From: Sabrina Dubroca <[email protected]>
> Date: Mon, 10 Dec 2018 00:27:22 +0100
>
> > Maybe Stephen's script to detect those missing sign-offs could be run
> > as a commit/apply hook by David? This happens regularly, sometimes
> > dropping more than just a sign-off.
>
> Yeah, that would probably be a good idea, maybe something even on the
> git.kernel.org side that won't let me push if I'm sending commits that
> have this problem.
That is fine as a last resort, but it is probably less disruptive to
find these things before you try to push i.e. as part of the "apply the
patch" otherwise you could end up having to rebase a whole lot of later
commits.
Anyway, here's my current version of my script. It just takes a commit
range (anything you can pass to "git log"). You may want to drop the
gitk invocation at the end.
--------------------------------------------------------------------
#!/bin/bash
if [ "$#" -lt 1 ]; then
printf "Usage: %s <commit range>\n", "$0" 1>&2
exit 1
fi
commits=$(git rev-list --no-merges "$@")
if [ -z "$commits" ]; then
printf "No commits\n"
exit 0
fi
author_missing=
committer_missing=
print_commits()
{
local t="$1"
shift
s=
is='is'
its='its'
[ "$#" -gt 1 ] && {
s='s'
is='are'
its='their'
}
printf "Commit%s\n\n" "$s"
git log --no-walk --pretty='format: %h ("%s")' "$@"
printf "\n%s missing a Signed-off-by from %s %s%s.\n" "$is" "$its" "$t" "$s"
printf "\n"
}
for c in $commits; do
ae=$(git log -1 --format='<%ae>%n<%aE>%n %an %n %aN ' "$c" | sort -u)
ce=$(git log -1 --format='<%ce>%n<%cE>%n %cn %n %cN ' "$c" | sort -u)
msg=$(git log -1 --format='%b' "$c")
sob=$(echo "$msg" | sed -En 's/^\s*Signed-off-by:?\s*/ /ip')
am=false
cm=false
grep -i -F -q "$ae" <<<"$sob" ||
am=true
grep -i -F -q "$ce" <<<"$sob" ||
cm=true
"$am" && author_missing+=" $c"
"$cm" && committer_missing+=" $c"
done
if [ "$author_missing" ]; then
print_commits "author" $author_missing
fi
if [ "$committer_missing" ]; then
print_commits "committer" $committer_missing
fi
exec gitk "$@"
--------------------------------------------------------------------
--
Cheers,
Stephen Rothwell
From: Stephen Rothwell <[email protected]>
Date: Mon, 10 Dec 2018 11:48:48 +1100
> That is fine as a last resort, but it is probably less disruptive to
> find these things before you try to push i.e. as part of the "apply the
> patch" otherwise you could end up having to rebase a whole lot of later
> commits.
I meant to imply that we should do both, something I do pre-commit
and something that double checks again when I push.
Sorry if I wasn't clear.
> Anyway, here's my current version of my script. It just takes a commit
> range (anything you can pass to "git log"). You may want to drop the
> gitk invocation at the end.
Thanks!
Hi Dave,
On Sun, 09 Dec 2018 16:54:43 -0800 (PST) David Miller <[email protected]> wrote:
>
> From: Stephen Rothwell <[email protected]>
> Date: Mon, 10 Dec 2018 11:48:48 +1100
>
> > That is fine as a last resort, but it is probably less disruptive to
> > find these things before you try to push i.e. as part of the "apply the
> > patch" otherwise you could end up having to rebase a whole lot of later
> > commits.
>
> I meant to imply that we should do both, something I do pre-commit
> and something that double checks again when I push.
>
> Sorry if I wasn't clear.
No worries, belts and braces :-)
--
Cheers,
Stephen Rothwell
> The problem here is the '--' delimiter, Andrew should have either
> used nothing or something else.
I picked -- because it was not --- !
Anyway, lesson learned. But i kind of expect it will happen again to
others, since the "Submitting Patches" documentation just mentions ---
and does not say that other similar markers may also trigger the magic
scissors.
Andrew
2018-12-10, 14:35:00 +0100, Andrew Lunn wrote:
> > The problem here is the '--' delimiter, Andrew should have either
> > used nothing or something else.
>
> I picked -- because it was not --- !
>
> Anyway, lesson learned. But i kind of expect it will happen again to
> others, since the "Submitting Patches" documentation just mentions ---
> and does not say that other similar markers may also trigger the magic
> scissors.
-- doesn't trigger the scissors. It looks like patchwork replaced your
-- with a ---, as I wrote in my other reply.
--
Sabrina