Re: [PATCH] staging: csr: fix coding style

2012-10-16 Thread Lauri Hintsala
_ -struct CsrThread -{ -struct task_struct *thread_task; -charname[16]; +struct CsrThreadi { I think this extra i letter at the end of CsrThreadi string is typo. Did you try to compile the driver with your changes? Best regards, Lauri Hintsala + struct t

Re: linux-next: manual merge of the spi-mb tree with the mmc tree

2012-09-05 Thread Lauri Hintsala
On 09/05/2012 06:15 AM, Stephen Rothwell wrote: Hi Mark, Today's linux-next merge of the spi-mb tree got a conflict in drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc: fix deadlock caused by recursion loop") from the mmc tree and commit 829c1bf40b92 ("mmc: spi: Pull out par