Re: [PATCH v2 01/20] drm/amdgpu: Fix trailing whitespaces

From: Thomas Zimmermann <tzimmermann-l3A5Bk7waGM@public.gmane.org>
To: Alex Deucher <alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: "Sam Ravnborg" <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>,
	"Dave Airlie" <airlied-cv59FeDIM0c@public.gmane.org>,
	nouveau
	<nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	"Intel Graphics Development"
	<intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	"Maling list - DRI developers"
	<dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	"open list:VIRTIO CORE,
	NET..."
	<virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>,
	"amd-gfx list"
	<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	"Alex Deucher" <alexander.deucher-5C7GfCeVMHo@public.gmane.org>,
	spice-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	intel-gvt-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	"Christian König" <christian.koenig-5C7GfCeVMHo@public.gmane.org>
Subject: Re: [PATCH v2 01/20] drm/amdgpu: Fix trailing whitespaces
Date: Wed, 2 Dec 2020 15:28:28 +0100	[thread overview]
Message-ID: <6d286f72-6669-9027-97d9-7981beb0240b@suse.de> (raw)
In-Reply-To: <CADnq5_O6X_kbdT8ZTzL1P35wgauVNc77voWf97LogDJXia5VTg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>

[-- Attachment #1.1.1: Type: text/plain, Size: 4166 bytes --]

Hi

Am 02.12.20 um 15:02 schrieb Alex Deucher:
> On Wed, Dec 2, 2020 at 3:53 AM Thomas Zimmermann <tzimmermann-l3A5Bk7waGM@public.gmane.org> wrote:
>>
>> Hi
>>
>> Am 02.12.20 um 09:43 schrieb Christian König:
>>> Am 02.12.20 um 08:59 schrieb Thomas Zimmermann:
>>>> Hi
>>>>
>>>> Am 01.12.20 um 11:40 schrieb Christian König:
>>>>> Reviewed-by: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org> on patch #1
>>>>> and #15.
>>>>>
>>>>> Acked-by: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org> on patch #2 and
>>>>> #16.
>>>>
>>>> Could you add these patches to the AMD tree?
>>>
>>> Alex is usually the one who picks such stuff up.
>>>
>>> But when people send out patch sets which mix changes from different
>>> drivers it is more common to push them through drm-misc-next.
>>
>> I'm OK with drm-misc-next. I just don't want to add too many merge
>> conflicts in your side.
> 
> Yeah, it doesn't matter to me.  I assumed you wanted to land this
> whole series so you could move forward with further cleanups.  If we
> merge via different trees, you'll have to wait for all of this to come
> together again in drm-next.

OK, sure. I'll merge it through drm-misc-next.

Best regards
Thomas

> 
> Alex
> 
> 
>>
>> Best regards
>> Thomas
>>
>>>
>>> Regards,
>>> Christian.
>>>
>>>>
>>>> Best regards
>>>> Thomas
>>>>
>>>>>
>>>>> Regards,
>>>>> Christian.
>>>>>
>>>>> Am 01.12.20 um 11:35 schrieb Thomas Zimmermann:
>>>>>> Adhere to kernel coding style.
>>>>>>
>>>>>> Signed-off-by: Thomas Zimmermann <tzimmermann-l3A5Bk7waGM@public.gmane.org>
>>>>>> Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
>>>>>> Acked-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
>>>>>> Cc: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
>>>>>> Cc: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org>
>>>>>> ---
>>>>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++---
>>>>>>    1 file changed, 3 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>> index 5f304425c948..da23c0f21311 100644
>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>> @@ -4922,8 +4922,8 @@ pci_ers_result_t
>>>>>> amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta
>>>>>>        case pci_channel_io_normal:
>>>>>>            return PCI_ERS_RESULT_CAN_RECOVER;
>>>>>>        /* Fatal error, prepare for slot reset */
>>>>>> -    case pci_channel_io_frozen:
>>>>>> -        /*
>>>>>> +    case pci_channel_io_frozen:
>>>>>> +        /*
>>>>>>             * Cancel and wait for all TDRs in progress if failing to
>>>>>>             * set  adev->in_gpu_reset in amdgpu_device_lock_adev
>>>>>>             *
>>>>>> @@ -5014,7 +5014,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct
>>>>>> pci_dev *pdev)
>>>>>>            goto out;
>>>>>>        }
>>>>>> -    adev->in_pci_err_recovery = true;
>>>>>> +    adev->in_pci_err_recovery = true;
>>>>>>        r = amdgpu_device_pre_asic_reset(adev, NULL, &need_full_reset);
>>>>>>        adev->in_pci_err_recovery = false;
>>>>>>        if (r)
>>>>>
>>>>
>>>
>>
>> --
>> Thomas Zimmermann
>> Graphics Driver Developer
>> SUSE Software Solutions Germany GmbH
>> Maxfeldstr. 5, 90409 Nürnberg, Germany
>> (HRB 36809, AG Nürnberg)
>> Geschäftsführer: Felix Imendörffer
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> dri-devel mailing list
> dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[-- Attachment #2: Type: text/plain, Size: 182 bytes --]

_______________________________________________
Nouveau mailing list
Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/nouveau