From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C0BEC4CEC7 for ; Mon, 16 Sep 2019 01:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D5D9206C2 for ; Mon, 16 Sep 2019 01:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568596981; bh=xxgZ1Q3z3vmCEsSNVt/oxyS2I9d6nQzQpHN46hLwkrI=; h=Date:From:To:Cc:Subject:List-ID:From; b=kkxR9rAKJ3t4o+KUHLeQYrkz2BLO/HOrlwywBCrFtHufPLOYkw3NU0nKNGBh/EVK/ ZxNUEaVAZdIgnNfUadm8wLyOzWzLywcZicXan6xskOvCaZLtOYL5v8O9ucWLeyjdHN 12toliuo1/sxQVO+lCKphZ9t1Cu5G/henEZuuVUg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729040AbfIPBXA (ORCPT ); Sun, 15 Sep 2019 21:23:00 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:52790 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728872AbfIPBXA (ORCPT ); Sun, 15 Sep 2019 21:23:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+2NX8howexdlblQAhSP9/O3k5EI3/NQZYnxbZcI+KRA=; b=m0mxagbs/RC0Mj3LmrSfAKj/s WXVzv0nmqlqn28vZ3EhfykxBTWX5WjCG4dCF/PlPsHFHEPU6J0hBQB6rdM4vTTr4HYaLV4mPatHfk gPgOTdhOB4I53GmBTeyrVI+E3stKqkBF3yvmRW5J6UiCqgSUzARZobDUhVwnd/2wgrCdA=; Received: from ypsilon.sirena.org.uk ([2001:470:1f1d:6b5::7]) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9fjC-00027l-Gh; Mon, 16 Sep 2019 01:22:54 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 558192741587; Mon, 16 Sep 2019 02:22:53 +0100 (BST) Date: Mon, 16 Sep 2019 02:22:53 +0100 From: Mark Brown To: Greg KH , Arnd Bergmann , David Howells , Christian Brauner , Al Viro , Hridya Valsaraju Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the char-misc tree with the vfs tree Message-ID: <20190916012252.GS4352@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="YvpO9wCO44Ze8QQC" Content-Disposition: inline X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --YvpO9wCO44Ze8QQC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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") =66rom the vfs tree and commit: f00834518ed31 ("binder: add a mount option to show global stats") =66rom 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. --YvpO9wCO44Ze8QQC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1+4+sACgkQJNaLcl1U h9DlKgf/aEhp80KPdPQ3byacESVuhc/yB4CJZpnFNEVataQ8UCrKspNsRvT48dZY PyLC/7PFocuteecFxfL3VgrOjaljcBHQl4wQkQCnrsGgx5VRl+kSXdY7I8UcAWNB TtZl0AAjUT9rP9bqj8gy6XkjRE/0qE3Q+WxP36QtUuSlqVMZtcm27I3KB8GboWQA +E7stmjwCoLuraybxPfhs8PvNAzSft+ggMoCFJ6JcTK151ayAPSRykNbLs3cTgAd ot/CzQCRPBMsW+pL3UtARX8HQAyGhYKDjpyKuIINTubINGdgl/n82zSPOl7udohz x7UnY0TBcKfwwImzuQTJ/XFfLUL0Lg== =6x7Z -----END PGP SIGNATURE----- --YvpO9wCO44Ze8QQC--