Hi Linus, Today's linux-next merge of the pinctrl tree got conflicts in Documentation/driver-model/devres.txt, drivers/pinctrl/Kconfig, drivers/pinctrl/Makefile, and drivers/pinctrl/pinctrl-tegra.c between various commits from Linus' tree and various commits from the pinctrl tree. The root cause of these conflicts is that the pinctrl tree was merged into other trees that were meregd into Linus' tree (see commit 813a95e5b4fa on May 23). Somewhere along the line the pinctrl tree was rebased/rewritten (May 25 or so) and a new commit added to it. Also there have been more commits in Linus' tree that affect these files. <rant>So, if your tree/branch is merged into other trees, DO NOT REBASE IT.</rant> I fixed it up (by using the versions of these files from Linus' tree - and removing the call to pinctrl_remove_gpio_range()) and can carry the fixes as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp9x4UPW8nUc.pgp
Description: PGP signature
