[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACRpkdaPsV8OePLn0gOC8wc5Ew94KL1CUmngdrdF4M++xk9Ekg@mail.gmail.com>
Date: Thu, 29 Aug 2013 09:34:45 +0200
From: Linus Walleij <linus.walleij@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Maxime Ripard <maxime.ripard@...e-electrons.com>,
Linus Walleij <linus.walleij@...ricsson.com>,
Sherman Yin <syin@...adcom.com>
Subject: Re: linux-next: manual merge of the pinctrl tree with Linus' tree
On Thu, Aug 29, 2013 at 9:17 AM, Stephen Rothwell <sfr@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists