On 14.01.22 18:11, Jules Maselbas wrote: > On Fri, Jan 14, 2022 at 06:06:34PM +0100, Ahmad Fatoum wrote: >> Hello Jules, >> >> On 14.01.22 17:54, Jules Maselbas wrote: >>> From: Clement Leger <cleger@xxxxxxxxx> >>> >>> We will add kvx driver in this folder to create a proper hierarchy. >> >> This won't apply cleanly. You need to rebase. Sorry, my pattern matching was too eager. You only add drivers/soc/Kconfig, not drivers/soc/Makefile. The latter was added only recently. > On master ? Or should I wait for 2022.01.0 ? At release time, Sascha tags master and then merges next into master. Then for a month patches are applied onto next and only fixes are cherry-picked to master until next release, so patches rebased on next are least likely to conflict. Given that most arch/kvx stuff you touch wasn't updated in the meantime, I guess you don't need to rebase. Sorry for the confusion! Cheers, Ahmad >> >>> >>> Signed-off-by: Clement Leger <cleger@xxxxxxxxx> >>> Signed-off-by: Jules Maselbas <jmaselbas@xxxxxxxxx> >>> --- >>> drivers/Kconfig | 2 +- >>> drivers/soc/Kconfig | 5 +++++ >>> 2 files changed, 6 insertions(+), 1 deletion(-) >>> create mode 100644 drivers/soc/Kconfig >>> >>> diff --git a/drivers/Kconfig b/drivers/Kconfig >>> index dbdf3c06f5..d66714af9a 100644 >>> --- a/drivers/Kconfig >>> +++ b/drivers/Kconfig >>> @@ -42,7 +42,7 @@ source "drivers/fpga/Kconfig" >>> source "drivers/phy/Kconfig" >>> source "drivers/crypto/Kconfig" >>> source "drivers/memory/Kconfig" >>> -source "drivers/soc/imx/Kconfig" >>> +source "drivers/soc/Kconfig" >>> source "drivers/nvme/Kconfig" >>> source "drivers/ddr/Kconfig" >>> source "drivers/power/Kconfig" >>> diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig >>> new file mode 100644 >>> index 0000000000..d78f13f3f8 >>> --- /dev/null >>> +++ b/drivers/soc/Kconfig >>> @@ -0,0 +1,5 @@ >>> +menu "SoC drivers" >>> + >>> +source "drivers/soc/imx/Kconfig" >>> + >>> +endmenu >>> >> >> >> -- >> Pengutronix e.K. | | >> Steuerwalder Str. 21 | http://www.pengutronix.de/ | >> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | >> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >> >> >> To declare a filtering error, please use the following link : https://www.security-mail.net/reporter.php?mid=9c47.61e1ad9d.ae4c.0&r=jmaselbas%40kalray.eu&s=a.fatoum%40pengutronix.de&o=Re%3A+%5BPATCH+10%2F13%5D+drivers%3A+add+soc+hierarchy+properly&verdict=C&c=835ed3aa69d359c0f8acda9912ca30b77899cc91 >> > > > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
