From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C183334698 for ; Mon, 17 Nov 2025 14:47:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390858; cv=none; b=k7VjJ1yvCKM4DqFWxnbCWttQg3vJMk11YrhGrtc+L8bJQlaambN23c+kNcOfho67UyATa98VleoFohSJ5jIWNYj9nOno6d78ZgBnc1ndB0n1C9f1uw0bsa/rcMknQbDttp30rEC3dnXConshmsaqKa7D2wnzk3OJtIDFdS1a8l4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763390858; c=relaxed/simple; bh=A0n0rVGlIvQaQ4RMVsNOeH+W0OfM/ETsXcLVOCdxSPE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CGw2esLTpqhAB7rziTJug4Co+xFzu/QJPDJgbohTPKHAD2+eClAneW5db85jDx08/QVdZgWY4IaHrvQZcHAu/tsvdoF/OI0Zj3Ra0Nu/xSoeWrHxNXI2hUXLc/NlRIaE0FJ1Ub5zCvgOaLLoSk5ySbh3V+WX6OkQjXEq47nUDNM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Xy199t00; arc=none smtp.client-ip=209.85.221.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Xy199t00" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-42b2ffe9335so5076893f8f.1 for ; Mon, 17 Nov 2025 06:47:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763390855; x=1763995655; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1afKzXBvDN2B8nMak2qBkyd/NfZbmiS2FTEiE1WftWI=; b=Xy199t003kKXwmi3aqeNl4qxb0GNe04AKKyPqqFYRYdPcr8yjtc5KLk9DGOfXLejq1 TbHgWrXIUoM+RemDfNb0pgQaLpiDXbywCLKVRpNivLAADo5vTLIW3iaYqaP/3lNoIznU UWIjG77QZqfAiY2HrV7Ez0EbDXgmMnGc3DH4DzDid4tPcZ7B5ynCRojBdcV4/dPjlO3+ Zq+nZZyOSYn4O8kUG6Qk2nW5F/efXprkSUe/5gVkI8dcFS+Gt8S+Dln+gIAXuvrQeoKB kSRClF1vCHv25IdjiQwX7ifGjKLmc3QdDk3tChLR3FGBMfTwnFOq9qvF2+cWzgCX9dee EWMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763390855; x=1763995655; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1afKzXBvDN2B8nMak2qBkyd/NfZbmiS2FTEiE1WftWI=; b=B23dePjqCHGRR9KliwjqgRDDTGNCUd3SqVs4iPQjEpw1FtKzjyV1vefcE8R+ZLK0iD civHMNqGqGzuoreKffVp3j/lT1DsZepPqiVEfxl0kymvBe2BRMP+TMLDP97pp2jhZLDM NhI1KgwIbaAB42FnDv2bXsgXXaVer9DP9dyBVN4mQ+tYaWM7a8gLM94FK6OOo6GZgCfk keug7hupQL6U1UtkqoPoMEtT3gRawia3YCbd+eF3xsD+mgWads2NNbNraN5pIou3BEUT AiGpOeF+m+mlSmRGAxhP6C1hgfa7JTI8k7xuGnU2rwRVLoGuxsxUm/3vibFU+4K9fW4w vwzg== X-Forwarded-Encrypted: i=1; AJvYcCVPIPYqAtkFGAqNUDoa3iCOA+Mx50kiYmeMXEcVBArQlr7ID90a7MYXPatj7d0Dq3jGFBCE21fJZSvegoY=@vger.kernel.org X-Gm-Message-State: AOJu0YxA1g9nI1cStUhJur73Nq7PlWbbs5xf9JPD5/zqcYKkASUwLCOj l1lF69Xne3Dj0Wg/PC9O5wdz21CPW87eOkfk8GxTb3fRYplS4YZtRHvHfxwlIJNzouekTw78XNa NNzZWnlNJszmY/r4jHw== X-Google-Smtp-Source: AGHT+IG4MSO3uDNVkkjHl4LD8jbMYRbszWJo4l7hg5OncA4XN7bZli/XM7nXH2lpDQawElX+dHs3KKQ+UmmuEqs= X-Received: from wrbee4.prod.google.com ([2002:a05:6000:2104:b0:42b:3308:563]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:22c1:b0:42b:3131:5438 with SMTP id ffacd0b85a97d-42b5939b2f2mr13082328f8f.54.1763390854762; Mon, 17 Nov 2025 06:47:34 -0800 (PST) Date: Mon, 17 Nov 2025 14:47:33 +0000 In-Reply-To: <20251117160621.2043a859@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251117160621.2043a859@canb.auug.org.au> Message-ID: Subject: Re: linux-next: manual merge of the driver-core tree with the drm-rust tree From: Alice Ryhl To: Stephen Rothwell Cc: Greg KH , Danilo Krummrich , "Rafael J. Wysocki" , Alexandre Courbot , Alistair Popple , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="utf-8" On Mon, Nov 17, 2025 at 04:06:21PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/gpu/nova-core/driver.rs > > between commit: > > 1101c442410c ("gpu: nova-core: Set correct DMA mask") > > from the drm-rust tree and commits: > > 0242623384c7 ("rust: driver: let probe() return impl PinInit") > e4e679c8608e ("rust: auxiliary: unregister on parent device unbind") > > from the driver-core tree. > > I fixed it up (I think - see below) and can carry the fix as > necessary. 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. Thanks! Looks good. Alice