linux-kernel - linux-next: manual merge of the mm tree with the folio 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, 12 May 2022 18:26:50 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Matthew Wilcox <willy@...radead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ryusuke Konishi <konishi.ryusuke@...il.com>,
        Yang Li <yang.lee@...ux.alibaba.com>
Subject: linux-next: manual merge of the mm tree with the folio tree

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

  fs/nilfs2/inode.c

between commit:

  f132ab7d3ab0 ("fs: Convert mpage_readpage to mpage_read_folio")

from the folio tree and commit:

  e38ed506c42f ("nilfs2: Fix some kernel-doc comments")

from the mm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/nilfs2/inode.c
index 538ca5473b0d,6a00cf324cbd..000000000000
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@@ -140,14 -140,14 +140,14 @@@ int nilfs_get_block(struct inode *inode
  }
  
  /**
 - * nilfs_readpage() - implement readpage() method of nilfs_aops {}
 + * nilfs_read_folio() - implement read_folio() method of nilfs_aops {}
   * address_space_operations.
-  * @file - file struct of the file to be read
-  * @folio - the folio to be read
+  * @file: file struct of the file to be read
 - * @page: the page to be read
++ * @folio: the folio to be read
   */
 -static int nilfs_readpage(struct file *file, struct page *page)
 +static int nilfs_read_folio(struct file *file, struct folio *folio)
  {
 -	return mpage_readpage(page, nilfs_get_block);
 +	return mpage_read_folio(folio, nilfs_get_block);
  }
  
  static void nilfs_readahead(struct readahead_control *rac)

Content of type "application/pgp-signature" skipped