| Message ID | 20200905141001.18356cd4@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the akpm-current tree with the net-next tree | expand |
diff --cc mm/filemap.c index 78d07a712112,054d93a86f8a..000000000000 --- a/mm/filemap.c
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: mm/filemap.c between commit: 76cd61739fd1 ("mm/error_inject: Fix allow_error_inject function signatures.") from the net-next tree and commit: 2cb138387ead ("mm/filemap: fix storing to a THP shadow entry") from the akpm-current 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.