From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Oded Gabbay <oded.gabbay@gmail•com>,
Ofir Bitton <obitton@habana•ai>
Subject: linux-next: manual merge of the char-misc tree with Linus' tree
Date: Mon, 27 Jul 2020 17:46:33 +1000 [thread overview]
Message-ID: <20200727174633.40fd8f15@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/habanalabs/common/command_submission.c
between commit:
cea7a0449ea3 ("habanalabs: prevent possible out-of-bounds array access")
from Linus' tree and commit:
3abc99bb7dcb ("habanalabs: configure maximum queues per asic")
from the char-misc tree.
I fixed it up (I used parts of each that no longer conflict) 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:[~2020-07-27 7:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 7:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-27 6:49 linux-next: manual merge of the char-misc tree with Linus' tree Stephen Rothwell
2021-08-27 13:12 ` Greg KH
2021-08-27 16:24 ` Kalle Valo
2021-08-27 17:55 ` Manivannan Sadhasivam
2021-08-27 17:58 ` Manivannan Sadhasivam
2021-08-27 19:28 ` Greg KH
2021-08-28 7:27 ` Kalle Valo
2021-08-28 7:50 ` Greg KH
2021-08-28 9:51 ` Manivannan Sadhasivam
2020-07-27 7:56 Stephen Rothwell
2013-07-29 5:01 Stephen Rothwell
2013-07-29 19:26 ` Greg KH
2013-07-29 22:16 ` Tomas Winkler
2013-07-29 22:25 ` Greg KH
2013-07-30 0:27 ` Stephen Rothwell
2013-07-30 1:38 ` 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=20200727174633.40fd8f15@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=obitton@habana$(echo .)ai \
--cc=oded.gabbay@gmail$(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