From: Mark Brown <broonie@kernel•org>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
David Howells <dhowells@redhat•com>,
Christian Brauner <christian@brauner•io>,
Al Viro <viro@zeniv•linux.org.uk>,
Hridya Valsaraju <hridya@google•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the vfs tree
Date: Mon, 16 Sep 2019 02:22:53 +0100 [thread overview]
Message-ID: <20190916012252.GS4352@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/android/binderfs.c
between commit:
e7d8840d4b626 ("vfs: Convert binderfs to use the new mount API")
from the vfs tree and commit:
f00834518ed31 ("binder: add a mount option to show global stats")
from the char-misc tree.
Since it's very late and it seems useful to try to get a -next out with
the state prior to the merge window opening I've used commit
ec13c78d7b45 from the previous -next build rather than fix this up
sorry, I'll come back to it tomorrow.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-16 1:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 1:22 Mark Brown [this message]
2019-09-16 22:40 ` linux-next: manual merge of the char-misc tree with the vfs tree Mark Brown
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=20190916012252.GS4352@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=christian@brauner$(echo .)io \
--cc=dhowells@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hridya@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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