2015-10-15 11:19 GMT+09:00 Stephen Rothwell <s...@canb.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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/