On Wed, Feb 17, 2021 at 4:11 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master")
>
> from the i3c tree and commit:
>
> 4590d98f5a4f ("sfi: Remove fra
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
MAINTAINERS
between commit:
f06a1af8e739 ("MAINTAINERS: Add Silvaco I3C master")
from the i3c tree and commit:
4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
from the pm tree.
I fixed it up (see below)
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
drivers/soc/ti/Makefile
between commit:
dc1129564a01 ("soc: ti: pruss: Add a platform driver for PRUSS in TI SoCs")
from the arm-soc tree and commit:
bca815d62054 ("PM: AVS: smartreflex Move driver to soc specific driver
On Fri, Oct 18, 2019 at 11:34:08AM +0200, Rafael J. Wysocki wrote:
> On Friday, October 18, 2019 1:19:38 AM CEST Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> >
> > lib/test_printf.c
> >
> > between commit:
> >
> > 57f5677e535b ("pr
On Friday, October 18, 2019 1:19:38 AM CEST Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> lib/test_printf.c
>
> between commit:
>
> 57f5677e535b ("printf: add support for printing symbolic error names")
>
> from the printk tree and com
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
lib/test_printf.c
between commit:
57f5677e535b ("printf: add support for printing symbolic error names")
from the printk tree and commit:
f1ce39df508d ("lib/test_printf: Add tests for %pfw printk modifier")
from the pm
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
Documentation/power/pm_qos_interface.rst
between commits:
151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
562fe2ef1a21 ("PM / QOS: Pass request type to dev_pm_qos_read_value()")
from the pci tree an
On Friday, December 21, 2018 2:59:45 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm64/Kconfig
>
> between commits:
>
> 2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC
> config options")
> 20f1b7
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm64/Kconfig
between commits:
2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC
config options")
20f1b79d3359 ("PCI: consolidate the PCI_SYSCALL symbol")
from the kbuild tree and commit:
52
On Monday, October 29, 2018 3:01:24 AM CET Stephen Rothwell wrote:
>
> --Sig_/X_/swfdki+BZTJ8afk_lQqW
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/cpuidle/go
On Monday, October 29, 2018 3:09:25 AM CET Stephen Rothwell wrote:
>
> --Sig_/Yi5UDAd5LU=QdOHo+ui7Syk
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got conflicts in:
>
> drivers/i2c/busses/
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in:
drivers/i2c/busses/i2c-designware-baytrail.c
drivers/i2c/busses/i2c-designware-core.h
between commit:
9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled
workaround")
from the i2c tree and comm
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/cpuidle/governors/menu.c
between commit:
8508cf3ffad4 ("sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD")
from Linus' tree and commit:
a7fe5190c03f ("cpuidle: menu: Remove get_loadavg() from the per
On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/i2c/busses/i2c-designware-platdrv.c
>
> between commit:
>
> 0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to
> i2c_dw
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/i2c/busses/i2c-designware-platdrv.c
between commit:
0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to
i2c_dw_prepare_clk")
from the i2c tree and commit:
02e45646d53b ("PM: i2c-designware-platd
> Hi Jean,
>
> On Fri, 01 Sep 2017 15:20:21 +0200 Jean Delvare wrote:
> >
> > On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the pm tree got a conflict in:
> > >
> > > drivers/acpi/blacklist.c
> > >
> > > between commit:
> > >
> > > f996c41
Hi Jean,
On Fri, 01 Sep 2017 15:20:21 +0200 Jean Delvare wrote:
>
> On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> >
> > drivers/acpi/blacklist.c
> >
> > between commit:
> >
> > f996c4155d0d ("dmi: Mark all
Hi all,
On Mon, 7 Aug 2017 11:40:33 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/acpi/sbs.c
>
> between commit:
>
> f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
>
> from the dmi tree and commit:
>
> 630
Hi Stephen,
On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/acpi/blacklist.c
>
> between commit:
>
> f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
>
> from the dmi tree a
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
drivers/acpi/blacklist.c
between commit:
f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
from the dmi tree and commit:
5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()")
from the pm tr
On Fri, Aug 11, 2017 at 12:00:47PM +1000, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/acpi/spcr.c
>
> between commit:
>
> 37ef38f3f838 ("tty: pl011: fix initialization order of QDF2400 E44")
>
> from the tty.current tree a
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/acpi/spcr.c
between commit:
37ef38f3f838 ("tty: pl011: fix initialization order of QDF2400 E44")
from the tty.current tree and commit:
01c5210cad90 ("ACPI: SPCR: work around clock issue on xgene UART")
from t
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/acpi/sbs.c
between commit:
f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const")
from the dmi tree and commit:
630b3aff8a51 ("treewide: Consolidate Apple DMI checks")
from the pm tree.
I fixed
On 4/24/2017 11:02 AM, Dave Gerlach wrote:
On 04/21/2017 04:54 PM, Santosh Shilimkar wrote:
+Dave,
[...]
Ok, good, thanks for checking! They are however the commits that
contain the silly https://urldefense.proofpoint.com URLs. Can you
send a follow-up patch to fix these and use the regular
On 04/21/2017 04:54 PM, Santosh Shilimkar wrote:
+Dave,
On 4/21/2017 2:44 PM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com
wrote:
On 4/21/17 2:31 AM, Arnd Bergmann wrote:
[...]
arm-soc/next/drivers:
ae3874cc931b ARM: keystone: Drop PM domain support
+Dave,
On 4/21/2017 2:44 PM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com
wrote:
On 4/21/17 2:31 AM, Arnd Bergmann wrote:
[...]
arm-soc/next/drivers:
ae3874cc931b ARM: keystone: Drop PM domain support for k2g
52835d59fc6c soc: ti: Add ti_sci_pm_domain
On 4/21/2017 2:31 PM, Rafael J. Wysocki wrote:
On Friday, April 21, 2017 02:02:35 PM santosh.shilim...@oracle.com wrote:
On 4/21/17 2:31 AM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com
[...]
I still see two conflicting trees in linux-next as of toda
On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com
wrote:
> On 4/21/17 2:31 AM, Arnd Bergmann wrote:
>>
>> On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com
>> wrote:
>>>
>>> On 4/20/17 10:53 PM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 2:54 AM, Stephen
On Friday, April 21, 2017 02:02:35 PM santosh.shilim...@oracle.com wrote:
>
> On 4/21/17 2:31 AM, Arnd Bergmann wrote:
> > On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com
> > wrote:
> >> On 4/20/17 10:53 PM, Arnd Bergmann wrote:
> >>>
> >>> On Fri, Apr 21, 2017 at 2:54 AM, Stephen R
On 4/21/17 2:31 AM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com
wrote:
On 4/20/17 10:53 PM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell
wrote:
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
include/
On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com
wrote:
> On 4/20/17 10:53 PM, Arnd Bergmann wrote:
>>
>> On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell
>> wrote:
>>>
>>> Hi all,
>>>
>>> Today's linux-next merge of the pm tree got a conflict in:
>>>
>>> include/dt-bindings/genpd
On 4/20/17 10:53 PM, Arnd Bergmann wrote:
On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
include/dt-bindings/genpd/k2g.h
between commit:
7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains")
from the arm-soc tre
On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> include/dt-bindings/genpd/k2g.h
>
> between commit:
>
> 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains")
>
> from the arm-soc tree and commit:
>
> 45da8edd
Hi all,
Today's linux-next merge of the pm tree got a conflict in:
include/dt-bindings/genpd/k2g.h
between commit:
7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains")
from the arm-soc tree and commit:
45da8edd1741 ("dt-bindings: Add TI SCI PM Domains")
from the pm tree.
I fixed it up
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/soc/ti/ti_sci_pm_domains.c
between commit:
52835d59fc6c ("soc: ti: Add ti_sci_pm_domains driver")
from the arm-soc tree and commit:
112572283742 ("soc: ti: Add ti_sci_pm_domains driver")
from the pm tree.
I
On Thursday, April 20, 2017 10:34:27 AM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/boot/dts/sun8i-a33.dtsi
>
> between commits:
>
> 66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs")
> e6bd37627e92 ("ARM: sun8i: a33: a
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/boot/dts/sun8i-a33.dtsi
between commits:
66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs")
e6bd37627e92 ("ARM: sun8i: a33: add all operating points")
from the arm-soc tree and commit:
d87bd1942058 ("PM /
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/mips/configs/lemote2f_defconfig
between commit:
b3f6046186ef ("MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change")
from the mips tree and commit:
e7f73a76e07a ("cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS
On Tue, Oct 25 2016 at 17:51 -0600, Rafael J. Wysocki wrote:
On Tuesday, October 25, 2016 10:47:29 AM Stephen Rothwell wrote:
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/mach-imx/gpc.c
between commits:
eef0b282bb58 ("ARM: imx: gpc: Initialize all power
On Tue, Oct 25, 2016 at 01:58:25AM +0200, Rafael J. Wysocki wrote:
> On Tuesday, October 25, 2016 10:47:29 AM Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> >
> > arch/arm/mach-imx/gpc.c
> >
> > between commits:
> >
> > eef0b282bb
On Tuesday, October 25, 2016 10:47:29 AM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/mach-imx/gpc.c
>
> between commits:
>
> eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
> f9d1f7a7ad91 ("ARM: imx: gpc: Fi
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/mach-imx/gpc.c
between commits:
eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path")
from the imx-mxs tree and commit:
59d65b7
On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang wrote:
>
>> > Well, not knowing much about ACPI, I just need the conflict resolution
>> > for my latest i2c/for-next and your above branch. If you want to do it,
>> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>>
>> Unfortuna
On Tuesday, July 19, 2016 05:48:07 AM Wolfram Sang wrote:
>
> > > Well, not knowing much about ACPI, I just need the conflict resolution
> > > for my latest i2c/for-next and your above branch. If you want to do it,
> > > fine with me. But maybe Jarkko will be back to office on Monday, too.
> >
>
> > Well, not knowing much about ACPI, I just need the conflict resolution
> > for my latest i2c/for-next and your above branch. If you want to do it,
> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>
> Unfortunately, I don't see how these branches can be merged in a sen
On Sunday, July 17, 2016 08:14:48 PM Wolfram Sang wrote:
>
> > > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > > >
> > > > > For a start, it generates this warning, now:
> > > > >
> > > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined
>
> > > > > I fixed it up (I think, but it needs more work - see below) and can
> > > >
> > > > For a start, it generates this warning, now:
> > > >
> > > > drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined
> > > > but not used [-Wunused-function]
> > > > static acpi_status i2
On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell
> > > wrote:
> > > >
> > >
On Friday, July 15, 2016 09:32:54 PM Wolfram Sang wrote:
> On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> > On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell
> > > wrote:
> > > >
> > >
On Fri, Jul 15, 2016 at 02:19:28PM +0200, Rafael J. Wysocki wrote:
> On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> > Hi all,
> >
> > On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell
> > wrote:
> > >
> > > I fixed it up (I think, but it needs more work - see below) and can
> >
On Friday, July 15, 2016 12:28:53 PM Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell
> wrote:
> >
> > I fixed it up (I think, but it needs more work - see below) and can
>
> For a start, it generates this warning, now:
>
> drivers/i2c/i2c-core.c:269:20
Hi all,
On Fri, 15 Jul 2016 12:17:23 +1000 Stephen Rothwell
wrote:
>
> I fixed it up (I think, but it needs more work - see below) and can
For a start, it generates this warning, now:
drivers/i2c/i2c-core.c:269:20: warning: 'i2c_acpi_add_device' defined but not
used [-Wunused-function]
static
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/i2c/i2c-core.c
between commit:
a7003b65801e ("i2c: core: Cleanup I2C ACPI namespace")
55d38d060e99 ("i2c: core: Add function for finding the bus speed from ACPI")
from the i2c tree and commit:
525e6fabeae2 (
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
MAINTAINERS
between commit:
e269777f72b3 ("MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to
relevant maintainers")
from the arm-soc tree and commit:
9f123def55d3 ("cpufreq: mvebu: Move cpufreq code into driv
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/mach-shmobile/Makefile
between commit:
be32bcbbd182 ("soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc")
from the renesas tree and commit:
a399dc9fc500 ("cpufreq: shmobile: Use generic platdev driv
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Looks good to me and thanks for taking care of this!
Ditto. Thanks!
signature.asc
Description: Digital signature
On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/i2c/busses/i2c-designware-platdrv.c
>
> between commit:
>
> 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
>
> fr
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/i2c/busses/i2c-designware-platdrv.c
between commit:
90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
from the i2c tree and commit:
a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device suppor
On Monday, November 09, 2015 10:45:12 AM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/of/of_pci.c
> include/linux/of_pci.h
>
> between commits:
>
> f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse
> "linux,p
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/of/of_pci.c
include/linux/of_pci.h
between commits:
f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse
"linux,pci-probe-only"")
from Linus' tree and commit:
50230713b639 ("PCI: OF: Move of_pci_dma_
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/pci/probe.c
between commit:
b07461a8e45b ("PCI/AER: Clear error status registers during enumeration and
restore")
from Linus' tree and commit:
29dbe1f0af88 ("PCI: ACPI: Add support for PCI device DMA coherenc
On Mon, 19 Oct 2015 11:59:08 +1100
Stephen Rothwell wrote:
Hi Stephen,
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/mach-omap2/timer.c
>
> between commits:
>
> 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
> 9c46ffcd
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/arm/mach-omap2/timer.c
between commits:
3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT")
from the omap tree and
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver
support")
from the samsung tree and commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory le
Hi Rafael,
On Wed, Feb 11, 2015 at 02:03:49AM +, Rafael J. Wysocki wrote:
> On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
> > On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > Today's linux-next merge of the pm tree got a c
On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
> On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got a conflict in
> > drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
> > resourc
On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
> resources on failure in of_pci_get_host_bridge_resources()") from the
> pci tree and com
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
resources on failure in of_pci_get_host_bridge_resources()") from the
pci tree and commit 5c493df25a0d ("Merge branch 'pci/host-generic' of
git://git.kernel.org/pub/s
On Wednesday, December 03, 2014 12:12:35 PM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in
> include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
> PM / Runtime: Add getter for querying the IRQ safe option v12") from
> the arm
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
PM / Runtime: Add getter for querying the IRQ safe option v12") from
the arm tree and commit 6d14dd40f550 ("PM: Drop CONFIG_PM_RUNTIME from
the driver core") f
On Wednesday, September 10, 2014 02:18:50 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-shmobile/setup-sh73a0.c between commit aa0bdc303b0f
> ("ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits") from the
> arm-soc tree and
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-shmobile/setup-sh73a0.c between commit aa0bdc303b0f
("ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits") from the
arm-soc tree and commit 978027e170fb ("cpufreq: cpu0: rename driver and
internals to 'cpufreq_dt'
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-shmobile/board-ape6evm-reference.c between commit
664b4c172209 ("ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits")
from the arm-soc tree and commit 978027e170fb ("cpufreq: cpu0: rename
driver and internals to
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/configs/mvebu_v7_defconfig between commit fc9fa8714a75 ("ARM:
mvebu: update v7 defconfig with useful options") from the mvebu tree
and commit 978027e170fb ("cpufreq: cpu0: rename driver and internals to
'cpufreq_dt'") fr
On Monday, August 11, 2014 11:43:09 AM Stephen Rothwell wrote:
>
> --Sig_/=CGwKOD1=eH3=syU/3wkRPC
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-kirkwood/pm.c
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM:
Kirkwood: Remove mach-kirkwood") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the pm tree.
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-imx/pm-imx6.c between commit 80c0ecdce802 ("ARM: imx: add
standby mode support for suspend") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the
On Wednesday, July 30, 2014 12:23:05 PM Stephen Rothwell wrote:
>
> --Sig_/ACOdpNyKdCGq/4_bRoeLLze
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
Hi Stephen,
> Today's linux-next merge of the pm tree got a conflict in
> drivers/cpuidle/
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/cpuidle/Kconfig.arm between commit 2aaafcdb6883 ("cpuidle:
big.LITTLE: Add ARCH_EXYNOS entry in config") from the arm-soc tree and
commit 6ee7f5dd57fc ("cpuidle: big_little: Fix build error") from the
pm tree.
I fixed it
On Wednesday, July 16, 2014 03:06:13 AM Zheng, Lv wrote:
> Hi,
>
> > From: Rafael J. Wysocki [mailto:r...@rjwysocki.net]
> > Sent: Tuesday, July 15, 2014 8:15 PM
> >
> > On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote:
> > >
> > > --Sig_/Cs291xJCrI1kc_+PiCdNT0M
> > > Content-Type: te
Hi,
> From: Rafael J. Wysocki [mailto:r...@rjwysocki.net]
> Sent: Tuesday, July 15, 2014 8:15 PM
>
> On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote:
> >
> > --Sig_/Cs291xJCrI1kc_+PiCdNT0M
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote:
>
> --Sig_/Cs291xJCrI1kc_+PiCdNT0M
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/acpi_extlog.c be
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/acpi_extlog.c between commits 2dfb7d51a61d ("trace, RAS:
Add eMCA trace event interface") and d6cae935ec5b ("trace, eMCA: Add a
knob to adjust where to save event log") from the ia64 tree and commit
0a00fd5e20fd ("AC
Rafael J. Wysocki wrote:
>
> On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> > Rafael J. Wysocki wrote:
> > >
> > > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> > > >
> > > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > > > Content-Type: text/plain; charset=US-ASCII
> > > > Content
On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> Rafael J. Wysocki wrote:
> >
> > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> > >
> > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > > Content-Type: text/plain; charset=US-ASCII
> > > Content-Transfer-Encoding: quoted-printable
> > >
Rafael J. Wysocki wrote:
>
> On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> >
> > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got conf
On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
>
> --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got conflicts in
> drivers/cpufreq/exynos-cpufreq.c
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in
drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
dev_err/info functio
On Thursday, May 01, 2014 12:09:32 PM Stephen Rothwell wrote:
>
> --Signature=_Thu__1_May_2014_12_09_32_+1000_d7zY1SkU6vg6nEQn
> Content-Type: text/plain; charset=US-ASCII
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of t
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45
("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree
and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry
macro for iteration"
Today's linux-next merge of the pm tree (5d5e5df) got conflicts in
drivers/i2c/i2c-core.c
caused by commits 0acc2b3 (i2c: Remove redundant 'driver' field from the
i2c_client struct) and a76e9bd (i2c: attach/detach I2C client device to
the ACPI power domain).
I fixed them up (see below).
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/powerpc/kernel/prom.c between commit dc0e643afc50 ("powerpc: Make
prom.c device tree accesses endian safe") from the powerpc tree and
commits 819d596568d8 ("powerpc: refactor of_get_cpu_node to support other
architectures")
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in MAINTAINERS
between commit 15fd830dd310 ("MAINTAINERS: Add ACPI folks for
ACPI-related things under drivers/pci") from the pci tree and commit
994b942fb4eb ("ACPI: Update MAINTAINERS file to include
Documentation/acpi") from the
On Tuesday, April 16, 2013 12:46:11 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commit 5c0b04e3d913 ("PCI/ACPI: Handle PCI
> slot devices when creating/destroying PCI buses") from the pci tree and
> commit 0a34
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c0b04e3d913 ("PCI/ACPI: Handle PCI
slot devices when creating/destroying PCI buses") from the pci tree and
commit 0a34764411aa ("ACPI / scan: Make memory hotplug driver use struct
acpi_scan_han
Hi,
On Wednesday, February 20, 2013 12:55:55 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
> cache _PRT, and don't associate them with bus numbers") from the pci tree
> a
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers") from the pci tree
and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices
depending on power
Hi Stephen,
On Monday, February 18, 2013 12:11:05 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/internal.h between commits 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI:
Hi Stephen,
On Monday, February 18, 2013 12:17:07 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commits 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commits 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
pci_slot built-in only, not a module") from the pci tree and commits
4daeaf68379f ("ACP
1 - 100 of 111 matches
Mail list logo
