linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>,
	Paul Burton <paulburton@kernel.org>,
	James Hogan <jhogan@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
	linux-mips <linux-mips@vger.kernel.org>,
	linux-arch <linux-arch@vger.kernel.org>,
	lkml <linux-kernel@vger.kernel.org>
Subject: Re: RFC: kill off ioremap_nocache
Date: Mon, 9 Dec 2019 20:48:19 +0100	[thread overview]
Message-ID: <20191209194819.GA28157@lst.de> (raw)
In-Reply-To: <CAADWXX9zEBT-NPCwE09D+6=8iCZ+kCmdyXoGrTKhnmYn82XEJQ@mail.gmail.com>

On Mon, Dec 09, 2019 at 10:48:20AM -0800, Linus Torvalds wrote:
> How many conflicts will this result in generally? I like it, but I'd
> like to have some idea of whether it ends up being one of those
> "really painful churn" things?
> 
> A couple of conflicts isn't an issue - they'll be trivial to fix. It's
> the "this causes fifty silly conflicts" that I worry about, partly
> because it then makes submaintainers inevitably do the wrong thing (ie
> "I foresee an excessive amount of 'git rebase' rants next release").

I had about a dozend and a half conflicts rebasing this weekend,
the previous version was approx -rc6 IIRC.

  reply	other threads:[~2019-12-09 19:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 13:58 Christoph Hellwig
2019-12-09 13:58 ` [PATCH 1/2] MIPS: define ioremap_nocache to ioremap Christoph Hellwig
2019-12-09 18:46   ` Paul Burton
     [not found] ` <20191209135823.28465-3-hch@lst.de>
2019-12-09 15:58   ` [PATCH 2/2] remove ioremap_nocache and devm_ioremap_nocache Arnd Bergmann
2019-12-09 18:48 ` RFC: kill off ioremap_nocache Linus Torvalds
2019-12-09 19:48   ` Christoph Hellwig [this message]
2019-12-17 18:35   ` Christoph Hellwig

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=20191209194819.GA28157@lst.de \
    --to=hch@lst.de \
    --cc=arnd@arndb.de \
    --cc=jhogan@kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=paulburton@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: RFC: kill off ioremap_nocache' \
    /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).