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>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240712095825.6e1224d9@canb.auug.org.au>
Date: Fri, 12 Jul 2024 09:58:25 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mike Turquette <mturquette@...libre.com>, Stephen Boyd
 <sboyd@...nel.org>, Olof Johansson <olof@...om.net>, Arnd Bergmann
 <arnd@...db.de>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>, Drew Fustini
 <dfustini@...storrent.com>, Drew Fustini <drew@...7.com>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Yangtao Li <frank.li@...o.com>
Subject: linux-next: manual merge of the clk tree with the arm-soc tree

Hi all,

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

  MAINTAINERS

between commit:

  480d9a6083f4 ("MAINTAINERS: thead: add git tree")

from the arm-soc tree and commit:

  1037885b309c ("dt-bindings: clock: Document T-Head TH1520 AP_SUBSYS controller")

from the clk 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 44cff47c2594,04eb5587ffa7..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19382,8 -19322,9 +19382,10 @@@ M:	Guo Ren <guoren@...nel.org
  M:	Fu Wei <wefu@...hat.com>
  L:	linux-riscv@...ts.infradead.org
  S:	Maintained
 +T:	git https://github.com/pdp7/linux.git
+ F:	Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml
  F:	arch/riscv/boot/dts/thead/
+ F:	include/dt-bindings/clock/thead,th1520-clk-ap.h
  
  RNBD BLOCK DRIVERS
  M:	Md. Haris Iqbal <haris.iqbal@...os.com>

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