* linux-next: manual merge of the driver-core tree with the rdma tree
@ 2025-06-19 6:30 Stephen Rothwell
2025-06-19 8:18 ` Greg KH
2025-07-29 23:15 ` Stephen Rothwell
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-06-19 6:30 UTC (permalink / raw)
To: Greg KH
Cc: Dennis Dalessandro, Greg Kroah-Hartman, Jason Gunthorpe,
Jason Gunthorpe, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Weißschuh
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the rdma tree
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
2025-07-29 23:15 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2025-06-19 8:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dennis Dalessandro, Jason Gunthorpe, Jason Gunthorpe,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Weißschuh
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the rdma tree
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
@ 2025-07-29 23:15 ` Stephen Rothwell
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-07-29 23:15 UTC (permalink / raw)
To: Greg KH
Cc: Dennis Dalessandro, Greg Kroah-Hartman, Jason Gunthorpe,
Jason Gunthorpe, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Weißschuh
[-- Attachment #1: Type: text/plain, Size: 958 bytes --]
Hi all,
On Thu, 19 Jun 2025 16:30:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
This is now a conflict between the rdma tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-29 23:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2025-07-29 23:15 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).