From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Simon Horman <horms+renesas@verge.net.au>
Subject: linux-next: manual merge of the slave-dma tree with Linus' tree
Date: Tue, 11 Jun 2019 16:32:46 +1000 [thread overview]
Message-ID: <20190611163246.6f90fba6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 756 bytes --]
Hi all,
Today's linux-next merge of the slave-dma tree got a conflict in:
include/linux/sudmac.h
between commit:
49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 311")
from Linus' tree and commit:
9a0f780958bb ("dmaengine: sudmac: remove unused driver")
from the slave-dma tree.
I fixed it up (I 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 --]
next reply other threads:[~2019-06-11 6:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 6:32 Stephen Rothwell [this message]
2019-06-11 10:08 ` linux-next: manual merge of the slave-dma tree with Linus' tree Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2020-03-12 5:26 Stephen Rothwell
2020-03-12 7:16 ` Peter Ujfalusi
2020-03-13 12:42 ` Vinod Koul
2019-02-26 4:24 Stephen Rothwell
2019-02-26 17:22 ` Vinod Koul
2019-01-23 2:41 Stephen Rothwell
2012-12-18 23:44 Stephen Rothwell
2012-03-27 0:45 Stephen Rothwell
2012-03-09 2:25 Stephen Rothwell
2011-08-26 1:46 Stephen Rothwell
2011-07-27 2:08 Stephen Rothwell
2011-07-27 3:12 ` Koul, Vinod
2011-07-27 16:25 ` Koul, Vinod
2011-07-27 20:19 ` Russell King - ARM Linux
2011-07-27 20:29 ` Grant Likely
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=20190611163246.6f90fba6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=gregkh@linuxfoundation.org \
--cc=horms+renesas@verge.net.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).