From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg Ungerer <gerg@snapgear•com>,
Geert Uytterhoeven <geert@linux-m68k•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the m68knommu tree with the m68k-current tree
Date: Wed, 10 Jul 2019 09:30:35 +1000 [thread overview]
Message-ID: <20190710093035.48cc876d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Hi all,
Today's linux-next merge of the m68knommu tree got a conflict in:
arch/m68k/Kconfig
between commit:
f28a1f16135c ("m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire")
from the m68k-current tree and commit:
aef0f78e7460 ("binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option")
from the m68knommu tree.
I fixed it up (see below) 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 --]
reply other threads:[~2019-07-09 23:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190710093035.48cc876d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=geert@linux-m68k$(echo .)org \
--cc=gerg@snapgear$(echo .)com \
--cc=hch@lst$(echo .)de \
--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