linux-next: manual merge of the bpf-next tree with the mm tree

[Mark Brown]

Hi all,

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

  mm/internal.h

between commit:

  c1b742df568b9 ("mm/hugetlb: localize struct huge_bootmem_page")

from the mm tree and commit:

  69d38c792c53a ("mm: Add copy_remote_mm_str()")

from the bpf-next 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.

diff --cc mm/internal.h
index 3b9fdb826162d,9e3be236f18c0..0000000000000
--- a/mm/internal.h
+++ b/mm/internal.h
@@@ -24,7 -23,17 +24,10 @@@
  #include "vma.h"
  
  struct folio_batch;
 -struct hstate;
  
+ int __copy_remote_mm_str(struct mm_struct *mm, unsigned long addr,
+ 		void *buf, int len, unsigned int gup_flags);
+ 
 -struct huge_bootmem_page {
 -	struct list_head list;
 -	struct hstate *hstate;
 -	unsigned long flags;
 -};
 -
  /* mm/workingset.c */
  bool workingset_test_recent(void *shadow, bool file, bool *workingset,
  			    bool flush);

Attachment: signature.asc
Description: PGP signature