From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Dennis Dalessandro" <dennis.dalessandro@cornelisnetworks.com>,
"Jason Gunthorpe" <jgg@nvidia.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Thomas Weißschuh" <linux@weissschuh.net>
Subject: Re: linux-next: manual merge of the driver-core tree with the rdma tree
Date: Thu, 19 Jun 2025 10:18:45 +0200 [thread overview]
Message-ID: <2025061939-blurt-stereo-0f01@gregkh> (raw)
In-Reply-To: <20250619163041.7e4f9c96@canb.auug.org.au>
On Thu, Jun 19, 2025 at 04:30:41PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/infiniband/hw/qib/qib_sysfs.c
>
> between commit:
>
> 24baad32b710 ("RDMA/qib: Remove outdated driver")
>
> from the rdma tree and commit:
>
> fb506e31b3d5 ("sysfs: treewide: switch back to attribute_group::bin_attrs")
>
> from the driver-core tree.
>
> I fixed it up (I just removed the file) 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 good, thanks!
greg k-h
next prev parent reply other threads:[~2025-06-19 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-19 6:30 linux-next: manual merge of the driver-core tree with the rdma tree Stephen Rothwell
2025-06-19 8:18 ` Greg KH [this message]
2025-07-29 23:15 ` Stephen Rothwell
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=2025061939-blurt-stereo-0f01@gregkh \
--to=greg@kroah.com \
--cc=dennis.dalessandro@cornelisnetworks.com \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@weissschuh.net \
--cc=sfr@canb.auug.org.au \
/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