lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the devicetree tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/of/fdt.c between commit e55b0829cbac ("of: fdt: Constify
'pathp'") from the devicetree tree and commit "drivers/of/fdt.c: re-use
kernel's kbasename()" from the akpm tree.

I fixed it up (using the akpm tree patch) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-11-26 14:41    [W:0.023 / U:1.492 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site