From: David Miller <davem@davemloft•net>
To: sam@ravnborg•org
Cc: hch@lst•de, sfr@canb•auug.org.au, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, robh@kernel•org
Subject: Re: linux-next: manual merge of the sparc-next tree with the dma-mapping tree
Date: Wed, 12 Dec 2018 10:54:43 -0800 (PST) [thread overview]
Message-ID: <20181212.105443.739412722995225625.davem@davemloft.net> (raw)
In-Reply-To: <20181212163208.GA15535@ravnborg.org>
From: Sam Ravnborg <sam@ravnborg•org>
Date: Wed, 12 Dec 2018 17:32:08 +0100
> On Wed, Dec 12, 2018 at 05:11:46PM +0100, Christoph Hellwig wrote:
>> On Wed, Dec 12, 2018 at 08:44:20AM +0100, Christoph Hellwig wrote:
>> > Dave, Sam:
>> >
>> > should I just apply a version of Rob's tree that takes the refactoring
>> > into account to the dma-mapping tree? That way we should get the right
>> > result independent of the merge order.
>>
>> E.g. something like the patch below:
>>
>> --
>> >From 6ee3d6c39a0c8bc4b58fa601bb4370bdec785be7 Mon Sep 17 00:00:00 2001
>> From: Christoph Hellwig <hch@lst•de>
>> Date: Wed, 12 Dec 2018 17:09:58 +0100
>> Subject: sparc: use DT node full_name in sparc_dma_alloc_resource
>>
>> The sparc tree already has this change for the pre-refactored code,
>> but pulling it into the dma-mapping tree like this should ease
>> the merge conflicts a bit.
>>
>> Signed-off-by: Christoph Hellwig <hch@lst•de>
>> ---
>> arch/sparc/kernel/ioport.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
>> index 51c128d80193..baa235652c27 100644
>> --- a/arch/sparc/kernel/ioport.c
>> +++ b/arch/sparc/kernel/ioport.c
>> @@ -252,7 +252,7 @@ unsigned long sparc_dma_alloc_resource(struct device *dev, size_t len)
>> res = kzalloc(sizeof(*res), GFP_KERNEL);
>> if (!res)
>> return 0;
>> - res->name = dev->of_node->name;
>> + res->name = dev->of_node->full_name;
>>
>> if (allocate_resource(&_sparc_dvma, res, len, _sparc_dvma.start,
>> _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
>
> Whatever works best for everyone is fine for me, so ack from me.
Yeah I'm fine with this too.
prev parent reply other threads:[~2018-12-12 18:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 22:30 linux-next: manual merge of the sparc-next tree with the dma-mapping tree Stephen Rothwell
2018-12-12 7:44 ` Christoph Hellwig
2018-12-12 16:11 ` Christoph Hellwig
2018-12-12 16:32 ` Sam Ravnborg
2018-12-12 18:54 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181212.105443.739412722995225625.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox