From: Junio C Hamano <gitster@pobox.com>
To: Junio C Hamano <junio@pobox.com>
Cc: ebiederm@xmission.com (Eric W. Biederman),
Linus Torvalds <torvalds@linux-foundation.org>,
Git List Mailing <git@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Oleg Nesterov <oleg@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Kees Cook <keescook@chromium.org>,
Linux API <linux-api@vger.kernel.org>
Subject: Re: [GIT PULL] per signal_struct coredumps
Date: Thu, 18 Nov 2021 01:29:08 -0800 [thread overview]
Message-ID: <xmqqk0h5yfq3.fsf@gitster.g> (raw)
In-Reply-To: xmqq8rxobj1k.fsf@gitster.g
Junio C Hamano <junio@pobox.com> writes:
> Y--- (Linus's tree)
> / Linus pulls from subsystem maintainer
> \ \ \ \ /
> ---x---x---M---x---x---N (Subsystem maintainer's tree)
> / /
> / /
> ...---o---o---p---p---p (Your tree)
>
> The above picture only depicts two topics, one directly building on
> top of the other, from you, but that is simplified merely for
> illustration purposes. The real history may have more topics, some
> are dependent on others, while some are independent.
>
> Now, if you have many related but more or less independent topic
> branches that will support a larger theme, it would be quite natural
> if you acted as your own "subsystem" maintainer, in other words, in
> ...
> and offer 'N' as the tip of a "larger" topic that has internal
> structure, not just a single strand of pearls, by adding a signed
> tag on 'N' and throwing a pull request at Linus (or whoever is
> immediately above your level).
>
> Is that what happened (as I said, I lack context)? If so, I do not
> see much problem in the situation. But this assumes that these so
> called "fake" merges are merging into right first parents.
Addendum.
If you have only one topic (i.e. you do not have o-o and p-p-p in
the above picture, but just o-o), then it would be quite strange to
create M and offer it to the upstream, as M's first parent, as well
as the bottom of the o-o chain, would be something the upstream has
and the merge would look redundant from upstream's point of view, as
they will be creating another merge of their tip and M, at which
point they'd rather merge the topmost commit in the o-o chain
directly without having to deal with M.
prev parent reply other threads:[~2021-11-18 9:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 19:07 [GIT PULL] per signal_struct coredumps Eric W. Biederman
2021-11-03 19:32 ` pr-tracker-bot
2021-11-03 19:34 ` Linus Torvalds
2021-11-05 16:37 ` Eric W. Biederman
2021-11-13 19:14 ` Linus Torvalds
2021-11-14 6:32 ` Junio C Hamano
2021-11-14 9:36 ` Ævar Arnfjörð Bjarmason
2021-11-14 17:16 ` Eric W. Biederman
2021-11-16 6:49 ` Junio C Hamano
2021-11-16 8:29 ` Junio C Hamano
2021-11-16 15:14 ` Eric W. Biederman
2021-11-18 9:29 ` Junio C Hamano [this message]
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=xmqqk0h5yfq3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ebiederm@xmission.com \
--cc=git@vger.kernel.org \
--cc=junio@pobox.com \
--cc=keescook@chromium.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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