Changes in init.py

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 06:24:10 +0000

Merge branch 'next' into for-linusPrepare input updates for 5.3 merge window. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

2a267e7c41aa88215de2b542de797d03d16ecdfd - Merge tag 'v5.1' into next

Fri, 10 May 2019 18:43:46 +0000

Merge tag 'v5.1' into nextSync up with mainline to bring in the latest APIs. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

95d002e0a34cb0f238abb39987f9980f325d8332 - Merge tag 'drm-intel-next-2019-04-04' into gvt-next

Tue, 16 Apr 2019 08:50:34 +0000

Merge tag 'drm-intel-next-2019-04-04' into gvt-nextMerge back drm-intel-next for engine name definition refinementand 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than addresses")that would need gvt fixes to depend on.Signed-off-by: Zhenyu Wang List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

82ffd0454bd9bd57780966d47bfd56d579dd4fb3 - Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Thu, 07 Feb 2019 15:44:43 +0000

Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 5.0-rc5Sync with upstream (which now contains fbdev-v5.0-rc3 changes) toprepare a base for fbdev-v5.1 changes. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

23d19ba06b9c5614d6457f5fed349ec8f6d4dac9 - Merge drm/drm-next into drm-misc-next

Fri, 11 Jan 2019 15:32:10 +0000

Merge drm/drm-next into drm-misc-nextdrm-next has been forwarded to 5.0-rc1, and we need it to apply the damagehelper for dirtyfb series from Noralf Trønnes.Signed-off-by: Maxime Ripard List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

49e41801b335f64610bbfd23e8f2bbaf34d46276 - Merge tag 'v5.0-rc1' into next-general

Thu, 10 Jan 2019 19:41:59 +0000

Merge tag 'v5.0-rc1' into next-generalLinux 5.0-rc1Sync to pick up LSM stacking work (which is based on -rc1). List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

3eb0930a425b086bdab38156aa4708427479a201 - Merge drm/drm-next into drm-intel-next-queued

Tue, 08 Jan 2019 08:50:22 +0000

Merge drm/drm-next into drm-intel-next-queuedGenerally catch up with 5.0-rc1, and specifically get the changes:96d4f267e40f ("Remove 'type' argument from access_ok() function")0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")Signed-off-by: Jani Nikula List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

d538d94f0ca86cfedc892cc427169219acb3c2f7 - Merge branch 'master' into fixes

Fri, 04 Jan 2019 11:07:47 +0000

Merge branch 'master' into fixesWe have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'argument from access_ok() function"), so merge master to get it. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

