From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Moritz Fischer <mdf@kernel•org>, Xu Yilun <yilun.xu@intel•com>,
Wu Hao <hao.wu@intel•com>, Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Matthew Gerlach <matthew.gerlach@linux•intel.com>,
Randy Dunlap <rdunlap@infradead•org>
Subject: linux-next: manual merge of the fpga tree with the tty tree
Date: Mon, 23 Jan 2023 12:45:02 +1100 [thread overview]
Message-ID: <20230123124502.725e8700@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Hi all,
Today's linux-next merge of the fpga tree got conflicts in:
drivers/fpga/dfl.c
drivers/fpga/dfl.h
between commit:
4747ab89b4a6 ("fpga: dfl: add basic support for DFHv1")
from the tty tree and commits:
3afe90d5b7a4 ("fpga: dfl: kernel-doc corrections")
e5541aae450e ("fpga: dfl: more kernel-doc corrections")
from the fpga tree.
I fixed it up (overlapping fixes, I used the former 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-23 1:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 1:45 Stephen Rothwell [this message]
2023-01-24 16:42 ` linux-next: manual merge of the fpga tree with the tty tree Xu Yilun
2023-01-24 17:01 ` 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=20230123124502.725e8700@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hao.wu@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthew.gerlach@linux$(echo .)intel.com \
--cc=mdf@kernel$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=yilun.xu@intel$(echo .)com \
/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