Re: [PATCH 4/5] mm: convert mm_struct.mm_users from atomic_t to refcount_t

[kbuild test robot]

Hi Elena,

[auto build test ERROR on mmotm/master]
[also build test ERROR on next-20170220]
[cannot apply to linus/master linux/master v4.10]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Elena-Reshetova/mm-subsystem-refcounter-conversions/20170220-190351
base:   git://git.cmpxchg.org/linux-mmotm.git master
config: i386-randconfig-x011-201708 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

Note: the linux-review/Elena-Reshetova/mm-subsystem-refcounter-conversions/20170220-190351 HEAD 3b4bd307e7ad16dfd7fa504e7dbd951598fcc757 builds fine.
      It only hurts bisectibility.

All errors (new ones prefixed by >>):

   fs/proc/base.c: In function 'environ_read':
>> fs/proc/base.c:924:1: error: version control conflict marker in file
    <<<<<<< e5c2d109eae88b7c203d396dfaeb284f95f6ffe5
    ^~~~~~~
   fs/proc/base.c:968:1: warning: label 'free' defined but not used [-Wunused-label]
    free:
    ^~~~
   fs/proc/base.c: In function '__set_oom_adj':
   fs/proc/base.c:1071:1: error: version control conflict marker in file
    <<<<<<< e5c2d109eae88b7c203d396dfaeb284f95f6ffe5
    ^~~~~~~
   fs/proc/base.c:1073:1: error: version control conflict marker in file
    =======
    ^~~~~~~
   fs/proc/base.c:1075:1: error: version control conflict marker in file
    >>>>>>> mm: convert mm_struct.mm_users from atomic_t to refcount_t
    ^~~~~~~

vim +924 fs/proc/base.c

   918	
   919		page = (char *)__get_free_page(GFP_TEMPORARY);
   920		if (!page)
   921			return -ENOMEM;
   922	
   923		ret = 0;
 > 924	<<<<<<< e5c2d109eae88b7c203d396dfaeb284f95f6ffe5
   925		if (!mmget_not_zero(mm))
   926	=======
   927		if (!refcount_inc_not_zero(&mm->mm_users))

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Attachment: .config.gz
Description: application/gzip