linux-next: manual merge of the mm-hotfixes tree with Linus' tree

linux-next: manual merge of the mm-hotfixes tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  tools/testing/selftests/kselftest_harness.h

between commit:

  caed8eba2215 ("selftests: kselftest_harness: fix Clang warning about zero-length format")

from Linus' tree and commit:

  52124c13ec1f ("selftests/harness: remove use of LINE_MAX")

from the mm-hotfixes-unstable branch of the mm-hotfixes 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 tools/testing/selftests/kselftest_harness.h
index ba3ddeda24bf,f0ae1f6466db..000000000000
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@@ -1205,7 -1205,8 +1208,8 @@@ void __run_test(struct __fixture_metada
  		diagnostic = "unknown";
  
  	ksft_test_result_code(t->exit_code, test_name,
 -			      diagnostic ? "%s" : "", diagnostic);
 +			      diagnostic ? "%s" : NULL, diagnostic);
+ 	free(test_name);
  }
  
  static int test_harness_run(int argc, char **argv)

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

linux-next: manual merge of the mm-hotfixes tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  fs/afs/write.c

between commits:

  a2b6f2ab3e14 ("afs: Fix dangling folio ref counts in writeback")
  819da022dd00 ("afs: Fix waiting for writeback then skipping folio")

from Linus' tree and commits:

  4f243fa208e8 ("afs: fix dangling folio ref counts in writeback")
  c548e38a7cc3 ("afs: fix waiting for writeback then skipping folio")

from the mm-hotfixes tree.

I fixed it up (I used the version from Linus' tree) 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

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

linux-next: manual merge of the mm-hotfixes tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  4bc4bb3bf76a ("MAINTAINERS: repair pattern in DIALOG SEMICONDUCTOR DRIVERS")

from the mm-hotfixes tree and commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' 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 MAINTAINERS
index e0ad886d3163,789ceee3424a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6012,9 -6014,9 +6007,9 @@@ W:	http://www.dialog-semiconductor.com/
  F:	Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:	Documentation/devicetree/bindings/input/dlg,da72??.txt
  F:	Documentation/devicetree/bindings/mfd/da90*.txt
- F:	Documentation/devicetree/bindings/mfd/da90*.yaml
+ F:	Documentation/devicetree/bindings/mfd/dlg,da90*.yaml
 -F:	Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:	Documentation/devicetree/bindings/regulator/da92*.txt
 +F:	Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
  F:	Documentation/devicetree/bindings/regulator/slg51000.txt
  F:	Documentation/devicetree/bindings/sound/da[79]*.txt
  F:	Documentation/devicetree/bindings/thermal/da90??-thermal.txt


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

linux-next: manual merge of the mm-hotfixes tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

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

  mm/migrate.c

between commit:

  e77d587a2c04 ("mm: avoid gcc complaint about pointer casting")

from Linus' tree and commit:

  199b2f1adbff ("migrate_pages: silence gcc notes for mis-casting")

from the mm-hotfixes tree.

I fixed it up (I used the version from Linus' tree) 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

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