Hi all,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/media/atomisp/TODO
between commit:
51b8dc5163d2 ("media: staging: atomisp: Remove driver")
from the v4l-dvb tree and commit:
1bd421154821 ("staging: atomisp: Augment TODO file with GPIO work item")
from the staging tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
On Thu, May 17, 2018 at 02:17:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/atomisp/TODO
>
> between commit:
>
> 51b8dc5163d2 ("media: staging: atomisp: Remove driver")
>
> from the v4l-dvb tree and commit:
>
> 1bd421154821 ("staging: atomisp: Augment TODO file with GPIO work item")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Looks correct, glad to see this code be removed :)
thanks,
greg k-h
Em Thu, 17 May 2018 14:17:27 +1000
Stephen Rothwell <[email protected]> escreveu:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/media/atomisp/TODO
>
> between commit:
>
> 51b8dc5163d2 ("media: staging: atomisp: Remove driver")
>
> from the v4l-dvb tree and commit:
>
> 1bd421154821 ("staging: atomisp: Augment TODO file with GPIO work item")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
Hi Stephen,
What do you use in order to check it? Maybe we could have some git
hook running such check, in order to prevent merging patches without
the right SOBs.
Thanks,
Mauro
Hi Mauro,
On Thu, 17 May 2018 07:06:57 -0300 Mauro Carvalho Chehab <[email protected]> wrote:
>
> What do you use in order to check it? Maybe we could have some git
> hook running such check, in order to prevent merging patches without
> the right SOBs.
I run the script below on the range of new commits each time a fetch a
tree ...
--
Cheers,
Stephen Rothwell
------------------------------------------------------------------------
#!/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
for c in $commits; do
ae=$(git log -1 --format='%ae' "$c")
aE=$(git log -1 --format='%aE' "$c")
an=$(git log -1 --format='%an' "$c")
aN=$(git log -1 --format='%aN' "$c")
ce=$(git log -1 --format='%ce' "$c")
cE=$(git log -1 --format='%cE' "$c")
cn=$(git log -1 --format='%cn' "$c")
cN=$(git log -1 --format='%cN' "$c")
sob=$(git log -1 --format='%b' "$c" | grep -i '^[[:space:]]*Signed-off-by:')
am=false
cm=false
grep -i -q "<$ae>" <<<"$sob" ||
grep -i -q "<$aE>" <<<"$sob" ||
grep -i -q ":[[:space:]]*$an[[:space:]]*<" <<<"$sob" ||
grep -i -q ":[[:space:]]*$aN[[:space:]]*<" <<<"$sob" ||
am=true
grep -i -q "<$ce>" <<<"$sob" ||
grep -i -q "<$cE>" <<<"$sob" ||
grep -i -q ":[[:space:]]*$cn[[:space:]]*<" <<<"$sob" ||
grep -i -q ":[[:space:]]*$cN[[:space:]]*<" <<<"$sob" ||
cm=true
if "$am" || "$cm"; then
printf "Commit %s\n" "$c"
"$am" && printf "\tauthor SOB missing\n"
"$cm" && printf "\tcommitter SOB missing\n"
printf "%s %s\n%s\n" "$ae" "$ce" "$sob"
fi
done
exec gitk "$@"
------------------------------------------------------------------------