From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>
Cc: Dave Jiang <dave.jiang@intel.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 dmaengine tree with the dmaengine-fixes tree
Date: Thu, 15 Jul 2021 11:40:55 +1000 [thread overview]
Message-ID: <20210715114055.4eba03e2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
Hi all,
Today's linux-next merge of the dmaengine tree got a conflict in:
drivers/dma/idxd/submit.c
between commit:
da435aedb00a ("dmaengine: idxd: fix array index when int_handles are being used")
from the dmaengine-fixes tree and commit:
6cfd9e62e329 ("dmaengine: idxd: assign MSIX vectors to each WQ rather than roundrobin")
from the dmaengine tree.
I fixed it up (I just used the latter) 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:[~2021-07-15 1:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 1:40 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-12 2:42 linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Stephen Rothwell
2022-04-12 11:16 ` Vinod Koul
2021-12-14 17:24 broonie
2021-12-28 9:09 ` Geert Uytterhoeven
2021-12-28 14:54 ` Jiang, Dave
2022-01-04 21:41 ` Dave Jiang
2022-01-04 23:04 ` Stephen Rothwell
2022-01-05 7:19 ` Vinod Koul
2022-01-06 23:18 ` Dave Jiang
2020-11-19 3:29 Stephen Rothwell
2020-12-14 19:58 ` Stephen Rothwell
2020-12-15 4:33 ` Vinod Koul
2020-07-06 3:56 Stephen Rothwell
2020-07-06 4:23 ` Dave Jiang
2020-07-06 4:41 ` Vinod Koul
2020-07-06 6:03 ` Stephen Rothwell
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=20210715114055.4eba03e2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.