linux-kernel - linux-next: manual merge of the pinctrl tree with Linus' tree

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 28 May 2012 13:08:51 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the pinctrl tree with Linus' tree

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped