From: zhujun2 zhujun2_yewu@cmss.chinamobile.com

mainline inclusion from mainline-v5.18-rc1 commit 28c9f3f9a01d954d8357bdb68fbe36255997bf14 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7E2XC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...

-----------------------------

remove unused variable "col", otherwise there will be a type error as below:

typeerror: not all arguments converted during string formatting

Signed-off-by: Ding Xiang dingxiang@cmss.chinamobile.com Link: https://lore.kernel.org/r/20220114024058.74536-1-dingxiang@cmss.chinamobile.... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: zhujun2 zhujun2_yewu@cmss.chinamobile.com Signed-off-by: Jialin Zhang zhangjialin11@huawei.com --- scripts/spdxcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index bc87200f9c7c..2288192967fa 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py @@ -200,7 +200,7 @@ class id_parser(object): tok = pe.tok.value sys.stdout.write('%s: %d:%d %s: %s\n' %(fname, self.curline, col, pe.txt, tok)) else: - sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, col, pe.txt)) + sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, pe.txt)) self.spdx_errors += 1

def scan_git_tree(tree):