linux-kernel - linux-next: manual merge of the risc-v tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230605085122.38f696e0@canb.auug.org.au>
Date:   Mon, 5 Jun 2023 08:51:22 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Palmer Dabbelt <palmer@...osinc.com>,
        Sunil V L <sunilvl@...tanamicro.com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  cc9e654a7e81 ("MAINTAINERS: Add entry for drivers/acpi/riscv")

from the risc-v 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

diff --cc MAINTAINERS
index 607504217dc3,0d6ecb5a4107..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -406,6 -406,19 +406,13 @@@ L:	linux-arm-kernel@...ts.infradead.or
  S:	Maintained
  F:	drivers/acpi/arm64
  
 -ACPI SERIAL MULTI INSTANTIATE DRIVER
 -M:	Hans de Goede <hdegoede@...hat.com>
 -L:	platform-driver-x86@...r.kernel.org
 -S:	Maintained
 -F:	drivers/platform/x86/serial-multi-instantiate.c
 -
+ ACPI FOR RISC-V (ACPI/riscv)
+ M:	Sunil V L <sunilvl@...tanamicro.com>
+ L:	linux-acpi@...r.kernel.org
+ L:	linux-riscv@...ts.infradead.org
+ S:	Maintained
+ F:	drivers/acpi/riscv/
+ 
  ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
  M:	Sudeep Holla <sudeep.holla@....com>
  L:	linux-acpi@...r.kernel.org

Content of type "application/pgp-signature" skipped