* linux-next: manual merge of the fsi tree with the char-misc tree
@ 2023-08-15 8:27 Stephen Rothwell
2023-08-22 11:50 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-08-15 8:27 UTC (permalink / raw)
To: Joel Stanley, Jeremy Kerr, Greg KH, Arnd Bergmann
Cc: Eddie James, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Hi all,
Today's linux-next merge of the fsi tree got a conflict in:
drivers/fsi/fsi-core.c
between commits:
adde0e112c63 ("fsi: Improve master indexing")
b1d3a803acfa ("fsi: Lock mutex for master device registration")
from the char-misc tree and commit:
4ecd69609bc0 ("fsi: Improve master indexing")
from the fsi tree.
I fixed it up (I used the char-misc tree version as it seems to be newer)
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] 2+ messages in thread
* Re: linux-next: manual merge of the fsi tree with the char-misc tree
2023-08-15 8:27 linux-next: manual merge of the fsi tree with the char-misc tree Stephen Rothwell
@ 2023-08-22 11:50 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2023-08-22 11:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Joel Stanley, Jeremy Kerr, Arnd Bergmann, Eddie James,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Aug 15, 2023 at 06:27:37PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the fsi tree got a conflict in:
>
> drivers/fsi/fsi-core.c
>
> between commits:
>
> adde0e112c63 ("fsi: Improve master indexing")
> b1d3a803acfa ("fsi: Lock mutex for master device registration")
>
> from the char-misc tree and commit:
>
> 4ecd69609bc0 ("fsi: Improve master indexing")
>
> from the fsi tree.
>
> I fixed it up (I used the char-misc tree version as it seems to be newer)
> 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 should hopefully be fixed now that the fsi tree sent me these
changes to take.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-22 11:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-15 8:27 linux-next: manual merge of the fsi tree with the char-misc tree Stephen Rothwell
2023-08-22 11:50 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox