linux-kernel - linux-next: manual merge of the folio tree with Linus' 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>] [day] [month] [year] [list]

Date:   Tue, 14 Jun 2022 13:39:37 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Matthew Wilcox <willy@...radead.org>
Cc:     David Howells <dhowells@...hat.com>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the folio tree with Linus' tree

Hi all,

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

  include/linux/netfs.h

between commit:

  e81fb4198e27 ("netfs: Further cleanups after struct netfs_inode wrapper introduced")

from Linus' tree and commit:

  0463e729a56d ("netfs: Remove extern from function prototypes")

from the folio 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 include/linux/netfs.h
index 097cdd644665,065163d50688..000000000000
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@@ -276,19 -275,17 +276,18 @@@ struct netfs_cache_ops 
  };
  
  struct readahead_control;
- extern void netfs_readahead(struct readahead_control *);
+ void netfs_readahead(struct readahead_control *);
  int netfs_read_folio(struct file *, struct folio *);
- extern int netfs_write_begin(struct netfs_inode *,
- 			     struct file *, struct address_space *,
- 			     loff_t, unsigned int, struct folio **,
- 			     void **);
- 
- extern void netfs_subreq_terminated(struct netfs_io_subrequest *, ssize_t, bool);
- extern void netfs_get_subrequest(struct netfs_io_subrequest *subreq,
- 				 enum netfs_sreq_ref_trace what);
- extern void netfs_put_subrequest(struct netfs_io_subrequest *subreq,
- 				 bool was_async, enum netfs_sreq_ref_trace what);
- extern void netfs_stats_show(struct seq_file *);
 -int netfs_write_begin(struct file *, struct address_space *, loff_t pos,
 -		      unsigned int len, struct folio **, void **fsdata);
++int netfs_write_begin(struct netfs_inode *, struct file *,
++		      struct address_space *, loff_t pos, unsigned int len,
++		      struct folio **, void **fsdata);
+ 
+ void netfs_subreq_terminated(struct netfs_io_subrequest *, ssize_t, bool);
+ void netfs_get_subrequest(struct netfs_io_subrequest *subreq,
+ 			  enum netfs_sreq_ref_trace what);
+ void netfs_put_subrequest(struct netfs_io_subrequest *subreq,
+ 			  bool was_async, enum netfs_sreq_ref_trace what);
+ void netfs_stats_show(struct seq_file *);
  
  /**
   * netfs_inode - Get the netfs inode context from the inode

Content of type "application/pgp-signature" skipped