linux-kernel - linux-next: manual merge of the driver-core tree with the block tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190429152400.281524b7@canb.auug.org.au>
Date:   Mon, 29 Apr 2019 15:24:00 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Jens Axboe <axboe@...nel.dk>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Weiping Zhang <zhangweiping@...iglobal.com>,
        Kimberly Brown <kimbrownkd@...il.com>
Subject: linux-next: manual merge of the driver-core tree with the block
 tree

Hi all,

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

  block/blk-sysfs.c

between commit:

  4d25339e32a1 ("block: don't show io_timeout if driver has no timeout handler")

from the block tree and commit:

  800f5aa1e7e1 ("block: Replace all ktype default_attrs with groups")

from the driver-core tree.

I fixed it up (the former stopped using the default_attrs field, so I
effectively reverted the latter changes to this file) 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

Content of type "application/pgp-signature" skipped