Hi Andrew,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm64/mm/proc.S
between commits:
67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace support")
68d23da4373a ("rm64
On Thu 23-07-15 16:00:48, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> fs/ext3/super.c
>
> between commit:
>
> 106542e7987c ("fs: Remove ext3 filesystem driver")
>
> from the FIXME tree and commit:
>
> d2c05ecd59bc ("pa
Hi all,
Of course, I meant the ext3 tree (not the FIXME tree :-))
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://v
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
fs/ext3/super.c
between commit:
106542e7987c ("fs: Remove ext3 filesystem driver")
from the FIXME tree and commit:
d2c05ecd59bc ("parse_integer: convert ext2, ext3, ext4")
from the akpm-current tree.
I fixe
4 matches
Mail list logo