From: Richard Weinberger <richard@nod.at>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Linux-Arch <linux-arch@vger.kernel.org>
Subject: Re: [GIT PULL] Global signal cleanup
Date: Fri, 08 Aug 2014 00:05:27 +0200 [thread overview]
Message-ID: <53E3F827.9030902@nod.at> (raw)
In-Reply-To: <53E3E5C8.9090408@nod.at>
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
next prev parent reply other threads:[~2014-08-07 22:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-06 11:18 [GIT PULL] Global signal cleanup Richard Weinberger
2014-08-06 11:18 ` Richard Weinberger
2014-08-06 11:27 ` Stephen Rothwell
2014-08-06 11:29 ` Richard Weinberger
2014-08-07 0:28 ` Stephen Rothwell
2014-08-07 7:35 ` Richard Weinberger
2014-08-07 18:53 ` Linus Torvalds
2014-08-07 20:47 ` Richard Weinberger
2014-08-07 20:47 ` Richard Weinberger
2014-08-07 22:05 ` Richard Weinberger [this message]
2014-08-08 3:21 ` Stephen Rothwell
2014-08-08 3:21 ` Stephen Rothwell
2014-08-07 20:44 ` Vineet Gupta
2014-08-09 9:17 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53E3F827.9030902@nod.at \
--to=richard@nod.at \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).