linux-next: manual merge of the cgroup tree with the block tree

[Stephen Rothwell]

Hi all,

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

Attachment: pgpUdXZHahbXm.pgp
Description: OpenPGP digital signature