mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Dan Williams <dan.j.williams@intel.com>,
	<sathyanarayanan.kuppuswamy@linux.intel.com>,
	<yilun.xu@intel.com>, <sameo@rivosinc.com>, <aik@amd.com>,
	<suzuki.poulose@arm.com>, <steven.price@arm.com>,
	<lukas@wunner.de>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devsec-tsm tree with the devsec-tsm-fixes tree
Date: Thu, 8 May 2025 17:32:26 -0700	[thread overview]
Message-ID: <681d4d1ab7cb5_1229d6294d6@dwillia2-xfh.jf.intel.com.notmuch> (raw)
In-Reply-To: <20250508172506.226894cd@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the devsec-tsm tree got a conflict in:
> 
>   drivers/virt/coco/guest/report.c
> 
> between commit:
> 
>   99b9d909187a ("configfs-tsm-report: Fix NULL dereference of tsm_ops")
> (the file is drivers/virt/coco/tsm.c there)
> 
> from the devsec-tsm-fixes tree and commit:
> 
>   e5ab985f1416 ("Merge branch 'for-6.16/tsm' into tsm-next")
> 
> from the devsec-tsm tree.
> 
> I fixed it up (I just used the latter version) 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.

Looks like I flubbed this, will fix.

Thanks Stephen!

      reply	other threads:[~2025-05-09  0:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-08  7:25 Stephen Rothwell
2025-05-09  0:32 ` Dan Williams [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=681d4d1ab7cb5_1229d6294d6@dwillia2-xfh.jf.intel.com.notmuch \
    --to=dan.j.williams@intel.com \
    --cc=aik@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=sameo@rivosinc.com \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=steven.price@arm.com \
    --cc=suzuki.poulose@arm.com \
    --cc=yilun.xu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®