On 21/08/2019 12:30, Linus Walleij wrote:
> On Wed, Aug 21, 2019 at 10:13 AM Marc Zyngier wrote:
>
>> Linus: do you want to take this patch (daa19fe5b082) through your tree
>> instead in order to avoid the conflict when this hit the other Linus?
>> It shouldn't create any havoc...
>
> Is it comp
On Wed, Aug 21, 2019 at 10:13 AM Marc Zyngier wrote:
> Linus: do you want to take this patch (daa19fe5b082) through your tree
> instead in order to avoid the conflict when this hit the other Linus?
> It shouldn't create any havoc...
Is it completely independent from the rest? Then I will pick it
On Wed, 21 Aug 2019 07:03:35 +0100,
Stephen Rothwell wrote:
Hi Stephen,
>
> Hi all,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/gpio/gpio-ixp4xx.c
>
> between commit:
>
> daa19fe5b082 ("gpio/ixp4xx: Register the base PA instead of its VA in
> fwnode")
>
Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/gpio/gpio-ixp4xx.c
between commit:
daa19fe5b082 ("gpio/ixp4xx: Register the base PA instead of its VA in fwnode")
from the irqchip tree and commit:
aa7d618ac65f ("gpio: ixp4xx: Convert to hierarchical GPIOLIB_I
4 matches
Mail list logo