[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <201806050726.U21wgPhQ%fengguang.wu@intel.com>
Date: Tue, 5 Jun 2018 07:54:18 +0800
From: kbuild test robot <lkp@...el.com>
To: Maciej Purski <m.purski@...sung.com>
Cc: kbuild-all@...org, Mark Brown <broonie@...nel.org>,
Tony Lindgren <tony@...mide.com>, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-omap@...r.kernel.org,
Carlos Hernandez <ceh@...com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Maciej Purski <m.purski@...sung.com>
Subject: Re: [PATCH 7/7] regulator: core: Enable voltage balancing
Hi Maciej,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on regulator/for-next]
[also build test ERROR on next-20180604]
[cannot apply to v4.17]
[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/Maciej-Purski/regulator-core-Add-debug-messages/20180605-052333
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
config: i386-randconfig-a1-06041847 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
drivers/regulator/core.c: In function 'regulator_set_voltage_unlocked':
>> drivers/regulator/core.c:3046:1: error: expected expression before '<<' token
<<<<<<< HEAD
^
drivers/regulator/core.c:3048:1: error: expected expression before '==' token
=======
^
vim +3046 drivers/regulator/core.c
3035
3036 static int regulator_set_voltage_unlocked(struct regulator *regulator,
3037 int min_uV, int max_uV,
3038 suspend_state_t state)
3039 {
3040 struct regulator_dev *rdev = regulator->rdev;
3041 struct regulator_voltage *voltage = ®ulator->voltage[state];
3042 int ret = 0;
3043 int old_min_uV, old_max_uV;
3044 int current_uV;
3045
> 3046 <<<<<<< HEAD
3047 pr_err("%s: %d\n", __func__, __LINE__);
3048 =======
3049 if (rdev->coupling_desc.n_resolved != rdev->coupling_desc.n_coupled) {
3050 rdev_err(rdev, "not all coupled regulators registered\n");
3051 ret = -EPERM;
3052 goto out;
3053 }
3054
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Download attachment ".config.gz" of type "application/gzip" (26101 bytes)
Powered by blists - more mailing lists