diff for duplicates of <20160106100308.GE23185@mwanda> diff --git a/a/1.txt b/N1/1.txt index 90908b1..9180a56 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ index f9e7aa3..b527da1 100644 - ((buffer_prefix_content->priv_data_size + OFFSET_UNITS) & - ~(u16)(OFFSET_UNITS - 1)) : - buffer_prefix_content->priv_data_size); -+ int_context_data_copy->ext_buf_offset + (u16)ALIGN(buffer_prefix_content->priv_data_size, 16); ++ int_context_data_copy->ext_buf_offset = ++ (u16)ALIGN(buffer_prefix_content->priv_data_size, 16); /* Translate margin and int_context params to FM parameters */ /* Initialize with illegal value. Later we'll set legal values. */ diff --git a/a/content_digest b/N1/content_digest index 3904348..df58b5f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch -next] fsl/fman: use the ALIGN() macro\0" - "Date\0Wed, 06 Jan 2016 10:03:08 +0000\0" + "Date\0Wed, 6 Jan 2016 13:03:08 +0300\0" "To\0Igal Liberman <igal.liberman@freescale.com>\0" "Cc\0netdev@vger.kernel.org" kernel-janitors@vger.kernel.org @@ -36,9 +36,10 @@ "-\t\t((buffer_prefix_content->priv_data_size + OFFSET_UNITS) &\n" "-\t\t\t~(u16)(OFFSET_UNITS - 1)) :\n" "-\t\tbuffer_prefix_content->priv_data_size);\n" - "+\tint_context_data_copy->ext_buf_offset +\t\t(u16)ALIGN(buffer_prefix_content->priv_data_size, 16);\n" + "+\tint_context_data_copy->ext_buf_offset =\n" + "+\t\t(u16)ALIGN(buffer_prefix_content->priv_data_size, 16);\n" " \n" " \t/* Translate margin and int_context params to FM parameters */\n" " \t/* Initialize with illegal value. Later we'll set legal values. */" -0904055b9a381637aa6fd329be8fe86b6299843214ead5cadb46d5d6253553b8 +1a4ced0598445c53f8fd3096cad98521a4819bfa2dfccf717fbca4ed85e78cc6
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.