From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Liam Howlett <liam.howlett@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the char-misc.current tree with the mm-hotfixes tree
Date: Fri, 19 Aug 2022 08:28:18 +1000 [thread overview]
Message-ID: <20220819082714.5313827d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
Hi all,
Today's linux-next merge of the char-misc.current tree got a conflict in:
drivers/android/binder_alloc.c
between commit:
b3bb668f3dc6 ("binder_alloc: add missing mmap_lock calls when using the VMA")
from the mm-hotfixes tree and commit:
d6f35446d076 ("binder_alloc: Add missing mmap_lock calls when using the VMA")
from the char-misc.current tree.
I fixed it up (I used the latter as it was committed later even though
the author times were the same) 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 --]
next reply other threads:[~2022-08-18 22:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-18 22:28 Stephen Rothwell [this message]
2022-08-19 6:36 ` linux-next: manual merge of the char-misc.current tree with the mm-hotfixes tree Greg KH
2022-08-19 8:40 ` Stephen Rothwell
2022-08-19 8:55 ` Greg KH
2022-08-19 13:35 ` Liam Howlett
2022-08-19 15:44 ` Greg KH
2022-08-19 20:35 ` Andrew Morton
2022-08-19 22:02 ` Liam Howlett
2022-08-19 22:55 ` Andrew Morton
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=20220819082714.5313827d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=liam.howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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