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=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham 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 EB1EFC43219 for ; Fri, 3 May 2019 01:21:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B26FD2085A for ; Fri, 3 May 2019 01:21:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="tAyFz3W2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726427AbfECBVD (ORCPT ); Thu, 2 May 2019 21:21:03 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:37385 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726022AbfECBVC (ORCPT ); Thu, 2 May 2019 21:21:02 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 44wDpy5wr6z9s9y; Fri, 3 May 2019 11:20:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1556846459; bh=78DbnTNk/myUa0YRgU5OapL3zHwOgBk3no9C0Rzfw5I=; h=Date:From:To:Cc:Subject:From; b=tAyFz3W2q+hn6puBHPfGT8/k2E26T+2EHL/dIxnajHGyVh6f+CLHCrEAJ3Nva8JWO YHVl94uuKfwKr5wHoYj2UU18UVW6rFU9AHZjyMvVo5zmph6o90i+LToF9s0YjC6l4P MNgcBpXS1pIo/c56tlLUwjweoucqfqKbHWCd+HLUgz/SToiCMB0aP88uRuYmIqvXtI 68NzvFwSpciTmgnleUwVtudIkcW8k9QDyJoDzMPW50YsQ3Gu0LN8754IAdr5+K+jTu 7IzgiXVAHfUDTwRoxEqw8h5iBu6/M/98Yz9s1mfjkr7GvjLUVdCY3369QRdJua2TBy AcS6wfyr5EzGA== Date: Fri, 3 May 2019 11:20:58 +1000 From: Stephen Rothwell To: Al Viro , Masahiro Yamada Cc: Linux Next Mailing List , Linux Kernel Mailing List , David Howells Subject: linux-next: manual merge of the vfs tree with the kbuild tree Message-ID: <20190503112058.51336cd2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/N64jm+8l.uMFzxF4YR8ioZQ"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/N64jm+8l.uMFzxF4YR8ioZQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vfs tree got a conflict in: samples/Makefile between commit: a757ed09d672 ("samples: guard sub-directories with CONFIG options") from the kbuild tree and commit: f1b5618e013a ("vfs: Add a sample program for the new mount API") from the vfs 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. --=20 Cheers, Stephen Rothwell diff --cc samples/Makefile index 0f2d70d785f5,95d71ffd62d5..000000000000 --- a/samples/Makefile +++ b/samples/Makefile @@@ -1,21 -1,6 +1,21 @@@ +# SPDX-License-Identifier: GPL-2.0 # Makefile for Linux samples code =20 -obj-$(CONFIG_SAMPLES) +=3D kobject/ kprobes/ trace_events/ livepatch/ \ - hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \ - configfs/ connector/ v4l/ trace_printk/ \ - vfio-mdev/ vfs/ qmi/ binderfs/ +obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) +=3D binderfs/ +obj-$(CONFIG_SAMPLE_CONFIGFS) +=3D configfs/ +obj-$(CONFIG_SAMPLE_CONNECTOR) +=3D connector/ +subdir-y +=3D hidraw +obj-$(CONFIG_SAMPLE_HW_BREAKPOINT) +=3D hw_breakpoint/ +obj-$(CONFIG_SAMPLE_KDB) +=3D kdb/ +obj-$(CONFIG_SAMPLE_KFIFO) +=3D kfifo/ +obj-$(CONFIG_SAMPLE_KOBJECT) +=3D kobject/ +obj-$(CONFIG_SAMPLE_KPROBES) +=3D kprobes/ +obj-$(CONFIG_SAMPLE_LIVEPATCH) +=3D livepatch/ +obj-$(CONFIG_SAMPLE_QMI_CLIENT) +=3D qmi/ +obj-$(CONFIG_SAMPLE_RPMSG_CLIENT) +=3D rpmsg/ +subdir-$(CONFIG_SAMPLE_SECCOMP) +=3D seccomp - subdir-$(CONFIG_SAMPLE_STATX) +=3D statx ++subdir-$(CONFIG_SAMPLE_VFS) +=3D vfs +obj-$(CONFIG_SAMPLE_TRACE_EVENTS) +=3D trace_events/ +obj-$(CONFIG_SAMPLE_TRACE_PRINTK) +=3D trace_printk/ +obj-$(CONFIG_VIDEO_PCI_SKELETON) +=3D v4l/ +obj-y +=3D vfio-mdev/ --Sig_/N64jm+8l.uMFzxF4YR8ioZQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzLl3oACgkQAVBC80lX 0GyrEAf7BSGoO46Jk1cooZRmJFrWn9IvYS7DhIYtLoa64TxgHKaJPGXyqvTcn5h8 DqjObvygN6PGwIxeXjfoj/TX4BBZd3vYTE7obcB4KJcysAeiMn2UU7Oyii2zoWFM /c6RQz31K/yWsPPo58b0b7Cqz+AObXiijcYVO1rZoR999LHyEmqA6WaJSUixhlrS KjlavZUVkwspxUqDbzm1OtcprLFPadAZMYEQQJv2VcleI6ayvI29ah/9QK6tCzYV t2dCgUsK3kHJUVIH+uLFF9NWjUiT8fYQ1DWMDGFojuyF+PCKRh16deQk0hQ2G90d XK01NnjqHH4AoKMqbdlYDCr9BWzG5A== =xQvL -----END PGP SIGNATURE----- --Sig_/N64jm+8l.uMFzxF4YR8ioZQ--