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

Hi all, On Mon, 29 Apr 2019 15:24:00 +1000 Stephen Rothwell wrote: > > 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 tr

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"