linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Nick Kossifidis <mick@ics.forth.gr>,
	Palmer Dabbelt <palmerdabbelt@google.com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Date: Tue, 27 Apr 2021 09:42:00 +1000	[thread overview]
Message-ID: <20210427094200.567d8555@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/kernel/setup.c

between commit:

  ce989f1472ae ("RISC-V: Fix out-of-bounds accesses in init_resources()")

from Linus' tree and commit:

  ffe0e5261268 ("RISC-V: Improve init_resources()")

from the risc-v tree.

I fixed it up (I used the latter since it fixed the same problem as the
former but in a different way) 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:[~2021-04-26 23:42 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-26 23:42 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-11 22:55 linux-next: manual merge of the risc-v tree with Linus' tree Stephen Rothwell
2024-01-07 22:49 Stephen Rothwell
2024-01-11 17:20 ` Palmer Dabbelt
2023-11-02 22:14 Stephen Rothwell
2023-08-30 23:29 Stephen Rothwell
2023-08-31 17:50 ` Nick Desaulniers
2023-09-01 15:46   ` Palmer Dabbelt
2023-08-30 23:25 Stephen Rothwell
2023-07-04 23:46 Stephen Rothwell
2023-06-04 22:51 Stephen Rothwell
2023-02-05 22:48 Stephen Rothwell
2023-02-05 22:40 Stephen Rothwell
2023-02-05 22:43 ` Stephen Rothwell
2023-01-08 21:42 Stephen Rothwell
2022-12-12 23:03 Stephen Rothwell
2022-10-13 22:11 Stephen Rothwell
2022-07-24 23:33 Stephen Rothwell
2022-03-22 22:06 Stephen Rothwell
2021-12-19 22:47 Stephen Rothwell
2021-07-05 23:32 Stephen Rothwell
2021-06-14 23:26 Stephen Rothwell
2021-03-30 22:40 Stephen Rothwell
2021-04-02  4:33 ` Palmer Dabbelt
2021-02-23 22:00 Stephen Rothwell
2020-10-25 22:01 Stephen Rothwell
2020-01-13 22:05 Stephen Rothwell
2020-01-05 22:32 Stephen Rothwell
2020-01-06  1:50 ` Paul Walmsley
2020-01-06  1:55   ` 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=20210427094200.567d8555@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mick@ics.forth.gr \
    --cc=palmer@dabbelt.com \
    --cc=palmerdabbelt@google.com \
    --cc=paul@pwsan.com \
    /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).