diff for duplicates of <526AC65B.5020203@grandegger.com> diff --git a/a/1.txt b/N1/1.txt index 601b6d8..ed8b3e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,8 +54,7 @@ On 10/25/2013 01:03 AM, Sergei Shtylyov wrote: > 4 files changed, 945 insertions(+) > > Index: linux-can-next/drivers/net/can/Kconfig -> =================================================================== -> --- linux-can-next.orig/drivers/net/can/Kconfig +> =================================> --- linux-can-next.orig/drivers/net/can/Kconfig > +++ linux-can-next/drivers/net/can/Kconfig > @@ -125,6 +125,15 @@ config CAN_GRCAN > endian syntheses of the cores would need some modifications on @@ -74,8 +73,7 @@ On 10/25/2013 01:03 AM, Sergei Shtylyov wrote: > > source "drivers/net/can/sja1000/Kconfig" > Index: linux-can-next/drivers/net/can/Makefile -> =================================================================== -> --- linux-can-next.orig/drivers/net/can/Makefile +> =================================> --- linux-can-next.orig/drivers/net/can/Makefile > +++ linux-can-next/drivers/net/can/Makefile > @@ -25,5 +25,6 @@ obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ica > obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o @@ -85,8 +83,7 @@ On 10/25/2013 01:03 AM, Sergei Shtylyov wrote: > > ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG > Index: linux-can-next/drivers/net/can/rcar_can.c -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ linux-can-next/drivers/net/can/rcar_can.c > @@ -0,0 +1,920 @@ > +/* @@ -763,7 +760,7 @@ handling above. > + mier1 |= BIT(mbxno - FIRST_TX_MB); > + rcar_can_writel(priv, RCAR_CAN_MIER1, mier1); > + spin_unlock_irqrestore(&priv->mier_lock, flags); -> + if (unlikely(mier1 == 0xffffffff)) +> + if (unlikely(mier1 = 0xffffffff)) > + netif_stop_queue(ndev); > + > + if (cf->can_id & CAN_EFF_FLAG) { @@ -1056,8 +1053,7 @@ Is this cast needed? > +MODULE_DESCRIPTION("CAN driver for Renesas R-Car SoC"); > +MODULE_ALIAS("platform:" DRV_NAME); > Index: linux-can-next/include/linux/can/platform/rcar_can.h -> =================================================================== -> --- /dev/null +> =================================> --- /dev/null > +++ linux-can-next/include/linux/can/platform/rcar_can.h > @@ -0,0 +1,15 @@ > +#ifndef _CAN_PLATFORM_RCAR_CAN_H_ diff --git a/a/content_digest b/N1/content_digest index 0de68a8..d61d8cc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201310250303.00695.sergei.shtylyov@cogentembedded.com\0" "From\0Wolfgang Grandegger <wg@grandegger.com>\0" "Subject\0Re: [PATCH v2] can: add Renesas R-Car CAN driver\0" - "Date\0Fri, 25 Oct 2013 21:28:27 +0200\0" + "Date\0Fri, 25 Oct 2013 19:28:27 +0000\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" netdev@vger.kernel.org mkl@pengutronix.de @@ -66,8 +66,7 @@ "> 4 files changed, 945 insertions(+)\n" "> \n" "> Index: linux-can-next/drivers/net/can/Kconfig\n" - "> ===================================================================\n" - "> --- linux-can-next.orig/drivers/net/can/Kconfig\n" + "> =================================> --- linux-can-next.orig/drivers/net/can/Kconfig\n" "> +++ linux-can-next/drivers/net/can/Kconfig\n" "> @@ -125,6 +125,15 @@ config CAN_GRCAN\n" "> \t endian syntheses of the cores would need some modifications on\n" @@ -86,8 +85,7 @@ "> \n" "> source \"drivers/net/can/sja1000/Kconfig\"\n" "> Index: linux-can-next/drivers/net/can/Makefile\n" - "> ===================================================================\n" - "> --- linux-can-next.orig/drivers/net/can/Makefile\n" + "> =================================> --- linux-can-next.orig/drivers/net/can/Makefile\n" "> +++ linux-can-next/drivers/net/can/Makefile\n" "> @@ -25,5 +25,6 @@ obj-$(CONFIG_CAN_JANZ_ICAN3)\t+= janz-ica\n" "> obj-$(CONFIG_CAN_FLEXCAN)\t+= flexcan.o\n" @@ -97,8 +95,7 @@ "> \n" "> ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG\n" "> Index: linux-can-next/drivers/net/can/rcar_can.c\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ linux-can-next/drivers/net/can/rcar_can.c\n" "> @@ -0,0 +1,920 @@\n" "> +/*\n" @@ -775,7 +772,7 @@ "> +\tmier1 |= BIT(mbxno - FIRST_TX_MB);\n" "> +\trcar_can_writel(priv, RCAR_CAN_MIER1, mier1);\n" "> +\tspin_unlock_irqrestore(&priv->mier_lock, flags);\n" - "> +\tif (unlikely(mier1 == 0xffffffff))\n" + "> +\tif (unlikely(mier1 = 0xffffffff))\n" "> +\t\tnetif_stop_queue(ndev);\n" "> +\n" "> +\tif (cf->can_id & CAN_EFF_FLAG) {\n" @@ -1068,8 +1065,7 @@ "> +MODULE_DESCRIPTION(\"CAN driver for Renesas R-Car SoC\");\n" "> +MODULE_ALIAS(\"platform:\" DRV_NAME);\n" "> Index: linux-can-next/include/linux/can/platform/rcar_can.h\n" - "> ===================================================================\n" - "> --- /dev/null\n" + "> =================================> --- /dev/null\n" "> +++ linux-can-next/include/linux/can/platform/rcar_can.h\n" "> @@ -0,0 +1,15 @@\n" "> +#ifndef _CAN_PLATFORM_RCAR_CAN_H_\n" @@ -1091,4 +1087,4 @@ "\n" Wolfgang. -a6bec383ed508ad0e3275ba48c64db608fa19a81f572a411d4da2861ed51b817 +290e1545da9bebecd5165b8136268a6e3062683f05437f80351be3790df1dad1
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.