From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jann Horn <jannh@google•com>
Subject: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Fri, 18 Oct 2019 14:26:16 +1100 [thread overview]
Message-ID: <20191018142616.7d6a7594@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/android/binder.c
between commit:
45d02f79b539 ("binder: Don't modify VMA bounds in ->mmap handler")
from the char-misc.current tree and commit:
990be7476485 ("binder: Use common definition of SZ_1K")
from the char-misc 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 drivers/android/binder.c
index 265d9dd46a5e,bef788058bc3..000000000000
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@@ -92,11 -93,10 +93,6 @@@ static atomic_t binder_last_id
static int proc_show(struct seq_file *m, void *unused);
DEFINE_SHOW_ATTRIBUTE(proc);
- /* This is only defined in include/asm-arm/sizes.h */
- #ifndef SZ_1K
- #define SZ_1K 0x400
-#ifndef SZ_4M
-#define SZ_4M 0x400000
--#endif
--
#define FORBIDDEN_MMAP_FLAGS (VM_WRITE)
enum {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-10-18 5:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 3:26 Stephen Rothwell [this message]
2019-10-18 10:06 ` linux-next: manual merge of the char-misc tree with the char-misc.current tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2026-05-25 15:07 Mark Brown
2025-11-14 3:32 Stephen Rothwell
2025-11-14 19:10 ` Dinh Nguyen
2025-10-24 1:49 Stephen Rothwell
2025-10-24 5:24 ` Greg KH
2021-12-06 3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2018-12-04 4:35 Stephen Rothwell
2018-12-04 7:42 ` Greg KH
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
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=20191018142616.7d6a7594@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=jannh@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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