* linux-next: rebase and update of the gfs2 tree
@ 2021-06-10 22:11 Stephen Rothwell
2021-06-10 22:37 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-06-10 22:11 UTC (permalink / raw)
To: Steven Whitehouse, Bob Peterson
Cc: Andreas Gruenbacher, Al Viro, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: rebase and update of the gfs2 tree
2021-06-10 22:11 linux-next: rebase and update of the gfs2 tree Stephen Rothwell
@ 2021-06-10 22:37 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-06-10 22:37 UTC (permalink / raw)
To: Andreas Gruenbacher, Al Viro
Cc: Steven Whitehouse, Bob Peterson, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi all,
On Fri, 11 Jun 2021 08:11:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
Please read Documentation/maintainer/rebasing-and-merging.rst
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-10 22:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-10 22:11 linux-next: rebase and update of the gfs2 tree Stephen Rothwell
2021-06-10 22:37 ` Stephen Rothwell
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.