Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/sh-pfc/pfc-r8a7740.c between commit 5d27619498ab
("sh-pfc: r8a7740: Fix pin bias setup") from Linus' tree and commit
5b46ac3a7723 ("sh-pfc: Rename sh_pfc window field to windows") from the
pinctrl tree.
I fix
On Thu, Aug 29, 2013 at 7:20 PM, Linus Walleij wrote:
>> Note the following return in between the locking and unlocking -
>> need an unlock there?
>>
>>> + case PIN_CONFIG_DRIVE_STRENGTH:
>>> + strength = pinconf_to_config_argument(configs[i]);
>>> +
On Thu, Aug 29, 2013 at 5:24 PM, Sherman Yin wrote:
> Hmm, I fixed this the first time I ported over to LinusW's devel tree,
> but when I rebased on Sunday, the spin lock commit seemed to be
> reverted or gone.
My pinctrl devel branch was branched off of v3.11-rc1, and the
spinlock changes were
>I made a bit different fix, I just lock the spinlock around the entire
>loop, as this is not doing any delays or anything like that and
>just hammer a few registers with the settings, it makes sense to
>have that inside a single lock:
Hmm, I fixed this the first time I ported over to LinusW's dev
On Thu, Aug 29, 2013 at 9:17 AM, Stephen Rothwell wrote:
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I made a bit different fix, I just lock the spinlock around the entire
loop, as this is not doing any delays or anything like that and
just hammer a
On Thu, Aug 29, 2013 at 9:17 AM, Stephen Rothwell 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
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 fixe
On 06/17/2013 08:11 AM, Stephen Rothwell wrote:
> Hi Linus,
Hi Stephen,
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).
The fix looks good.
Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/net/ethernet/ti/davinci_mdio.c between commit 2786aae7fc93
("net/ti davinci_mdio: don't hold a spin lock while calling pm_runtime")
from Linus' tree and commit 5c0e3580cb98 ("drivers: net: davinci_mdio:
use pinctrl PM
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/mtd/nand/atmel_nand.c between commit 28446acb1f82 ("mtd: atmel
nand: fix gpio missing request") from Linus' tree and commit 08695153170c
("MTD: atmel nand: fix gpio missing request") from the pinctrl tree.
I fixed it
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/mach-at91/at91sam9x5.c between commits af2a5f09fb6d ("Replace
clk_lookup.con_id with clk_lookup.dev_id entries for twi clk") and f7d19b906556
("ARM: at91: add clocks for I2C DT entries") from Linus' tree and commi
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/mach-at91/at91sam9263.c between commit f7d19b906556 ("ARM: at91:
add clocks for I2C DT entries") from Linus' tree and commit 5c70cd3c7c69
("arm: at91: dt: at91sam9 add pinctrl support") from the pinctrl tree.
I fixe
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/boot/dts/at91sam9g25ek.dts between commit fbc1871511ed ("ARM:
dts: add twi nodes for atmel boards") from Linus' tree and commit
77ccddbdc0c9 ("arm: at91: dt: at91sam9 add serial pinctrl support") from
the pinctrl tre
13 matches
Mail list logo
