From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Hellwig <hch@lst•de>, "Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Thomas Renninger <trenn@suse•de>
Subject: linux-next: manual merge of the set_fs tree with the pm tree
Date: Wed, 8 Jul 2020 17:44:35 +1000 [thread overview]
Message-ID: <20200708174435.36a8166b@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2020-07-08 7:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708174435.36a8166b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=trenn@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox