All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Whitehouse <swhiteho@redhat.com>,
	Bob Peterson <rpeterso@redhat.com>
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: rebase and update of the gfs2 tree
Date: Fri, 11 Jun 2021 08:11:35 +1000	[thread overview]
Message-ID: <20210611081135.3245330a@canb.auug.org.au> (raw)

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

Hi all,

So yesterday I reported a conflict between the vfs and gfs2 trees.
Today it has been "fixed" by the gfs2 tree rebasing and merging a
topic branch from the vfs tree.  Unfortunately, that topic branch has
been rebased in the vfs tree today, so now in linux-next I will have
two (slightly different) versions of that vfs tree topic branch (and
presumably I will get more conflicts).

Please think about what is wrong with this situation.  Hint: two already
published branches have been rebased/rewritten.  And maybe there has
been a lack of communication between developers.

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2021-06-10 22:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10 22:11 Stephen Rothwell [this message]
2021-06-10 22:37 ` linux-next: rebase and update of the gfs2 tree Stephen Rothwell

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=20210611081135.3245330a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agruenba@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rpeterso@redhat.com \
    --cc=swhiteho@redhat.com \
    --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 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.