LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Andreas Gruenbacher <agruenba@redhat.com>
Cc: cluster-devel <cluster-devel@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>,
	"Tobin C. Harding" <me@tobin.cc>
Subject: Re: GFS2: Pull Request
Date: Wed, 8 May 2019 13:21:14 -0700	[thread overview]
Message-ID: <CAHk-=whqKCxGfh8RfR15Xz-pB1SuyX3cJRAo90=Bww4rNS6bqA@mail.gmail.com> (raw)
In-Reply-To: <CAHc6FU40HucCUzx5k2obs8m6dXS08NmXBM-tFOq7fSbLduHiGw@mail.gmail.com>

On Wed, May 8, 2019 at 1:17 PM Andreas Gruenbacher <agruenba@redhat.com> wrote:
>
> Would it make sense to describe how to deal with merge conflicts in
> Documentation/maintainer/pull-requests.rst to stop people from getting
> this wrong over and over again?

Probably. I do think it got written up at some point (lwn or something
like that), but it's possible it never got made into an actual
documentation file..

Anybody want to try to massage that email into the appropriate doc file?

              Linus

  reply	other threads:[~2019-05-08 20:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 11:48 Andreas Gruenbacher
2019-05-08 17:55 ` Linus Torvalds
2019-05-08 18:06   ` Linus Torvalds
2019-05-08 20:17     ` Andreas Gruenbacher
2019-05-08 20:21       ` Linus Torvalds [this message]
2019-05-08 20:58       ` Jonathan Corbet
2019-05-08 21:05         ` Linus Torvalds
2019-05-08 21:50           ` Jonathan Corbet
2019-05-28 18:55   ` cross-merges with MFD tree (was: Re: GFS2: Pull Request) Jacek Anaszewski
2019-05-29 11:40     ` Lee Jones
  -- strict thread matches above, loose matches on Subject: below --
2010-05-18  8:38 GFS2: Pull request Steven Whitehouse
2010-03-02 11:03 Steven Whitehouse
2009-12-03 15:01 Steven Whitehouse
2009-09-14  8:08 Steven Whitehouse
2009-06-11 10:51 Steven Whitehouse
2009-04-15 11:26 Steven Whitehouse
2009-03-24 12:20 Steven Whitehouse
2009-01-05  9:34 Steven Whitehouse
2008-01-25  9:46 GFS2 " Steven Whitehouse

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='CAHk-=whqKCxGfh8RfR15Xz-pB1SuyX3cJRAo90=Bww4rNS6bqA@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=agruenba@redhat.com \
    --cc=cluster-devel@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@tobin.cc \
    --subject='Re: GFS2: Pull Request' \
    /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

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).