From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 53767C433F5
	for <linux-next@archiver.kernel.org>; Wed, 24 Nov 2021 00:38:31 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S230498AbhKXAli (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 23 Nov 2021 19:41:38 -0500
Received: from gandalf.ozlabs.org ([150.107.74.76]:38841 "EHLO
        gandalf.ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230266AbhKXAli (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 23 Nov 2021 19:41:38 -0500
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 4HzMYt5SLJz4xcK;
        Wed, 24 Nov 2021 11:38:26 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1637714308;
        bh=B7rrDtDcspEyxt8KXHSEFf7i51lb5phCWSVYpKaBdFU=;
        h=Date:From:To:Cc:Subject:From;
        b=cPioaWmnno9XmzbohZNvr/ecyfNgyqahn4J9zZ2qsV3KySwI6E7Dh8qaZhghoVcgg
         AU1S6kYjCK+FwZbRf0kJWWqvqQS1UDjEATM6T1oQfw689u7wAnvvNHeLy2V47UW2mL
         WDa9cpHWXspEmr/ExFJ/aAKqF0fGU78/Ye7PTrEP2D8dTSZsKdbc0L79VEvGPfjVxf
         KQaC+h3dhjlA+WwqsIEHAPlVL+FVVUXoyO8qbNLbiLmEDTP3j6EYO6WUfcJw1DlIba
         +VCw9saIYRvzrD5+cd/JjOBYmvKLNpaLAzf1lwWVDW4J0E5ldFcUJKTh5m1SP+hY7K
         PB6pnNgVHtmkQ==
Date:   Wed, 24 Nov 2021 11:38:25 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
        Jens Axboe <axboe@kernel.dk>
Cc:     Christoph Hellwig <hch@lst.de>,
        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 tomoyo tree with the block tree
Message-ID: <20211124113825.2d9de813@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/eDryevQj.qE_nL1MPiCA+YR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

--Sig_/eDryevQj.qE_nL1MPiCA+YR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the tomoyo tree got a conflict in:

  drivers/block/loop.c

between commit:

  3793b8e18186 ("block: rename GENHD_FL_NO_PART_SCAN to GENHD_FL_NO_PART")

from the block tree and commits:

  dfb2cc3b7f7e ("loop: don't hold lo_mutex during __loop_clr_fd()")
  51d5ae114da8 ("loop: replace loop_validate_mutex with loop_validate_spinl=
ock")

from the tomoyo 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 drivers/block/loop.c
index 0954ea8cf9e3,6ebfa156fd9b..000000000000
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -1061,9 -1041,9 +1041,9 @@@ static int loop_configure(struct loop_d
  		lo->lo_flags |=3D LO_FLAGS_PARTSCAN;
  	partscan =3D lo->lo_flags & LO_FLAGS_PARTSCAN;
  	if (partscan)
 -		lo->lo_disk->flags &=3D ~GENHD_FL_NO_PART_SCAN;
 +		lo->lo_disk->flags &=3D ~GENHD_FL_NO_PART;
 =20
- 	loop_global_unlock(lo, is_loop);
+ 	loop_update_state(lo, Lo_bound);
  	if (partscan)
  		loop_reread_partitions(lo);
  	if (!(mode & FMODE_EXCL))
@@@ -1181,19 -1142,14 +1142,14 @@@ static void __loop_clr_fd(struct loop_d
 =20
  	/*
  	 * lo->lo_state is set to Lo_unbound here after above partscan has
- 	 * finished.
- 	 *
- 	 * There cannot be anybody else entering __loop_clr_fd() as
- 	 * lo->lo_backing_file is already cleared and Lo_rundown state
- 	 * protects us from all the other places trying to change the 'lo'
- 	 * device.
+ 	 * finished. There cannot be anybody else entering __loop_clr_fd() as
+ 	 * Lo_rundown state protects us from all the other places trying to
+ 	 * change the 'lo' device.
  	 */
- 	mutex_lock(&lo->lo_mutex);
  	lo->lo_flags =3D 0;
  	if (!part_shift)
 -		lo->lo_disk->flags |=3D GENHD_FL_NO_PART_SCAN;
 +		lo->lo_disk->flags |=3D GENHD_FL_NO_PART;
- 	lo->lo_state =3D Lo_unbound;
- 	mutex_unlock(&lo->lo_mutex);
+ 	loop_update_state(lo, Lo_unbound);
 =20
  	/*
  	 * Need not hold lo_mutex to fput backing file. Calling fput holding
@@@ -2032,9 -1985,11 +1985,10 @@@ static int loop_add(int i
  	 * userspace tools. Parameters like this in general should be avoided.
  	 */
  	if (!part_shift)
 -		disk->flags |=3D GENHD_FL_NO_PART_SCAN;
 -	disk->flags |=3D GENHD_FL_EXT_DEVT;
 +		disk->flags |=3D GENHD_FL_NO_PART;
  	atomic_set(&lo->lo_refcnt, 0);
  	mutex_init(&lo->lo_mutex);
+ 	loop_update_state(lo, Lo_unbound);
  	lo->lo_number		=3D i;
  	spin_lock_init(&lo->lo_lock);
  	spin_lock_init(&lo->lo_work_lock);

--Sig_/eDryevQj.qE_nL1MPiCA+YR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmGdiYEACgkQAVBC80lX
0GyUgwgAkDLtikz3JVTUbIhxs65Meb0DeToQZhvUpikLogi9uYZj17Eq75lhOxId
8bFqWrVAlOX/R0VBa5/jGcI2es7Kr410nRG4WdeB2iDDhO+0FrxnGF9I/9QqIKiu
itB0zBy/VdXaQTPDXe5mHHJPlGxlI4rhb6KlTIeCCA/4agFS7K/ILw/l1nXJXnJ7
Awh4XdyMLvik7Lf6xW9dNa0sYCRg2waWrQ9TqaXZ8QUvK/xUN1sPcoe7ySeGJANd
S8namb2cJu8fhm25Q+8QYbAU6TbpBXw81MJGVc12Db5re8/ETtyUhRCS+qADyize
Eob9VYm2eApOFhk8uBSEDzoDSNVI4w==
=PvwN
-----END PGP SIGNATURE-----

--Sig_/eDryevQj.qE_nL1MPiCA+YR--

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 5C4EBC433EF
	for <linux-next@archiver.kernel.org>; Wed, 24 Nov 2021 02:06:32 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233779AbhKXCJk (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 23 Nov 2021 21:09:40 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53728 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S230199AbhKXCJj (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 23 Nov 2021 21:09:39 -0500
Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 001ADC061714
        for <linux-next@vger.kernel.org>; Tue, 23 Nov 2021 18:06:30 -0800 (PST)
Received: by mail-io1-xd32.google.com with SMTP id e144so1195063iof.3
        for <linux-next@vger.kernel.org>; Tue, 23 Nov 2021 18:06:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=6JqwUkT5b5T7yfFvPXHrMYJB5jvxB6kIH/FjieZ2ioU=;
        b=LgT+EnxlUsqCl6vjE8BXM9rnL1rlkUNBl2HyIbvhxBRq0bKcD6xqahoNl/iHaN9bL6
         rD5C5RCdKTe8hciJ7PCGmxlxQwnKAIp+n0JgFudGEfuteaAQsW97VM9dn/jt5KN586k8
         MeyitQZ8grHhwktvV8RDcWQ72o63XlVOgbyOSxQgmTRqTBuN3aeUpZN5xMH/tEkuR4RF
         UYXwb05NYjCIbQeiT/aFUtzIcORyTYf4OJvzTMs1WNYCHZBqDEW5P03w22NC3CneeEzJ
         AMaqcGYU7tLHuvDOqlW4e16Uh5mNPB9XGYWrf53KaFmwfttoYTfq0iqiqyhJX6J1DinM
         xDwA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=6JqwUkT5b5T7yfFvPXHrMYJB5jvxB6kIH/FjieZ2ioU=;
        b=phnMSPkZ79cGkLy6HFfWcEHj6j9oSJ6emB+B+AgROATRhPRrhOxLFpIRhYXhqTcRIe
         8GPhf9j/0BzVc1TGZQrx82rJuuPR9WkY+L1T5D2Xj0cfQ9lDYI3j2D3FD1r+W5oedQ9K
         qn4Lj9l2hStKzoF38YkJMFNp+wMh5wCob/wt943nrdtUP11ax2jmMSOiED1tIULc1Qnt
         jXQr7Zf9Zf+jhY8Ecmbl5is2tWVQVhPvqrElor80yX6swXgOh0opTYxnz4gZyTG+/1Z2
         vNbKzH5BpSWKhHYjXcmoLnailhWqryTsNM8lwoPSys9rcUIbTShBwJMRgYaOtOxdA/T2
         QNfA==
X-Gm-Message-State: AOAM530Mbz9zQmZ6dy4zQaZaOraZjX3h0KTJaEHsSzYUKdv8NP9HqGuZ
        LiTE4Hle4c40UHYEx/mNYIl1gAqyWyCtPPxo
X-Google-Smtp-Source: ABdhPJx4MZlam5+iHKslwY0j62QrIcewX49zDPgL9KlKi2J8fMMwxut5JvNPkr3TxJDyb6Yo6LPO+A==
X-Received: by 2002:a05:6638:2054:: with SMTP id t20mr12215861jaj.42.1637719589837;
        Tue, 23 Nov 2021 18:06:29 -0800 (PST)
Received: from [192.168.1.116] ([66.219.217.159])
        by smtp.gmail.com with ESMTPSA id k13sm10235749ilo.40.2021.11.23.18.06.29
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 23 Nov 2021 18:06:29 -0800 (PST)
Subject: Re: linux-next: manual merge of the tomoyo tree with the block tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20211124113825.2d9de813@canb.auug.org.au>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk>
Date:   Tue, 23 Nov 2021 19:06:27 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20211124113825.2d9de813@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 11/23/21 5:38 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tomoyo tree got a conflict in:
> 
>   drivers/block/loop.c
> 
> between commit:
> 
>   3793b8e18186 ("block: rename GENHD_FL_NO_PART_SCAN to GENHD_FL_NO_PART")
> 
> from the block tree and commits:
> 
>   dfb2cc3b7f7e ("loop: don't hold lo_mutex during __loop_clr_fd()")
>   51d5ae114da8 ("loop: replace loop_validate_mutex with loop_validate_spinlock")
> 
> from the tomoyo 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.

Why does the tomoyo tree have loop commits is the question?

-- 
Jens Axboe


From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D30FCC433F5
	for <linux-next@archiver.kernel.org>; Wed, 24 Nov 2021 02:26:03 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234637AbhKXC3M (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 23 Nov 2021 21:29:12 -0500
Received: from www262.sakura.ne.jp ([202.181.97.72]:49297 "EHLO
        www262.sakura.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S233425AbhKXC3L (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 23 Nov 2021 21:29:11 -0500
Received: from fsav413.sakura.ne.jp (fsav413.sakura.ne.jp [133.242.250.112])
        by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id 1AO2PqEd056881;
        Wed, 24 Nov 2021 11:25:52 +0900 (JST)
        (envelope-from penguin-kernel@i-love.sakura.ne.jp)
Received: from www262.sakura.ne.jp (202.181.97.72)
 by fsav413.sakura.ne.jp (F-Secure/fsigk_smtp/550/fsav413.sakura.ne.jp);
 Wed, 24 Nov 2021 11:25:52 +0900 (JST)
X-Virus-Status: clean(F-Secure/fsigk_smtp/550/fsav413.sakura.ne.jp)
Received: from [192.168.1.9] (M106072142033.v4.enabler.ne.jp [106.72.142.33])
        (authenticated bits=0)
        by www262.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id 1AO2Pp6e056877
        (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NO);
        Wed, 24 Nov 2021 11:25:52 +0900 (JST)
        (envelope-from penguin-kernel@i-love.sakura.ne.jp)
Message-ID: <b5d2fbb7-5bc6-f0c1-0869-1c3e7096677e@i-love.sakura.ne.jp>
Date:   Wed, 24 Nov 2021 11:25:49 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Subject: Re: linux-next: manual merge of the tomoyo tree with the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20211124113825.2d9de813@canb.auug.org.au>
 <cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk>
From:   Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
In-Reply-To: <cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 2021/11/24 11:06, Jens Axboe wrote:
> 
> Why does the tomoyo tree have loop commits is the question?
> 

I'm testing patches using my tree until maintainers respond.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-next-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id F3798C433EF
	for <linux-next@archiver.kernel.org>; Wed, 24 Nov 2021 02:38:55 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S240784AbhKXCmE (ORCPT <rfc822;linux-next@archiver.kernel.org>);
        Tue, 23 Nov 2021 21:42:04 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60932 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S235796AbhKXCmD (ORCPT
        <rfc822;linux-next@vger.kernel.org>); Tue, 23 Nov 2021 21:42:03 -0500
Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E922AC061714
        for <linux-next@vger.kernel.org>; Tue, 23 Nov 2021 18:38:54 -0800 (PST)
Received: by mail-io1-xd29.google.com with SMTP id e144so1280836iof.3
        for <linux-next@vger.kernel.org>; Tue, 23 Nov 2021 18:38:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=kernel-dk.20210112.gappssmtp.com; s=20210112;
        h=subject:to:cc:references:from:message-id:date:user-agent
         :mime-version:in-reply-to:content-language:content-transfer-encoding;
        bh=oDR6Ez54gJXjhv8//eTFCmRhSXhku16zY+9Gc+N557I=;
        b=pFO0OBcIyttQRKgPyNeBKdG5/H1+BzVpP8ajqHo9XGcMy/+TExJ2IvMLTMEVIf8JQG
         1iCIG6ZbHTlqIM0S2uQj+xRjl4Bz9Dx/cClyMjNBMUQXhS+as5MRbFwoUhKtIZHrRliY
         1j05iZhN9rrKYzNo0kiH0AzE6Unoyd7GdEgVyRVWzS8u9rdhbUuak4J+T68/DhqmhQ4+
         jZlonKL8W/RQMuRLArezi0+qdBuQ+JSNzaqbRJb9zyNchqZVyfuWyrAMVsvdPTUWxMz8
         Pjc/iw9Ubybf0/XrjNd7ZWu1baZGErh8tmGmGK9WaRBAzCwEjrANp3w0kX8lsD5eLjf4
         VFyg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:subject:to:cc:references:from:message-id:date
         :user-agent:mime-version:in-reply-to:content-language
         :content-transfer-encoding;
        bh=oDR6Ez54gJXjhv8//eTFCmRhSXhku16zY+9Gc+N557I=;
        b=foczxj8Oje1RKciihmryKpqEAWFHdk52CbP4bgB5VxneGKC9vwPDg+CGrRxxeILohz
         Vnm/z1B0v9xI8VcLNWdSIfuT2pWtQ1l8kKsK3hq3+U5rgsb01wBDl1Z1X9wSrjvoiea2
         FtCwPPWHAv7l/GHQOk+JsnnRE7U+A1+U6zicR4+UIK+EP6nzlmdRyawCM3dQbqJH9eya
         NSmDI5ACVpn7sexuO3AIWl/V+Ow551A65c16EtRq1M1OvQFTeE1+/fIkALdqPkN9NDfE
         BBuL8NKAr73/NZzuCbHOlTldQdARbkOlLGGV/4tcVBGyJVmrE1T/GXh16Fd555+WNhpS
         DnTg==
X-Gm-Message-State: AOAM533yPfN65iKOJEUuz5aTX2xcce6m5tVZBgqOsS4HAjQdbJDubMpf
        UQAcIf9oJWWxj0hMdkc7ClFEpmDE+d2TTcD3
X-Google-Smtp-Source: ABdhPJzN+fTLrMjJnhN4qikGr7oBiW9zV0LGRBpibae1TjD5ULB6oIPyY2mpNHpa+DDbLg1S5C2Yng==
X-Received: by 2002:a05:6602:3314:: with SMTP id b20mr10316177ioz.214.1637721534138;
        Tue, 23 Nov 2021 18:38:54 -0800 (PST)
Received: from [192.168.1.116] ([66.219.217.159])
        by smtp.gmail.com with ESMTPSA id y12sm9984495ill.71.2021.11.23.18.38.53
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Tue, 23 Nov 2021 18:38:53 -0800 (PST)
Subject: Re: linux-next: manual merge of the tomoyo tree with the block tree
To:     Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20211124113825.2d9de813@canb.auug.org.au>
 <cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk>
 <b5d2fbb7-5bc6-f0c1-0869-1c3e7096677e@i-love.sakura.ne.jp>
From:   Jens Axboe <axboe@kernel.dk>
Message-ID: <353a1ef2-df1e-21f1-b27d-8ff940279299@kernel.dk>
Date:   Tue, 23 Nov 2021 19:38:51 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <b5d2fbb7-5bc6-f0c1-0869-1c3e7096677e@i-love.sakura.ne.jp>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk
List-ID: <linux-next.vger.kernel.org>
X-Mailing-List: linux-next@vger.kernel.org

On 11/23/21 7:25 PM, Tetsuo Handa wrote:
> On 2021/11/24 11:06, Jens Axboe wrote:
>>
>> Why does the tomoyo tree have loop commits is the question?
>>
> 
> I'm testing patches using my tree until maintainers respond.

It's a week old, please don't put patches from an unrelated tree
into a different tree.

-- 
Jens Axboe


