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
| ||
|
Date: Tue, 6 Dec 2022 16:23:19 -0700 From: Alex Williamson <alex.williamson@...hat.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Jason Gunthorpe <jgg@...dia.com>, Greg KH <greg@...ah.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Jason Gunthorpe <jgg@...pe.ca>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Yi Liu <yi.l.liu@...el.com> Subject: Re: linux-next: manual merge of the iommufd tree with the driver-core, vfio trees On Tue, 6 Dec 2022 13:21:53 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the iommufd tree got a conflict in: > > drivers/vfio/vfio_main.c > > between commits: > > ff62b8e6588f ("driver core: make struct class.devnode() take a const *") > e2d55709398e ("vfio: Fold vfio_virqfd.ko into vfio.ko") > > from the driver-core, vfio trees and commits: > > c2849d718d26 ("vfio: Move vfio group specific code into group.c") > f96dc03a8368 ("vfio: Wrap vfio group module init/clean code into helpers") > > from the iommufd tree. > > I fixed it up (I think - see below and I had to add the fix up patch as > well) 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. > > From: Stephen Rothwell <sfr@...b.auug.org.au> > Date: Tue, 6 Dec 2022 13:17:41 +1100 > Subject: [PATCH] vfio: fix up for "driver core: make struct class.devnode() take a const *" > > Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au> > --- > drivers/vfio/group.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c > index c5d8bf10495e..bb24b2f0271e 100644 > --- a/drivers/vfio/group.c > +++ b/drivers/vfio/group.c > @@ -827,7 +827,7 @@ bool vfio_file_has_dev(struct file *file, struct vfio_device *device) > } > EXPORT_SYMBOL_GPL(vfio_file_has_dev); > > -static char *vfio_devnode(struct device *dev, umode_t *mode) > +static char *vfio_devnode(const struct device *dev, umode_t *mode) > { > return kasprintf(GFP_KERNEL, "vfio/%s", dev_name(dev)); > } > Looks good, thank you, Alex
Powered by blists - more mailing lists