From: Jens Axboe <axboe@kernel•dk>
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>
Subject: Re: linux-next: manual merge of the tomoyo tree with the block tree
Date: Tue, 23 Nov 2021 19:06:27 -0700 [thread overview]
Message-ID: <cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk> (raw)
In-Reply-To: <20211124113825.2d9de813@canb.auug.org.au>
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
next prev parent reply other threads:[~2021-11-24 2:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 0:38 linux-next: manual merge of the tomoyo tree with the block tree Stephen Rothwell
2021-11-24 2:06 ` Jens Axboe [this message]
2021-11-24 2:25 ` Tetsuo Handa
2021-11-24 2:38 ` Jens Axboe
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=cbeb57ae-5a87-9959-689f-d9d73baf6ee4@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=penguin-kernel@i-love$(echo .)sakura.ne.jp \
--cc=sfr@canb$(echo .)auug.org.au \
/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