linux-kernel - linux-next: manual merge of the akpm-current tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 25 Sep 2014 17:47:30 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Liviu Dudau <Liviu.Dudau@....com>,
	Peter Feiner <pfeiner@...gle.com>
Subject: linux-next: manual merge of the akpm-current tree with the pci tree

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@...b.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);
+ 	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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)