On Mon, Jul 01, 2019 at 06:32:49PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/acpi/sleep.c
>
> between commit:
>
> a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")
>
> from the pm
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/acpi/sleep.c
between commit:
a3487d8f3063 ("ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()")
from the pm tree and commit:
418e3ea157ef ("bus_find_device: Unify the match callback with
On Mon, Dec 10, 2018 at 09:58:53AM +0100, Rafael J. Wysocki wrote:
> On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in:
> >
> > drivers/base/platform.c
> > u
> > between commit:
> >
> >
On Monday, December 10, 2018 6:14:54 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/platform.c
> u
> between commit:
>
> 2d51ac9086fd ("driver core: platform: Remove duplicated
> device_remove_properties()
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/base/platform.c
u
between commit:
2d51ac9086fd ("driver core: platform: Remove duplicated
device_remove_properties() call")
from the pm tree and commit:
99fef587ff98 ("driver core: platform: Respect
On Monday, November 14, 2016 01:09:02 PM Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/power/main.c
>
> between commit:
>
> 6f75c3fd56da ("PM / sleep: don't suspend parent when async child
> suspend_{noirq,
On Monday, November 14, 2016 01:09:02 PM Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/base/power/main.c
>
> between commit:
>
> 6f75c3fd56da ("PM / sleep: don't suspend parent when async child
> suspend_{noirq,
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/base/power/main.c
between commit:
6f75c3fd56da ("PM / sleep: don't suspend parent when async child
suspend_{noirq, late} fails")
from the pm tree and commit:
8c73b4288496 ("PM / sleep: Make async
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/base/power/main.c
between commit:
6f75c3fd56da ("PM / sleep: don't suspend parent when async child
suspend_{noirq, late} fails")
from the pm tree and commit:
8c73b4288496 ("PM / sleep: Make async
On Tue, Nov 11, 2014 at 03:41:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/Makefile between commit b31384fa5de3 ("Driver core:
> Unified device properties interface for platform firmware") from the pm
> tree
On Tue, Nov 11, 2014 at 03:41:46PM +1100, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/Makefile between commit b31384fa5de3 (Driver core:
Unified device properties interface for platform firmware) from the pm
tree and
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/Makefile between commit b31384fa5de3 ("Driver core:
Unified device properties interface for platform firmware") from the pm
tree and commit 246246cbde5e ("drivers: base: support cpu cache
information
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/Makefile between commit b31384fa5de3 (Driver core:
Unified device properties interface for platform firmware) from the pm
tree and commit 246246cbde5e (drivers: base: support cpu cache
information interface
On Mon, Nov 10, 2014 at 03:18:56PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
> ("input: gpio_keys_polled: Make use of device property API") from the
> pm
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
("input: gpio_keys_polled: Make use of device property API") from the
pm tree and commit 1d05726c315c ("input: keyboard: drop owner
assignment from
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
(input: gpio_keys_polled: Make use of device property API) from the
pm tree and commit 1d05726c315c (input: keyboard: drop owner
assignment from
On Mon, Nov 10, 2014 at 03:18:56PM +1100, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/input/keyboard/gpio_keys_polled.c between commit b26d4e2283b6
(input: gpio_keys_polled: Make use of device property API) from the
pm tree and
On Fri, Aug 30, 2013 at 03:26:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
> Avoid device hot remove locking issues") from the tree and commit
>
On Fri, Aug 30, 2013 at 03:26:40PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/core.c between commit 5e33bc4165f3 (driver core / ACPI:
Avoid device hot remove locking issues) from the tree and commit
86df26870569
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
Avoid device hot remove locking issues") from the tree and commit
86df26870569 ("drivers:base:core: Moved sym export macros to respective
functions")
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/core.c between commit 5e33bc4165f3 (driver core / ACPI:
Avoid device hot remove locking issues) from the tree and commit
86df26870569 (drivers:base:core: Moved sym export macros to respective
functions) from
On Thu, Jun 27, 2013 at 05:14:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add
> offline/online device operations") from the pm tree and commit
>
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
include/linux/device.h between commit 4f3549d72d1b ("Driver core: Add
offline/online device operations") from the pm tree and commit
bfd63cd24df6 ("driver core: device.h: fix doc compilation warnings") from
the
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
include/linux/device.h between commit 4f3549d72d1b (Driver core: Add
offline/online device operations) from the pm tree and commit
bfd63cd24df6 (driver core: device.h: fix doc compilation warnings) from
the driver-core
On Thu, Jun 27, 2013 at 05:14:18PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
include/linux/device.h between commit 4f3549d72d1b (Driver core: Add
offline/online device operations) from the pm tree and commit
bfd63cd24df6
On Fri, Jun 07, 2013 at 02:49:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
> Introduce offline/online callbacks for memory blocks") from the pm tree
> and
On Fri, Jun 07, 2013 at 02:49:36PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit 4960e05e2260 (Driver core:
Introduce offline/online callbacks for memory blocks) from the pm tree
and commit
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
Introduce offline/online callbacks for memory blocks") from the pm tree
and commit 96b2c0fc8e74 ("drivers/base: Use attribute groups to create
sysfs memory
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/memory.c between commit 4960e05e2260 (Driver core:
Introduce offline/online callbacks for memory blocks) from the pm tree
and commit 96b2c0fc8e74 (drivers/base: Use attribute groups to create
sysfs memory
On Wednesday, May 22, 2013 02:02:13 PM Stephen Rothwell wrote:
> Hi all,
Hi Stephen,
Thanks for fixing this up!
Hi Greg,
What about merging my acpi-hotplug branch into the driver-core tree?
That would make the Linus' life easier going forward I suppose.
Thanks,
Rafael
> On Wed, 22 May 2013
On Wednesday, May 22, 2013 02:02:13 PM Stephen Rothwell wrote:
Hi all,
Hi Stephen,
Thanks for fixing this up!
Hi Greg,
What about merging my acpi-hotplug branch into the driver-core tree?
That would make the Linus' life easier going forward I suppose.
Thanks,
Rafael
On Wed, 22 May 2013
Hi all,
On Wed, 22 May 2013 13:47:41 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
> offline/online for CPU offline/online") from the pm tree and commit
>
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 0902a9044fa5 ("Driver core: Use generic
offline/online for CPU offline/online") from the pm tree and commit
1c4e2d70afb1 ("cpu: make sure that cpu/online file created before
KOBJ_ADD is
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 0902a9044fa5 (Driver core: Use generic
offline/online for CPU offline/online) from the pm tree and commit
1c4e2d70afb1 (cpu: make sure that cpu/online file created before
KOBJ_ADD is
Hi all,
On Wed, 22 May 2013 13:47:41 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 0902a9044fa5 (Driver core: Use generic
offline/online for CPU offline/online) from the pm tree and
On Monday, February 11, 2013 03:42:55 PM Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
> container driver use struct acpi_scan_handler") from the pm tree and
> commit
On Monday, February 11, 2013 03:42:55 PM Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/Kconfig between commit cb2b212bc7ff (ACPI / scan: Make
container driver use struct acpi_scan_handler) from the pm tree and
commit
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
container driver use struct acpi_scan_handler") from the pm tree and
commit f756f28b84af ("drivers/acpi: remove depends on CONFIG_EXPERIMENTAL")
from
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/Kconfig between commit cb2b212bc7ff (ACPI / scan: Make
container driver use struct acpi_scan_handler) from the pm tree and
commit f756f28b84af (drivers/acpi: remove depends on CONFIG_EXPERIMENTAL)
from the
39 matches
Mail list logo
