[lkml]   [2006]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH 1/7] uml: fix patch mismerge
    From: Paolo 'Blaisorblade' Giarrusso <>

    I sent a patch, it was applied as cda402b283c34a24b091f78eee116963e9494762, then
    it was applied again as 181ae4005d0a4010802be534d929b38c42b9ac06 by mistake. But
    while the 1st time it modified (correctly) cow_header_v3, the 2nd it modified

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <>

    arch/um/drivers/cow_user.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
    index 6ab852b..0ec4052 100644
    --- a/arch/um/drivers/cow_user.c
    +++ b/arch/um/drivers/cow_user.c
    @@ -100,7 +100,7 @@ struct cow_header_v3_broken {
    __u32 alignment;
    __u32 cow_format;
    char backing_file[PATH_LEN_V3];
    -} __attribute__((packed));

    /* COW format definitions - for now, we have only the usual COW bitmap */
    #define COW_BITMAP 0
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at
     \ /
      Last update: 2006-04-30 16:23    [W:0.030 / U:46.444 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site