From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joel Stanley <joel@jms•id.au>, Jeremy Kerr <jk@ozlabs•org>,
Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Eddie James <eajames@linux•ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the fsi tree with the char-misc tree
Date: Tue, 15 Aug 2023 18:27:37 +1000 [thread overview]
Message-ID: <20230815182737.534f4ec2@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2023-08-15 8:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 8:27 Stephen Rothwell [this message]
2023-08-22 11:50 ` linux-next: manual merge of the fsi tree with the char-misc tree Greg KH
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=20230815182737.534f4ec2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=eajames@linux$(echo .)ibm.com \
--cc=greg@kroah$(echo .)com \
--cc=jk@ozlabs$(echo .)org \
--cc=joel@jms$(echo .)id.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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