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:
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")
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
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
include/linux/device.h
between commit:
7d34ca385484 ("driver core: Add device_is_dependent() to linux/device.h")
from the devicetree tree and commit:
67dd07723969 ("device: remove 'extern' attribute from functio
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
> tr
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_
6 matches
Mail list logo
