Messages in this thread | | | Date | Fri, 08 Aug 2014 00:05:27 +0200 | From | Richard Weinberger <> | Subject | Re: [GIT PULL] Global signal cleanup |
| |
Am 07.08.2014 22:47, schrieb Richard Weinberger: > Thanks for the clarification. > > Here is what happened: > > Branch signal_v4 is in linux-next, it never got rebased. > While preparing the pull request I noticed that some of the patches gained new acks > from various architectures. > So I took the *local* copy of signal_v4 added these acks using git rebase and rebased them to v3.16. > Then I've pushed that branch to signal-cleanup and sent you the request. > signal-cleanup did not exist before that. > My fault was rebasing my work from v3.16-rc6 to v3.16 before pushing it. > It won't happen again. But I never did a push -f or something like that. > > If you feel better you can still pull from: > git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git signal_v4 > > It is the as-is branch from linux-next.
Btw: This is how you can verify that I did not alter any code between the branch in linux-next and the one in the pull request:
$ git branch prove_signal_v4 v3.16 $ git branch prove_signal-cleanup v3.16 $ git checkout prove_signal_v4 $ git pull git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git signal_v4 $ git checkout prove_signal-cleanup $ git pull git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git signal-cleanup $ git diff prove_signal_v4..prove_signal-cleanup | wc -l 0
Again, sorry for any inconvenience caused.
Thanks, //richard
| |