Hi all,
On Mon, 3 Aug 2020 19:53:42 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Fri, 17 Jul 2020 19:42:21 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the init tree got a conflict in:
> >
> > drivers/md/md.c
> >
> > between commit:
> >
> > a564e23f0f99 ("md: switch to ->check_events for media change notifications")
> >
> > from the block tree and commit:
> >
> > 7e0adbfc20c5 ("md: rewrite md_setup_drive to avoid ioctls")
> >
> > from the init 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.
> >
> > diff --cc drivers/md/md.c
> > index 5b6d46741baa,ee622b67424e..000000000000
> > --- a/drivers/md/md.c
> > +++ b/drivers/md/md.c
> > @@@ -7836,21 -7790,23 +7820,21 @@@ static void md_release(struct gendisk *
> > mddev_put(mddev);
> > }
> >
> > -static int md_media_changed(struct gendisk *disk)
> > -{
> > - struct mddev *mddev = disk->private_data;
> > -
> > - return mddev->changed;
> > -}
> > -
> > -static int md_revalidate(struct gendisk *disk)
> > +static unsigned int md_check_events(struct gendisk *disk, unsigned int clearing)
> > {
> > struct mddev *mddev = disk->private_data;
> > + unsigned int ret = 0;
> >
> > + if (mddev->changed)
> > + ret = DISK_EVENT_MEDIA_CHANGE;
> > mddev->changed = 0;
> > - return 0;
> > + return ret;
> > }
> > +
> > - static const struct block_device_operations md_fops =
> > + const struct block_device_operations md_fops =
> > {
> > .owner = THIS_MODULE,
> > + .submit_bio = md_submit_bio,
> > .open = md_open,
> > .release = md_release,
> > .ioctl = md_ioctl,
>
> This is now a conflict between the block tree and the vfs tree.
This is now a conflict between the vfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpIqqGUm8uQc.pgp
Description: OpenPGP digital signature
