diff for duplicates of <1358185998-5997-1-git-send-email-dinggnu@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 98079d2..3aa9dd7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -111,7 +111,8 @@ index 8b8bbd5..b33ee60 100644 + union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; switch (pcibus_info->pbi_bridge_type) { case PCIBR_BRIDGETYPE_TIOCP: - ret @@ -244,9 +238,8 @@ u64 pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) + ret = +@@ -244,9 +238,8 @@ u64 pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index, u64 val) { diff --git a/a/content_digest b/N1/content_digest index 82144b1..edce516 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -123,7 +123,8 @@ "+\t\tunion br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base;\n" " \t\tswitch (pcibus_info->pbi_bridge_type) {\n" " \t\tcase PCIBR_BRIDGETYPE_TIOCP:\n" - " \t\t\tret @@ -244,9 +238,8 @@ u64 pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device)\n" + " \t\t\tret =\n" + "@@ -244,9 +238,8 @@ u64 pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device)\n" " void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index,\n" " \t\t\tu64 val)\n" " {\n" @@ -149,4 +150,4 @@ "-- \n" 1.7.9.5 -9e70d49d4f2fe022041c2cdc6080a6ea3b6f2126936dc97a7bed53db3be6ac1d +4207cdf17333d7b763734248d5b7e6cf992c220883a5b5fddfaea22fc1c23cc8
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.