* linux-next: manual merge of the set_fs tree with the pm tree
@ 2020-07-08 7:44 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-07-08 7:44 UTC (permalink / raw)
To: Christoph Hellwig, Rafael J. Wysocki
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Thomas Renninger
[-- Attachment #1: Type: text/plain, Size: 833 bytes --]
Hi all,
Today's linux-next merge of the set_fs tree got a conflict in:
drivers/acpi/battery.c
between commit:
8830280a69dd ("ACPI: procfs: Remove last dirs after being marked deprecated for a decade")
from the pm tree and commit:
598d0996ea31 ("proc: switch over direct seq_read method calls to seq_read_iter")
from the set_fs tree.
I fixed it up (the former removed the code modified by the latter, so
I just did that) 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-08 7:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-08 7:44 linux-next: manual merge of the set_fs tree with the pm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).