I triy to create a patchset between:
https://github.com/raspberrypi/linux.git branch rpi-3.12.y
and
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git tag
3.12.26
I cloned the first tree, added the second tree as remote and fetched the
tree.
Then I tried commands like: git log v3.12.26..rpi-3.12.y --oneline
But I get too much commits. For e.g. I get the following commit which is in
both branches!:
commit d8d9d6005cbfbe926bb96e5b71b99dae4fb8ddae
Author: Andrey Utkin <andrey.krieger.ut...@gmail.com>
Date: Mon Jul 7 23:22:50 2014 +0300
appletalk: Fix socket referencing in skb
Setting just skb->sk without taking its reference and setting a
destructor is invalid. However, in the places where this was done, skb
is used in a way not requiring skb->sk setting. So dropping the setting
of skb->sk.
Thanks to Eric Dumazet <eric.duma...@gmail.com> for correct solution.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79441
Reported-by: Ed Martin <edman...@edman007.com>
Signed-off-by: Andrey Utkin <andrey.krieger.ut...@gmail.com>
Signed-off-by: Eric Dumazet <eduma...@google.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
In the linux-3.12.y branch from kernel.org that commit has the following
sha1:
commit aabe442e0e2f108c81e413118defbe4e9ea0fa4d
Author: Andrey Utkin <andrey.krieger.ut...@gmail.com>
Date: Mon Jul 7 23:22:50 2014 +0300
appletalk: Fix socket referencing in skb
[ Upstream commit 36beddc272c111689f3042bf3d10a64d8a805f93 ]
Setting just skb->sk without taking its reference and setting a
destructor is invalid. However, in the places where this was done, skb
is used in a way not requiring skb->sk setting. So dropping the setting
of skb->sk.
Thanks to Eric Dumazet <eric.duma...@gmail.com> for correct solution.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79441
Reported-by: Ed Martin <edman...@edman007.com>
Signed-off-by: Andrey Utkin <andrey.krieger.ut...@gmail.com>
Signed-off-by: Eric Dumazet <eduma...@google.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
I think the different commit sha1 comes from previous changes in the
rpi-3.12.y tree, which then maybe creates new sha1 ids?
Is there any way to find only the *real* difference between these branches?
Maybe not based on commit sha1 key?
Best regards,
Matthias
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
