Messages in this thread | | | Date | Thu, 29 Aug 2013 09:34:45 +0200 | Subject | Re: linux-next: manual merge of the pinctrl tree with Linus' tree | From | Linus Walleij <> |
| |
On Thu, Aug 29, 2013 at 9:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus, > > Today's linux-next merge of the pinctrl tree got a conflict in > drivers/pinctrl/pinctrl-sunxi.c between commit 1bee963db9dd ("pinctrl: > sunxi: Add spinlocks") from Linus' tree and commit 03b054e9696c > ("pinctrl: Pass all configs to driver on pin_config_set()") from the > pinctrl tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Hm yeah I think I should just merge in the latest -rc to smoothen this over, as both conflicting patches come from my tree...
Yours, Linus Walleij
| |