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: <5520db7e-ea29-b610-17e3-de596911d26c@amd.com>
Date:   Thu, 14 Apr 2022 08:33:04 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: linux-next: manual merge of the drm-misc tree with the
 drm-misc-fixes tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220414094715.4c2e0127@canb.auug.org.au>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <20220414094715.4c2e0127@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: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SUMxZTk1TXhsdVdXSGJwajdlaU5lbjJ0am11L3pva2doeWtFdkwzWGFudUlo?=
 =?utf-8?B?U3Jnc1RYWjJrd3BwaWVmWnJjL3pSRWZ1bWdJVGtYTHZzYStKNU80d1FScGtu?=
 =?utf-8?B?SlZFQ3ppNnVwV2JtUnNkSStRS0FaZUllNkVRZlo3ZG1XYUdNYVl0OFZXSDdV?=
 =?utf-8?B?N3FVTHpVRVkxczJZZktZZUtPRk1NM1VlUHA4L0lUQ0FsbUkyT2E1N2xwQ2pG?=
 =?utf-8?B?QVk3NHdKQ05kOHRGUXdYOWhxbUtTVlhaZXU3K0MzUUUrbytucGR5YSt2ME0y?=
 =?utf-8?B?a0pKZE1ocXlyNHR3aFFxMXVmNTdCMnRPMEQ5cWRkYlBRcS9BS29CaFZpMmVX?=
 =?utf-8?B?ekVNNk5jNC9kazBwbUVkV3FNajdQUlRiN1RleVJtNUVTcmtCWnpoQjZrd0pt?=
 =?utf-8?B?eE9wekw5L1A2NkJBenlSOG5CQ21yTnhSYWJlc2M5ZUVuY3VydzRVNnczU2Fw?=
 =?utf-8?B?UmhRVDh0Tzd0aUhIMlRJWEtKbWlHc1pPRmlISDljOXRseGs3UEhOM0g4bDIx?=
 =?utf-8?B?ZUtxSVhYdUQ0c0N6Sy9MUkQ0NTBONU5BV0VRSlp6b3ZzN1NyYURhY25EMDVI?=
 =?utf-8?B?RWlvTll3VHQzTGdYeDY2WGwvc200Ym9OcXpYVUc1SWc2aWVLMmpSNkNtRjRF?=
 =?utf-8?B?M1F2dWdwTitvUU5Oa3ZQUlZ1OHZNYlRjeDlUNTN0cjJmYTFwZXdXY3R5VlBH?=
 =?utf-8?B?TXJKNGJZbU9VbjNIUm5wbTJDUllLdGJzWEVxOHdtVm5OVktocW44OVgwclZT?=
 =?utf-8?B?MzlnTlM0ZnFJVjNjQ2FuUzg4cFplb3VhZGRDSTIrNEtjeVpsbElQZ0ttWlFx?=
 =?utf-8?B?bkoyTGpZS1VHQnpJMWk5M041RVcyV3d4MlBHT0JDU2srczYxNGVPVFB6T216?=
 =?utf-8?B?QXg2R3NMdHZ4ZkYrNXdFazNMRnliUy80QitlTis1QUpHaGZqejNEdWFnM1FJ?=
 =?utf-8?B?RTAwcUtkZGNsK09NQ2U5WlQra0x5bmdmSHhXK3REd1gyS1hvUkJnS0dBcFVY?=
 =?utf-8?B?T0o1MG1TOUVydGpHYVpyMmlHK2Zlc283Znh6aWdmSHhTaW1nRmZTN1pFOXFM?=
 =?utf-8?B?T21FYVhhbjlBWGJHZ2hXTnVaTkFZMWZEYUpyTEZweTl1SmJQWlR6ODRoc1lq?=
 =?utf-8?B?aTBtdlFVNHM3bXpxeFZIZExrb1g3eWVmOVBXRnRxMzMvNlhaV2YvV011RU5I?=
 =?utf-8?B?MDMzVnBFd000WlpTODczVUJvY3N2b0VBNi8xckZybnRYQWdxS1dUM0V4Qk15?=
 =?utf-8?B?YVBjbFNDL25VcUVIQjA2Y1E3V1RMMWtLREF5YXBFS0x1SFZxL3lWYk95UmY5?=
 =?utf-8?B?ZThJa01neElkaGluZzdsT3JtTFdpMVc5ZDgwK1dOY1dSYmhWM0cwL1VRRVZ3?=
 =?utf-8?B?QkFKdWhpRWwvZFo3V01icjV4Q1cxKzNxOVhwYlpoeGpBckJCYUZKcXYyTWh6?=
 =?utf-8?B?M3J1dWdONUdRSzBzVVJocEdjMXpnanVnY1dxazJjVk1DdHErUGpSeU5XV0Js?=
 =?utf-8?B?YU1JaXZneEkvVDN5MlhnS1dBVHRUNlEwQXREK3MvMVBUL2llMmtLNlEraURV?=
 =?utf-8?B?UFpsR3JlNjRkQmhkbi9yd0NXbUFYY3ZneHByUnBQajk5eW93QWtzOGNzdFd3?=
 =?utf-8?B?cXZVdG5RQnIzRjZIN2VreG53S3FTeGhsdGJwdEJ2ZElsc3UzTkJ4UTU1bWYr?=
 =?utf-8?B?Zi9ZSXphZ0c3SVBjNXlSYjBkNWozMnVtN2IrN0FoRGlUS0JoTVpjZ01IR3ow?=
 =?utf-8?B?Z2Z3d1AzSEQzaGd1WGY2N3lVVm5BMFU5S2ord2FIR2V6K2FGWkZTK2VmN0Ru?=
 =?utf-8?B?cms5aHhPL0x2VTRFVVJ2SjVXalo3SENIWjVHNVAzeXFvNzg1Mmk0R1ZNenhH?=
 =?utf-8?B?OFdlZitBR0NVUmNDaldhL0lBVHpPZ2FLSndBYjR4RURac1VmeC9Lc1NWSEhH?=
 =?utf-8?B?eE43NnZ4Q1dicWUzZEIxcFZtSURMS0ZXcXdXaEl3blZTUUxpRFRsZ3gyMXVD?=
 =?utf-8?B?WXpnYmIyRU91b0Y5Z01FUjd0c1RKc2hkVENzam1aekZ1cTNoWWRRdGM5NkMw?=
 =?utf-8?B?SFNCWnpiVVJaL21Nc3dQTVFIT08rMUFDV3N3Vm1ZWkRXYjJiOUVJdEN5djdw?=
 =?utf-8?B?RmlCaDNJRnVwd3lUUVB0cnpyYkx1QWFqWFFXNTJzRkdGUXZQbTd0cnR5M1BU?=
 =?utf-8?B?Tk1vdmU3WGdhenExZE1nKzBFNkdxdDhBZzluNTRMbmEwNFVXamdzNmNWMEJm?=
 =?utf-8?B?NmZ1aUpFT3FkOGI4bU0weU1XVnlxalhDeHphS2d2ZFE3ck9Pa1lqR2dXR3pR?=
 =?utf-8?B?WWszWlhhb2hXQm43UnVPcmdOUkI4UU95NUxSSTJpUE5ramhhZWJJV1NCY3k3?=
 =?utf-8?Q?aMwos2ORv/BRb9fGFTNi5XGM6iFOuOW/F3jTLGT/f2ZMO?=
X-MS-Exchange-AntiSpam-MessageData-1: 1R36PYTj7kYuAQ==
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1c151383-c049-4608-e6a9-08da1de0a46b
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 06:33:09.6948
 (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: ELOoVSBBTIG3QIPIqdAa6XLE3tgX7Dn7Yzc1Hhalz/P2Df1L7+Fd8tOPNS4mxFw5
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4646
X-Spam-Status: No, score=-3.4 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

Am 14.04.22 um 01:47 schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
>    drivers/gpu/drm/radeon/radeon_sync.c
>
> between commit:
>
>    022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv")
>
> from the drm-misc-fixes tree and commit:
>
>    7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
>
> from the drm-misc tree.
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary.

I still need to double check the result in linux-next, but that doesn't 
sounds right.

The missing "!" needs to be carried into the new function call.

drm-tip should have the right solution to this merge conflict.

Thanks,
Christian.

> This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>