Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <6e60d396-2a52-d1fa-f125-3c585605b531@amd.com>
Date:   Mon, 11 Jul 2022 10:05:45 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes
 tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Dave Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220711124742.3b151992@canb.auug.org.au>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20220711124742.3b151992@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cUxoYVlMN2VBWEJTQWpPK1V1eU9BdGVYeWl4K0EyK3pacU5abitNb2RobW5W?=
 =?utf-8?B?UWcza290Z204amxJcWZvNHFuZXJpSGxMTTAzWUwvSFk1Sk9idHl5VFB0M3ZB?=
 =?utf-8?B?Y2o3YXpJTEVlbSs1bkY5c3lXYUMwMmhYc2FDTHlLNHE1S24ycERJajhMbmw4?=
 =?utf-8?B?ZTQ2Yys5ZW5tN2tpMzVmOUlMdWxvYnlYNGRQYldVUEQ5OEI1VlQ1ZlVucVNN?=
 =?utf-8?B?Tnc3MWdSWkVJWWhldzAxN1pKNVlJdUgyQzhhcXZ3QnBsNzZXY2RtN2plTFU2?=
 =?utf-8?B?S3FlQnRlREFpSDlHQm5lb0pQVkpuRWtSTUNPUW1BUE9XMUZKVVRuem1FNzBj?=
 =?utf-8?B?NEtod3BxWmRLMUZhSFozYXdySlJ6a2Qvak83WmZDcXRWMjVSU1Boa1Zra2hr?=
 =?utf-8?B?YkNQUjh1RUFQM1dZTGczdTFlYzNHWEtuZTJOb0ZYOTRISS9ra21NSlI0SVBx?=
 =?utf-8?B?VFpWSTY1Q0dJcU9neWN5WjVTbnFsZS9iWnB1S3hRWGpaeVRsbS9qWkhhQU5s?=
 =?utf-8?B?alJoTG1lTGd4QVQ3WXpNanJNWUJpY0VzeHl5RFFMRVpseEVuN2ZqRmRIejlz?=
 =?utf-8?B?d1hRSVAwU0pJQWpYdDBndjdtSkxxS2hMMkIzc0JvR2FSSThsY080OVZ6YUlj?=
 =?utf-8?B?QnNjUGhabzIwbXptdjgraGhJcG9uRlFEV3BRRjIzV0I2VTZZWXVEUnhHN3Bw?=
 =?utf-8?B?Vm1yK0FIaUJZK0ZaRzJ6eDRLUWx0em9BZXJtVS9xWUwrb0ZTeDlVMHJ0eHhq?=
 =?utf-8?B?OVoxWkxjTWJCOHozSFVQazZOUzFUZDlleG01bCs1RFAxRSsvQnRlRWxjcGtl?=
 =?utf-8?B?TFhkM24wcktjaEhVcnZPUEFidkloZHk5cHVKd2p4WjFuTDVQcHdBdnFYSHJz?=
 =?utf-8?B?Y09NQUVPWFVSMU1wampSOFZHZUF3TG1tRkY0NUJTcEp0aW5WRU5LbFpYVnNJ?=
 =?utf-8?B?ZDF2VmV6aGZOL1JZQ256WkhTYjh2UGc1Qi9yYUhHUjI0cVF2VjZZbGR5V0hh?=
 =?utf-8?B?bDNYbFJhMDlwN29ZUjBHajZaSDdjWDlpMGZWcklOYktYMU9OMi9RYThMUE5z?=
 =?utf-8?B?b1V6U1hINExReEs0SnpzWE5abUdzR3AwOEFGZi9TbSt5OUtSSEVzQXYyS2s2?=
 =?utf-8?B?RDZheFVnYVhFai9aWFptM0lVaktKc0VGaC9hS2dhUi85U2pHWlhKVlZWb0hB?=
 =?utf-8?B?NllIOVhnZS95RS9qVkpuZXhUOC9lWTRuSzAwVnE5cE1VQWZDRGZTS2hROVJh?=
 =?utf-8?B?NVNZNVZndmpZUEoyNXh3SU1NaU1yR2ZEWkY2dTdDd3lVc3pwNlpzeHhwdnc3?=
 =?utf-8?B?VllLbVRSMjlsaERTNU5kb2tRcWFXRkxDUEhURFVYTk5meThlRWFxQ2M1MnRR?=
 =?utf-8?B?SjlPVVBielQrWGl2dTlMOSt4UUt3TlB3a3FhZFRLcTdaREJ5TFVqZ29EMzBL?=
 =?utf-8?B?NmJUUVBlRHlpNUJFTmRvUmJSUE9ydEdFWE5SbFFsSDh4K0kyNklVTVlubWRG?=
 =?utf-8?B?YjBxb3dhRDR6TUZNZTRvenpQaE9oREx6TWpxL2NjWldIZEJDZ0czZGVKNmlG?=
 =?utf-8?B?cFdEbFNpWHYraDRsMkhZRUkrQVgwd1Y2Z1pxTjNTSmdBUGlJWGR5MWxzdUNB?=
 =?utf-8?B?bU9JMjdBRnhVWHVpOGpDangxR2JtVWtJTXFLRCtPVWgyallERmE0UVNKanpR?=
 =?utf-8?B?TTc4S3ZHTHlGeEhpTUxnaWh1aUc5bnBtUXIvTmx5ZEhzSGp5a0g5S1VtYTUz?=
 =?utf-8?B?ZHFBQ2RnT1JvWWdCT0FjMkZiZkdqZzlNeDRsWExmTkVvRkhqcmhhUlN6b3hF?=
 =?utf-8?B?NXM3ZUFFVGVKRmsxdjg3QmJML2tleGVaUXhmUlArSTY0UDdscUFnVHQySlFS?=
 =?utf-8?B?K1JCSllYK0hUbVRTb05pOUcybWZ1SVVuTVJKK0J3QjNtTll1YzVhT0wycXVz?=
 =?utf-8?B?VzQvSFppRllaZWNHdU1JMWFocWIvcElBZzBQS0s4eThDcFhHL05aZUd3MS96?=
 =?utf-8?B?LzV3YlRET1dwa0tYblBvSHE1TVpWQXI1ZXhwMFFhUkR2RkhGWUttYVJXVmVG?=
 =?utf-8?B?R1B0UU05NHR4TmJTWVI0VGltcXNYdFNlbVp0RWtqeUFFUHErbTY1NzVZUS9X?=
 =?utf-8?Q?8VRlMpfTqvyApm13yp7Gf/KIY?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 68869396-f461-4a1c-6c19-08da63142bea
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 08:05:51.7219
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: vN/qXaRD+K/YwjRqNHL+z8Oi+FndnW3v+i+eXIrizxITrSFMdOCUpEfVTYvopshC
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4751
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Stephen,

Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
>    drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
>
> between commit:
>
>    925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
>
> from the drm-misc-fixes tree and commit:
>
>    5e3f1e7729ec ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new")
>
> from the drm tree.
>
> This is a mess :-(  I have just reverted the above revert before mergin
> the drm tree for today, please fix it up.

Sorry for the noise, the patch "5e3f1e7729ec ("drm/amdgpu: fix start 
calculation in amdgpu_vram_mgr_new")" and another one is going to be 
reverted from the drm tree as well.

It's just that -fixes patches where faster than -next patches.

Regards,
Christian.


>