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 for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Tue, 16 Feb 2021 02:20:29 +0000
From:   <>
To:     <>, <>,
        <>, <>, <>,
CC:     <>, <>,
Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc


> -----Original Message-----
> From: Stephen Rothwell []
> Sent: Tuesday, February 16, 2021 11:05 AM
> To: David Miller <>; Networking <>; Olof Johansson <>; Arnd
> Bergmann <>; ARM <>
> Cc: Bartosz Golaszewski <>; Linux Kernel Mailing List <>; Linux
> Next Mailing List <>; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT)
> <>
> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
> Hi all,
> Today's linux-next merge of the net-next tree got conflicts in:
>   arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
>   arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
> between commits:
>   4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
>   0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver")
> from the arm-soc tree and commit:
>   ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 ethernet controller")
> from the net-next 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.

This is because the DTS changes are included in net-next. This patch should be merged via the soc tree.
I had the same problem before. How is it correct to send a DTS patch?
Should I separate into different series?

Best regards,

Powered by blists - more mailing lists