Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 12 Jul 2022 17:53:05 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Jane Chu <jane.chu@oracle.com>, <dan.j.williams@intel.com>,
        <linux-kernel@vger.kernel.org>, <hch@lst.de>,
        <nvdimm@lists.linux.dev>
Subject: RE: [PATCH v2] pmem: fix a name collision
Message-ID: <62ce1771b331c_6070c294a6@dwillia2-xfh.jf.intel.com.notmuch>
References: <20220630182802.3250449-1-jane.chu@oracle.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220630182802.3250449-1-jane.chu@oracle.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NXOosIDjmCBUNfkpzj9b90cclgyAkJrZi7C6pszw5KBtt2Qm8bKR47Wm/s/l?=
 =?us-ascii?Q?GHoAMHoN1ynxm1gA3fgzEaPGQYBaKKFtyGwVJmqU+S7kh1VFolbHuPVNKP6D?=
 =?us-ascii?Q?xnEd77g0HMMHIx4Q8X8SK9bDjfU2OyDtL9kMFhVwbz5PcSeQBCEnr5DbZD4J?=
 =?us-ascii?Q?cYXHr8O20IYDijr/xFwesUyh72LCICzQWQOwCPDPzpz36WxjfPm7zSPAy/k+?=
 =?us-ascii?Q?4XaHALRHMUwSPs3LcyY48ZgdA5BuVghyrsuxt7VU2iSLSm/IDgLmCiE0RW2f?=
 =?us-ascii?Q?oaWE7J516kxbRc3ZHkJOCYdIsWUamSQBNFAQMUYcIMMBaTovrKZASwsVcvGL?=
 =?us-ascii?Q?RTRqXtOhTTJdJ7ab9Ciwj/DKDzDt7P78JkRmPcsij68U2nIQzdtOUWK3pes/?=
 =?us-ascii?Q?F4p4O+J0qENPB+CKa43azw4l5gj/7GZpWFlxin164veO1AgfbkxLcKzwUGpN?=
 =?us-ascii?Q?0CdSnWrMoLr95sts1PDhPJaQib0BRd/UJIL8WUEj1Yzm1wyX3oBSDdMNe4D1?=
 =?us-ascii?Q?/EXbw4GH+l4dnuHeLXvCEapJ3M2HbET1OAz+kI01CL+unNX7k7zPSM42gcdW?=
 =?us-ascii?Q?e7LYYlvMLZA4IPkWXGQ0RC3emhUdqcNXMs1TAch/StWFzLjKPL+3O+HVn02q?=
 =?us-ascii?Q?xXkGcsFdNdeh1Cjr7Mb0qXperGat4EIJS09d+LmgFCNOFStT5+vUdAnOpkn9?=
 =?us-ascii?Q?d1LG4dh7WT6iWlxYDbrBF59PeXkDaF2r3fyl+zEODAERtObTIAsy0IKgn5SJ?=
 =?us-ascii?Q?WRVb74aURtflRhRanOZHdtQC4SnUQoueFoyTgorEPRHs9WODdxzU80yAMsdE?=
 =?us-ascii?Q?8f1HebObPxOSXpElV+1LEeSI66P3RVG2KvmrRymfbYt0xbhJX1pHs+kTwFN1?=
 =?us-ascii?Q?PhRxXvg9QCw8Hc499XXAZUw4G+2i8G73OBEYfJG6m0Z8n5saTPy7TzJqW6CS?=
 =?us-ascii?Q?E+yHTNAy2K5d+oT7rNmFPgygv3WtbL1Ck+502wgHlaVULGyElXq4D1eUtSfr?=
 =?us-ascii?Q?ErJkf4yZ/G9oBi49FvTxO1CLmzXjIW6wyn9QCz25wV5+rBpiGbOdQ/gaK1hs?=
 =?us-ascii?Q?0s7dlQKjR1DVhgeLeNciHKBUAowGgDcg0YLdOhmOEFqjNE02O6MnengLlPm1?=
 =?us-ascii?Q?Eku8RdIVNwcknbq+xbd33E7wUETiIkEAp4MFruJpsNka4nt1GARI3u0vUmo5?=
 =?us-ascii?Q?pA8+i38TIiaxqZiszasE2+VpUkaiq2s3ZsWohvxVQCqsBVu3lZ8NqhyFnHyz?=
 =?us-ascii?Q?usMstOLE0rpgrZD32BtU/f7IZnqvsAvi8PAE7Glp1Fd3+3Wb/u746KlSMa9w?=
 =?us-ascii?Q?SurzMBS9KO7ZIRzEn3c89V13FzezR84qyk5BP4Xcux2yFDAyHeGPOs3Hgh+i?=
 =?us-ascii?Q?6whpFXfWqQjeDpWPtKnvoxudV4j6gx5SUHoAAyQz+5L6xTGWeP+Ptzz0UHNS?=
 =?us-ascii?Q?01V/+Y+KpM/zSpwlu46AZ6psfhPZmLpjZWxLOkLNyUMc6Zut7kxYazWyBeux?=
 =?us-ascii?Q?saKzEbKwRJqyL2EhFbAHAesneoQ9NEn/Em+Q8Q5/iZOycVaDn7iGcF5lq2de?=
 =?us-ascii?Q?1vdpfGkWbV1E3keUfP3aG/HRzrw9fllj+cyAQIsnuxFiaWntCPikPPAapkCr?=
 =?us-ascii?Q?jw=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 16ed41c2-779c-4073-c510-08da646a0d3a
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2022 00:53:07.9331
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: csCB5nNWNyKjhXQWQaIRQDC9NEbWGr/vuFBleMqWoqrjs43daAQTfPYzjm/jJpd40Zi4WnzCUZarjzd9IXNotKtaIa9+lthu14FFEcf77wA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR11MB4456
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Jane Chu wrote:
> Kernel test robot detected name collision when compiled on 'um'
> architecture.  Rename "to_phys()"  to "pmem_to_phys()".
> 
> >> drivers/nvdimm/pmem.c:48:20: error: conflicting types for 'to_phys'; have 'phys_addr_t(struct pmem_device *, phys_addr_t)' {aka 'long long unsigned int(struct pmem_device *, long long unsigned int)'}
>       48 | static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset)
>          |                    ^~~~~~~
>    In file included from arch/um/include/asm/page.h:98,
>                     from arch/um/include/asm/thread_info.h:15,
>                     from include/linux/thread_info.h:60,
>                     from include/asm-generic/preempt.h:5,
>                     from ./arch/um/include/generated/asm/preempt.h:1,
> 
>    arch/um/include/shared/mem.h:12:29: note: previous definition of 'to_phys' with type 'long unsigned int(void *)'
>       12 | static inline unsigned long to_phys(void *virt)
>          |                             ^~~~~~~
> 
> vim +48 drivers/nvdimm/pmem.c
>     47
>   > 48	static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset)
>     49	{
>     50		return pmem->phys_addr + offset;
>     51	}
>     52
> 
> Fixes: 9409c9b6709e (pmem: refactor pmem_clear_poison())
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Jane Chu <jane.chu@oracle.com>

Applied. Sorry for the delay, catching up after vacation.