diff for duplicates of <1653091.GeQyMLF6L8@avalon> diff --git a/a/1.txt b/N1/1.txt index 9b5a76c..2767079 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,16 +20,16 @@ On Thursday 20 June 2013 08:42:23 Linus Walleij wrote: > No. It does not apply: > > ]$ git am --signoff rcar-fix.patch -> Tillämpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections +> Till?mpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections > error: patch misslyckades: drivers/gpio/gpio-rcar.c:279 -> error: drivers/gpio/gpio-rcar.c: patchen kan inte tillämpas +> error: drivers/gpio/gpio-rcar.c: patchen kan inte till?mpas > Patchen misslyckades vid 0001 gpio-rcar: Remove #ifdef CONFIG_OF > around OF-specific sections > En kopia av patchen som misslyckades finns i: > /home/linus/src/linux-trees/linux-gpio/.git/rebase-apply/patch -> När du har löst problemet kör du "git am --resolved". -> Om du vill hoppa över patchen kör du istället "git am --skip". -> För att återställa originalgrenen och avbryta kör du "git am --abort". +> N?r du har l?st problemet k?r du "git am --resolved". +> Om du vill hoppa ?ver patchen k?r du ist?llet "git am --skip". +> F?r att ?terst?lla originalgrenen och avbryta k?r du "git am --abort". > > > Isn't this RCAR stuff funneled through ARM SoC this merge window? diff --git a/a/content_digest b/N1/content_digest index a902934..69798a1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01371551389-5493-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "ref\01667096.lqpXoD2UlE@avalon\0" "ref\0CACRpkdZJ1Hg=4w1fySiMgy0-Qdph1pD0OZGLFecxHhTsMEKQog@mail.gmail.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections\0" - "Date\0Thu, 20 Jun 2013 08:04:07 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 2/2] gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections\0" + "Date\0Thu, 20 Jun 2013 10:04:07 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -29,16 +29,16 @@ "> No. It does not apply:\n" "> \n" "> ]$ git am --signoff rcar-fix.patch\n" - "> Till\303\244mpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections\n" + "> Till?mpar: gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections\n" "> error: patch misslyckades: drivers/gpio/gpio-rcar.c:279\n" - "> error: drivers/gpio/gpio-rcar.c: patchen kan inte till\303\244mpas\n" + "> error: drivers/gpio/gpio-rcar.c: patchen kan inte till?mpas\n" "> Patchen misslyckades vid 0001 gpio-rcar: Remove #ifdef CONFIG_OF\n" "> around OF-specific sections\n" "> En kopia av patchen som misslyckades finns i:\n" "> /home/linus/src/linux-trees/linux-gpio/.git/rebase-apply/patch\n" - "> N\303\244r du har l\303\266st problemet k\303\266r du \"git am --resolved\".\n" - "> Om du vill hoppa \303\266ver patchen k\303\266r du ist\303\244llet \"git am --skip\".\n" - "> F\303\266r att \303\245terst\303\244lla originalgrenen och avbryta k\303\266r du \"git am --abort\".\n" + "> N?r du har l?st problemet k?r du \"git am --resolved\".\n" + "> Om du vill hoppa ?ver patchen k?r du ist?llet \"git am --skip\".\n" + "> F?r att ?terst?lla originalgrenen och avbryta k?r du \"git am --abort\".\n" "> \n" "> \n" "> Isn't this RCAR stuff funneled through ARM SoC this merge window?\n" @@ -53,4 +53,4 @@ "\n" Laurent Pinchart -4386ac9a9c979469b6be81d0a591fde727980aab649d8a5d27ae71dca854e581 +89ee6d0675bbf924d369ec7c3ce45b1a5a9b90361523727ab74808fd1fc7dece
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.