> > >> >> This set of patches introduces the core driver and support for two > > >> >> different > > >> >> subsystems: > > >> >> - Regulators > > >> > > > >> >> .../ABI/testing/sysfs-driver-input-axp-pek | 11 + > > >> >> Documentation/devicetree/bindings/mfd/axp20x.txt | 93 +++++++ > > >> >> .../devicetree/bindings/vendor-prefixes.txt | 1 + > > >> >> arch/arm/configs/multi_v7_defconfig | 3 + > > >> >> arch/arm/configs/sunxi_defconfig | 4 + > > >> >> drivers/input/misc/Kconfig | 11 + > > >> >> drivers/input/misc/Makefile | 1 + > > >> >> drivers/input/misc/axp20x-pek.c | 281 > > >> >> +++++++++++++++++++++ > > >> >> drivers/mfd/Kconfig | 12 + > > >> >> drivers/mfd/Makefile | 1 + > > >> >> drivers/mfd/axp20x.c | 258 > > >> >> +++++++++++++++++++ > > >> >> include/linux/mfd/axp20x.h | 180 > > >> >> +++++++++++++ > > >> >> 12 files changed, 856 insertions(+) > > >> > > > >> > The regulator changes don't appear to be showing up in the diffstat or > > >> > obviously in the series? > > >> > > >> Right. Cut-and-paste error. > > >> You have already applied the regulator patches so I didn't include > > >> them here (in theory I posted this series to be picked up by Lee). > > > > > > That's fine. Just tell me which patches need to stay together and > > > which are able to be applied through their respective subsystem trees > > > separately. Then, once I have all the Acks I can apply no problem. > > > > Hi Lee, > > I'd say #1 for the MFD tree, #4 for the input subsystem, #2 #3 and #5 > > are documentations, #6 and #7 defconfigs add-on. > > I am fine with the input piece going through MFD tree, no need to split > it from the rest.
Do you want a pull-request i.e. will this cause conflicts when Linus merges it with your tree, or is it okay for me to just apply it? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.