diff for duplicates of <20150621080949.10187.66490.sendpatchset@little-apple> diff --git a/a/1.txt b/N1/1.txt index a9303d7..44bd16d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -95,7 +95,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> ch->match_value = ch->max_match_value; raw_spin_lock_init(&ch->lock); -- ch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; +- ch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; - ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), clockevent, clocksource); diff --git a/a/content_digest b/N1/content_digest index d79e94d..fec1a10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150621080903.10187.20998.sendpatchset@little-apple\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 04/08] clocksource: sh_cmt: Support separate R-Car Gen2 CMT0/1\0" - "Date\0Sun, 21 Jun 2015 08:09:49 +0000\0" + "Date\0Sun, 21 Jun 2015 17:09:49 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0devicetree@vger.kernel.org" laurent.pinchart+renesas@ideasonboard.com @@ -110,7 +110,7 @@ " \tch->match_value = ch->max_match_value;\n" " \traw_spin_lock_init(&ch->lock);\n" " \n" - "-\tch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" + "-\tch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" "-\n" " \tret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev),\n" " \t\t\t clockevent, clocksource);\n" @@ -138,4 +138,4 @@ "--\n" "To unsubscribe from this list: send the line \"unsubscribe linux-sh\" in" -711eb1deaebab5a66f78cdc7abaec3dffce4c97dad378ae3bca7cff023c9b004 +75b93781f184582b09d73cf5450b82264cf47eeb3d18da6886e83c24d7457c7c
diff --git a/a/1.txt b/N2/1.txt index a9303d7..fa3bbc6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -95,7 +95,7 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> ch->match_value = ch->max_match_value; raw_spin_lock_init(&ch->lock); -- ch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; +- ch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx; - ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev), clockevent, clocksource); @@ -121,4 +121,5 @@ Signed-off-by: Magnus Damm <damm+renesas@opensource.se> }; MODULE_DEVICE_TABLE(of, sh_cmt_of_table); -- -To unsubscribe from this list: send the line "unsubscribe linux-sh" in +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +Please read the FAQ at http://www.tux.org/lkml/ diff --git a/a/content_digest b/N2/content_digest index d79e94d..cebc42f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020150621080903.10187.20998.sendpatchset@little-apple\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 04/08] clocksource: sh_cmt: Support separate R-Car Gen2 CMT0/1\0" - "Date\0Sun, 21 Jun 2015 08:09:49 +0000\0" + "Date\0Sun, 21 Jun 2015 17:09:49 +0900\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0devicetree@vger.kernel.org" laurent.pinchart+renesas@ideasonboard.com @@ -110,7 +110,7 @@ " \tch->match_value = ch->max_match_value;\n" " \traw_spin_lock_init(&ch->lock);\n" " \n" - "-\tch->timer_bit = cmt->info->model = SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" + "-\tch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;\n" "-\n" " \tret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev),\n" " \t\t\t clockevent, clocksource);\n" @@ -136,6 +136,7 @@ " };\n" " MODULE_DEVICE_TABLE(of, sh_cmt_of_table);\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-sh\" in" + "To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" + Please read the FAQ at http://www.tux.org/lkml/ -711eb1deaebab5a66f78cdc7abaec3dffce4c97dad378ae3bca7cff023c9b004 +8c06a367d568be4cd5df6f86536139b40610c92f8718b45bd7770f3032bfec40
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.