From: Peter Feiner <pfeiner@google.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Liviu Dudau <Liviu.Dudau@arm.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the pci tree
Date: Thu, 25 Sep 2014 12:30:00 -0700 [thread overview]
Message-ID: <20140925193000.GA26946@google.com> (raw)
In-Reply-To: <20140925174730.302842e6@canb.auug.org.au>
On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/asm-generic/pgtable.h between commit b766eafe6828 ("PCI: Add
> pci_remap_iospace() to map bus I/O resources") from the pci tree and
> commit 4cc2f91f2636 ("mm: softdirty: enable write notifications on VMAs
> after VM_SOFTDIRTY cleared") from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc include/asm-generic/pgtable.h
> index 977e545a64c3,f6acf1195182..000000000000
> --- a/include/asm-generic/pgtable.h
> +++ b/include/asm-generic/pgtable.h
> @@@ -249,10 -249,18 +249,22 @@@ static inline int pmd_same(pmd_t pmd_a
> #define pgprot_writecombine pgprot_noncached
> #endif
>
> +#ifndef pgprot_device
> +#define pgprot_device pgprot_noncached
> +#endif
> +
> + #ifndef pgprot_modify
> + #define pgprot_modify pgprot_modify
> + static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
> + {
> + if (pgprot_val(oldprot) == pgprot_val(pgprot_noncached(oldprot)))
> + newprot = pgprot_noncached(newprot);
> + if (pgprot_val(oldprot) == pgprot_val(pgprot_writecombine(oldprot)))
> + newprot = pgprot_writecombine(newprot);
For completeness of the arch-independent pgprot-modify,
if (pgprot_val(oldprot) == pgprot_val(pgprot_device(oldprot)))
newprot = pgprot_device(newprot);
should be added here.
> + return newprot;
> + }
> + #endif
> +
> /*
> * When walking page tables, get the address of the next boundary,
> * or the end address of the range if that comes earlier. Although no
next prev parent reply other threads:[~2014-09-25 19:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 7:47 linux-next: manual merge of the akpm-current tree with the pci tree Stephen Rothwell
2014-09-25 19:30 ` Peter Feiner [this message]
2014-09-25 19:47 ` Andrew Morton
2014-09-26 9:00 ` Liviu Dudau
-- strict thread matches above, loose matches on Subject: below --
2018-07-10 6:57 Stephen Rothwell
2013-12-23 3:45 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=20140925193000.GA26946@google.com \
--to=pfeiner@google.com \
--cc=Liviu.Dudau@arm.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.