From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Jens Axboe <axboe@kernel•dk>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Subject: Re: linux-next: manual merge of the cgroup tree with the block tree
Date: Tue, 9 Jul 2019 10:00:25 +1000 [thread overview]
Message-ID: <20190709100025.1e829b58@canb.auug.org.au> (raw)
In-Reply-To: <20190624175238.5ce3db2f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2006 bytes --]
Hi all,
On Mon, 24 Jun 2019 17:52:38 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the cgroup tree got a conflict in:
>
> Documentation/block/bfq-iosched.txt
>
> between commit:
>
> 8060c47ba853 ("block: rename CONFIG_DEBUG_BLK_CGROUP to CONFIG_BFQ_CGROUP_DEBUG")
>
> from the block tree and commit:
>
> 99c8b231ae6c ("docs: cgroup-v1: convert docs to ReST and rename to *.rst")
>
> from the cgroup 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/block/bfq-iosched.txt
> index f02163fabf80,b2265cf6c9c3..000000000000
> --- a/Documentation/block/bfq-iosched.txt
> +++ b/Documentation/block/bfq-iosched.txt
> @@@ -537,10 -537,10 +537,10 @@@ or io.bfq.weight
>
> As for cgroups-v1 (blkio controller), the exact set of stat files
> created, and kept up-to-date by bfq, depends on whether
> -CONFIG_DEBUG_BLK_CGROUP is set. If it is set, then bfq creates all
> +CONFIG_BFQ_CGROUP_DEBUG is set. If it is set, then bfq creates all
> the stat files documented in
> - Documentation/cgroup-v1/blkio-controller.txt. If, instead,
> + Documentation/cgroup-v1/blkio-controller.rst. If, instead,
> -CONFIG_DEBUG_BLK_CGROUP is not set, then bfq creates only the files
> +CONFIG_BFQ_CGROUP_DEBUG is not set, then bfq creates only the files
> blkio.bfq.io_service_bytes
> blkio.bfq.io_service_bytes_recursive
> blkio.bfq.io_serviced
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-09 0:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 7:52 linux-next: manual merge of the cgroup tree with the block tree Stephen Rothwell
2019-07-09 0:00 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-07 5:05 Stephen Rothwell
2012-03-07 19:17 ` Tejun Heo
2011-12-20 6:10 Stephen Rothwell
2011-12-27 17:41 ` Tejun Heo
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=20190709100025.1e829b58@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=tj@kernel$(echo .)org \
/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