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]
Date:   Tue, 16 Feb 2021 18:19:38 +1100
From:   Stephen Rothwell <>
To:     Bartosz Golaszewski <>,
        David Miller <>,
        Networking <>
Cc:     Bartosz Golaszewski <>,
        Linux Kernel Mailing List <>,
        Linux Next Mailing List <>,
        Nobuhiro Iwamatsu <>
Subject: linux-next: manual merge of the gpio-brgl tree with the net-next

Hi all,

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


between commit:

  df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet controller")

from the net-next tree and commit:

  5103c90d133c ("MAINTAINERS: Add entries for Toshiba Visconti GPIO controller")

from the gpio-brgl 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.

Stephen Rothwell

index 9a8285485f0d,656ae6685430..000000000000
@@@ -2615,13 -2641,11 +2615,15 @@@ L:	linux-arm-kernel@...ts.infradead.or
  S:	Supported
  T:	git git://
  F:	Documentation/devicetree/bindings/arm/toshiba.yaml
+ F:	Documentation/devicetree/bindings/gpio/toshiba,gpio-visconti.yaml
 +F:	Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:	Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:	Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:	arch/arm64/boot/dts/toshiba/
+ F:	drivers/gpio/gpio-visconti.c
 +F:	drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:	drivers/pinctrl/visconti/
 +F:	drivers/watchdog/visconti_wdt.c
  N:	visconti

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists