Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/powerpc/kernel/ptrace/ptrace-view.c
between commit:
e0d8e991be64 ("powerpc/book3s64/kuap: Move UAMOR setup to key init function")
from the powerpc tree and commit:
5e39a71bddb3 ("powerpc: switch to
On Wed, May 01, 2013 at 10:31:33AM +0530, Vasant Hegde wrote:
> On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
> >Hi Al,
> >
> >Today's linux-next merge of the vfs tree got a conflict in
> >arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
> >("powerpc/rtas_flash: Fix bad memory
On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
("powerpc/rtas_flash: Fix bad memory access") from the powerpc tree and
commits ad18a364f186 ("powerpc/rtas_flash: Free
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
("powerpc/rtas_flash: Fix bad memory access") from the powerpc tree and
commits ad18a364f186 ("powerpc/rtas_flash: Free kmem upon module exit")
and 2352ad01409d ("ppc:
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
(powerpc/rtas_flash: Fix bad memory access) from the powerpc tree and
commits ad18a364f186 (powerpc/rtas_flash: Free kmem upon module exit)
and 2352ad01409d (ppc: Clean
On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
(powerpc/rtas_flash: Fix bad memory access) from the powerpc tree and
commits ad18a364f186 (powerpc/rtas_flash: Free
On Wed, May 01, 2013 at 10:31:33AM +0530, Vasant Hegde wrote:
On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
(powerpc/rtas_flash: Fix bad memory access) from the
On Mon, 2013-04-29 at 11:35 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in
> arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186
> ("powerpc/rtas_flash: Free kmem upon module exit"), from the powerpc
> tree and commit 5c0333c00ff6 ("ppc: Clean
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186
("powerpc/rtas_flash: Free kmem upon module exit"), from the powerpc
tree and commit 5c0333c00ff6 ("ppc: Clean up rtas_flash driver somewhat")
from the vfs tree.
I
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186
(powerpc/rtas_flash: Free kmem upon module exit), from the powerpc
tree and commit 5c0333c00ff6 (ppc: Clean up rtas_flash driver somewhat)
from the vfs tree.
I fixed it
On Mon, 2013-04-29 at 11:35 +1000, Stephen Rothwell wrote:
Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186
(powerpc/rtas_flash: Free kmem upon module exit), from the powerpc
tree and commit 5c0333c00ff6 (ppc: Clean up
11 matches
Mail list logo