All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	"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: Thu, 07 Aug 2014 09:35:56 +0200	[thread overview]
Message-ID: <53E32C5C.5010103@nod.at> (raw)
In-Reply-To: <20140807102823.7a743bdf@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1747 bytes --]

Am 07.08.2014 02:28, schrieb Stephen Rothwell:
> Hi Richard,
> 
> On Wed, 06 Aug 2014 13:29:10 +0200 Richard Weinberger <richard@nod.at> wrote:
>>
>> Am 06.08.2014 13:27, schrieb Stephen Rothwell:
>>>
>>> On Wed, 06 Aug 2014 13:18:54 +0200 Richard Weinberger <richard@nod.at> wrote:
>>>>
>>>> the following changes since commit 19583ca584d6f574384e17fe7613dfaeadcdc4a6:
>>>>
>>>>   Linux 3.16 (2014-08-03 15:25:02 -0700)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>   git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git signal-cleanup
>>>
>>> This has all been rebased onto v3.16 but none of the patches changed.
>>
>> This was my indention. Also I've added some acks.
>> Did I screw something up?
> 
> We discourage people from rebasing their trees just before asking Linus
> to pull them unless they have a good reason.  Adding Acks is not
> necessarily a good reason.  It may be a different thing if you rewrite
> your tree (without changing it base) and, given that none of your
> actual patches changed, that would have worked for you.
> 
> In your case, since you haven't updated the branch (signal_v4) that I
> fetch for linux-next, its doubly bad as, after Linus' pulls your tree,
> I will have two copies of all those patches in my tree - which could
> easily lead to conflicts that I really don't need to have.
> 
> Also, note that the fact that the actual patches did not change at all
> means that either you missed some change that coudl have justified the
> rebase, or the rebase was unnecessary (since the things you are
> patching did not change).
> 

Thanks for the kind explanation.
It would be nice to see these rules written down somewhere.

Thanks,
//richard


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2014-08-07  7:36 UTC|newest]

Thread overview: 11+ 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:27 ` Stephen Rothwell
2014-08-06 11:29   ` Richard Weinberger
2014-08-07  0:28     ` Stephen Rothwell
2014-08-07  7:35       ` Richard Weinberger [this message]
2014-08-07 18:53         ` Linus Torvalds
2014-08-07 20:47           ` Richard Weinberger
2014-08-07 22:05             ` Richard Weinberger
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=53E32C5C.5010103@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.