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
| ||
|
Message-ID: <CAJKOXPdug+xtGNYReqV-THnnNF1iRW7Rh54kEWMrw22k-wNPpw@mail.gmail.com> Date: Thu, 15 Oct 2015 11:23:28 +0900 From: Krzysztof Kozlowski <k.kozlowski@...sung.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Lee Jones <lee.jones@...aro.org>, Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>, linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Kukjin Kim <kgene@...nel.org> Subject: Re: linux-next: manual merge of the mfd tree with the arm-soc tree 2015-10-15 11:19 GMT+09:00 Stephen Rothwell <sfr@...b.auug.org.au>: > Hi Lee, > > Today's linux-next merge of the mfd tree got a conflict in: > > Documentation/devicetree/bindings/mfd/s2mps11.txt > > between commit: > > 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11") > > from the arm-soc tree and commit: > > db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X") > > from the mfd tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks! The fix for conflict is good. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists