From: Ingo Molnar <mingo@kernel•org>
To: "Luis R. Rodriguez" <mcgrof@suse•com>
Cc: akpm@linux-foundation•org, Borislav Petkov <bp@suse•de>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, Fengguang Wu <fengguang.wu@intel•com>
Subject: Re: patch reverts on linux-next - ioremap_uc() for atyfb
Date: Wed, 29 Jul 2015 10:05:18 +0200 [thread overview]
Message-ID: <20150729080518.GA9277@gmail.com> (raw)
In-Reply-To: <20150728200549.GG30479@wotan.suse.de>
* Luis R. Rodriguez <mcgrof@suse•com> wrote:
> Andrew,
>
> I got a notice from Ingo on July 21 that one of my patches, "x86/mm,
> asm-generic: Add IOMMU ioremap_uc() variant default" was merged into tip. It
> was merged a long with other patches, for example:
>
> http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/video/fbdev/aty/atyfb_base.c?id=3cc2dac5be3f23414a4efdee0b26d79bed297cac
>
> I wrote this patch after Boris had my atyfb series bake on his tree
> as his tree receives 0-day tests. Then this patch for example makes use of
> ioremap_uc():
>
> "drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC"
>
> I noticed though that on top there's a revert of that same patch:
>
> http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/video/fbdev/aty/atyfb_base.c?id=4c090fb7209d523ef4cedb354192a190edd0d166
>
> Revert "drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC" akpm-base
> This reverts commit 3cc2dac5be3f23414a4efdee0b26d79bed297cac.
>
> It doesn't explain why this was reverted though. Is it OK for things be
> reverted like this ?
The revert Stephen has done were only temporary, done for the throw-away
linux-next integration branch, to make sure linux-next builds on the architectures
your patch broke.
I've applied your fix to -tip, and after some testing will push it out to
linux-next - at that point the temporary reverts will not be needed in linux-next
anymore and will be dropped. They won't ever go upstream.
Thanks,
Ingo
prev parent reply other threads:[~2015-07-29 8:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 20:05 patch reverts on linux-next - ioremap_uc() for atyfb Luis R. Rodriguez
2015-07-28 20:44 ` Andrew Morton
2015-08-05 23:25 ` Luis R. Rodriguez
2015-07-29 0:59 ` Fengguang Wu
2015-08-05 23:24 ` Luis R. Rodriguez
2015-07-29 8:05 ` Ingo Molnar [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=20150729080518.GA9277@gmail.com \
--to=mingo@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bp@suse$(echo .)de \
--cc=fengguang.wu@intel$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcgrof@suse$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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