public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"Steven J. Hill" <Steven.Hill@imgtec•com>,
	"Kirill A. Shutemov" <kirill@shutemov•name>
Subject: linux-next: manual merge of the mips tree with Linus' tree
Date: Sun, 22 Feb 2015 11:15:28 +1100	[thread overview]
Message-ID: <20150222111528.3b66e61c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
arch/mips/include/asm/pgtable-bits.h between commit b32da82e28ce
("mips: drop _PAGE_FILE and pte_file()-related helpers") from Linus'
tree and commit 05f9883a2899 ("MIPS: Usage and cosmetic cleanups of
page table bits.") from the mips 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 arch/mips/include/asm/pgtable-bits.h
index fc807aa5ec8d,156fd6eb1e03..000000000000
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@@ -167,9 -150,13 +150,9 @@@
  
  #endif /* defined(CONFIG_PHYS_ADDR_T_64BIT && defined(CONFIG_CPU_MIPS32) */
  
- #ifndef _PFN_SHIFT
- #define _PFN_SHIFT		    PAGE_SHIFT
- #endif
 -/*
 - * _PAGE_FILE semantics: set:pagecache unset:swap
 - */
 -#define _PAGE_FILE		_PAGE_MODIFIED
+ #define _PAGE_SILENT_READ	_PAGE_VALID
+ #define _PAGE_SILENT_WRITE	_PAGE_DIRTY
+ 
  #define _PFN_MASK		(~((1 << (_PFN_SHIFT)) - 1))
  
  #ifndef _PAGE_NO_READ

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

next             reply	other threads:[~2015-02-22  0:15 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-22  0:15 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-25  0:05 linux-next: manual merge of the mips tree with Linus' tree Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-08-07  0:25 Stephen Rothwell
2019-08-07  7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-07-11  0:04 Stephen Rothwell
2017-01-03  0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25  7:42 ` Ralf Baechle
2015-10-01  1:13 Stephen Rothwell
2015-02-22  0:22 Stephen Rothwell
2015-02-13  0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03  0:50 Stephen Rothwell
2012-10-04  0:35 Stephen Rothwell
2012-10-01  3:58 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15  7:26 ` Michal Simek
2009-12-15 19:27   ` Ralf Baechle
2009-08-18  8:23 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=20150222111528.3b66e61c@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=Steven.Hill@imgtec$(echo .)com \
    --cc=kirill@shutemov$(echo .)name \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=ralf@linux-mips$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox