Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Tue, Apr 6, 2021 at 2:11 AM Greg KH wrote: > > On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the driver-core tree got a conflict in: > > > > drivers/of/property.c > > > > between commit: > > > > 3915fed92365 ("of: property: Provide missing member description and > > remove excess param") > > > > from the devicetree tree and commit: > > > > f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint") > > > > from the driver-core 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. > > Change looks good to me, thanks! LGTM too. -Saravana
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/of/property.c > > between commit: > > 3915fed92365 ("of: property: Provide missing member description and remove > excess param") > > from the devicetree tree and commit: > > f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint") > > from the driver-core 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. Change looks good to me, thanks! greg k-h
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > include/linux/platform_device.h between commit 10dbc5e39a60 ("driver > core: move to_platform_driver to platform_device.h") from the devicetree > tree and commit 9447057eaff8 ("platform_device: use a macro instead of > platform_driver_register") from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Fix looks good to me, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in include/linux/platform_device.h between commit 10dbc5e39a60 (driver core: move to_platform_driver to platform_device.h) from the devicetree tree and commit 9447057eaff8 (platform_device: use a macro instead of platform_driver_register) from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Fix looks good to me, thanks. greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/