769e47094dcc0ddc8fe8e04c13565a71134ec1a2 - Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Sat, 29 Dec 2018 21:03:29 +0000

Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull Kconfig updates from Masahiro Yamada: - support -y option for merge_config.sh to avoid downgrading =y to =m - remove S_OTHER symbol type, and touch include/config/*.h files correctly - fix file name and line number in lexer warnings - fix memory leak when EOF is encountered in quotation - resolve all shift/reduce conflicts of the parser - warn no new line at end of file - make 'source' statement more strict to take only string literal - rewrite the lexer and remove the keyword lookup table - convert to SPDX License Identifier - compile C files independently instead of including them from zconf.y - fix various warnings of gconfig - misc cleanups* tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (39 commits) kconfig: surround dbg_sym_flags with #ifdef DEBUG to fix gconf warning kconfig: split images.c out of qconf.cc/gconf.c to fix gconf warnings kconfig: add static qualifiers to fix gconf warnings kconfig: split the lexer out of zconf.y kconfig: split some C files out of zconf.y kconfig: convert to SPDX License Identifier kconfig: remove keyword lookup table entirely kconfig: update current_pos in the second lexer kconfig: switch to ASSIGN_VAL state in the second lexer kconfig: stop associating kconf_id with yylval kconfig: refactor end token rules kconfig: stop supporting '.' and '/' in unquoted words treewide: surround Kconfig file paths with double quotes microblaze: surround string default in Kconfig with double quotes kconfig: use T_WORD instead of T_VARIABLE for variables kconfig: use specific tokens instead of T_ASSIGN for assignments kconfig: refactor scanning and parsing "option" properties kconfig: use distinct tokens for type and default properties kconfig: remove redundant token defines kconfig: rename depends_list to comment_option_list ... List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

0c874100108f03401cb3154801d2671bbad40ad4 - kconfig: convert to SPDX License Identifier

Tue, 18 Dec 2018 12:13:35 +0000

kconfig: convert to SPDX License IdentifierAll files in lxdialog/ are licensed under GPL-2.0+, and the rest areunder GPL-2.0. I added GPL-2.0 tags to test scripts in tests/.Documentation/process/license-rules.rst does not suggest anythingabout the flex/bison files. Because flex does not accept the C++comment style at the very top of a file, I used the C style forzconf.l, and so for zconf.y for consistency.Signed-off-by: Masahiro Yamada List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 - Merge branch 'next' into for-linus

Mon, 04 Jun 2018 20:33:12 +0000

Merge branch 'next' into for-linusPrepare input updates for 4.18 merge window. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

101cfc9f787d8ca22866a178f2c1684fb10f8c7a - Merge branches 'clk-warn', 'clk-core', 'clk-spear' and 'clk-qcom-msm8998' into clk-next

Mon, 04 Jun 2018 19:26:39 +0000

Merge branches 'clk-warn', 'clk-core', 'clk-spear' and 'clk-qcom-msm8998' into clk-next* clk-warn: clk: Print the clock name and warning cause* clk-core: clk: Remove clk_init_cb typedef* clk-spear: clk: spear: fix WDT clock definition on SPEAr600* clk-qcom-msm8998: clk: qcom: Add MSM8998 Global Clock Control (GCC) driver List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

754451342fc5954061ede74b0a8485ec4a4c6eaa - Merge tag 'v4.17-rc6' into next

Thu, 24 May 2018 16:30:15 +0000

Merge tag 'v4.17-rc6' into nextSync up with mainline to bring in Atmel controller changes for Caroline. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

bba9525520b6028ecbe7486e13216e9ede8636be - Merge branch 'drm-intel-next-queued' into gvt-next

Sun, 13 May 2018 21:19:07 +0000

Merge branch 'drm-intel-next-queued' into gvt-nextSigned-off-by: Zhi Wang List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

94cc2fde365fb4484080ea6675bb1e0c933f8002 - Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Fri, 11 May 2018 16:08:10 +0000

Merge remote-tracking branch 'drm/drm-next' into drm-misc-nextdrm-misc-next is still based on v4.16-rc7, and was getting a bit stale.Signed-off-by: Maarten Lankhorst List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

53f071e19d566e7d0a4eada1bd8313a4cdb660a4 - Merge drm/drm-next into drm-intel-next-queued

Wed, 02 May 2018 09:20:32 +0000

Merge drm/drm-next into drm-intel-next-queuedNeed d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()usage to the new wait_var_event() API") in dinq to be able to fixhttps://bugs.freedesktop.org/show_bug.cgi?id=106085.Signed-off-by: Jani Nikula List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

552c69b36ebd966186573b9c7a286b390935cce1 - Merge tag 'v4.17-rc3' into apparmor-next

Wed, 02 May 2018 07:38:52 +0000

Merge tag 'v4.17-rc3' into apparmor-nextLinux v4.17-rc3Merge in v4.17 for LSM updatesSigned-off-by: John Johansen List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

8cad95f56f63a63abab0ff0cb451c0bdd5a885dc - Merge tag 'v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Tue, 24 Apr 2018 14:52:52 +0000

Merge tag 'v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.17-rc2 List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

b393a707c84bb56a7800c93849fd8b492f76ba42 - Merge tag 'v4.17-rc2' into next-general

Mon, 23 Apr 2018 17:57:26 +0000

Merge tag 'v4.17-rc2' into next-generalSync to Linux 4.17-rc2 for developers. List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

30596ec32e2cd141d73ee8701386887def9e98c0 - Back merge 'drm-intel-fixes' into gvt-fixes

Tue, 17 Apr 2018 02:43:57 +0000

Back merge 'drm-intel-fixes' into gvt-fixesNeed for 4.17-rc1Signed-off-by: Zhenyu Wang List of files: /linux/scripts/kconfig/tests/err_recursive_inc/__init__.py

Changes in __init__.py