Skip to content

Resurrect Integration Mode v2

Thomas Pedersen backports 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest15 patches 1 replyIn review
  2. v17 patches 7 repliesSuperseded

Changes in v2 from the cover letter

- Include Luis' patches to track kconfig as git subtree[1], since the original integration mode submission required updated kconfig anyway.
- Version integration patches per target kernel version supporting kernel 4.19 and 5.4
- Fixup skb list patch for builds against 4.19. This was not required by the series, but needed for build testing.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15backport/kconf: remove our version of kconfigbackport/Makefile.real backport/kconf/.gitignore backport/kconf/Makefile +24 more+2 -114320 replies
2/15Squashed 'backport/kconf/' content from commit 98bda615backport/kconf/.gitignore backport/kconf/GPL-2.0 backport/kconf/Kbuild.include +36 more+14868 -00 replies
3/15kconfig: fix backport syntax to work with linux-next next-20220204backport/Kconfig.integrate backport/Kconfig.package backport/Kconfig.sources +1 more+24 -240 replies
4/15Makefile.subtrees: document how to update kconfigMakefile.subtrees+10 -00 replies
5/15backport: define BACKPORT_DIR for Kconfig.integratebackport/Kconfig.integrate+1 -00 replies
6/15gentree: update kconfig source var to new kconfig formatgentree.py+2 -20 replies
7/15gentree: try to make patch operation idempotent in case of --cleangentree.py+39 -170 replies
8/15gentree: do not prefix Kernel.local symbolsgentree.py+1 -10 replies
9/15lib/bpversion: calculate Kconfig.versions for next major versionlib/bpversion.py+8 -30 replies
10/15backport: expose BP_MODULES in package mode onlybackport/Kconfig.package.hacks backport/compat/Kconfig+10 -90 replies
11/15kconfig: fix select conversion for BPAUTO_ symbols in integration modelib/kconfig.py+3 -20 replies
12/15integration-patches: refresh integration patchintegration-patches/0001-enable-backports/0001-enable-backports-built-in.patch+15 -190 replies
13/15integration-patches: make patches per target kernel versiongentree.py integration-patches/4.19/0001-enable-backports/0001-enable-backports-built-in.patch+2 -10 replies
14/15integration-patches: support 5.4 target kernelintegration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch+40 -00 replies
15/15patches: fixup skb list patchpatches/0097-skb-list/mac80211-rx.patch+6 -10 replies

Reviews trailers per patch

None of the 15 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchLuis Chamberlain
SeriesA-b
1/15
2/15
3/15
4/15
5/15
6/15
7/15
8/15
9/15
10/15
11/15
12/15
13/15
14/15
15/15

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/15] Resurrect Integration Mode v2

Original submission here:

https://lore.kernel.org/all/[email protected]/T/

Changes since v1:

- Include Luis' patches to track kconfig as git subtree[1], since the original integration mode submission required updated kconfig anyway.
- Version integration patches per target kernel version supporting kernel 4.19 and 5.4
- Fixup skb list patch for builds against 4.19. This was not required by the series, but needed for build testing.

Tested generating and building an integrated backports of mac80211 from Linux 5.15.33 against 4.19 and 5.4.

[1]: https://lore.kernel.org/all/[email protected]/T/

Luis Chamberlain (4):
backport/kconf: remove our version of kconfig
Squashed 'backport/kconf/' content from commit 98bda615
kconfig: fix backport syntax to work with linux-next next-20220204 Makefile.subtrees: document how to update kconfig

Thomas Pedersen (11):
backport: define BACKPORT_DIR for Kconfig.integrate
gentree: update kconfig source var to new kconfig format
gentree: try to make patch operation idempotent in case of --clean
gentree: do not prefix Kernel.local symbols
lib/bpversion: calculate Kconfig.versions for next major version
backport: expose BP_MODULES in package mode only
kconfig: fix select conversion for BPAUTO_ symbols in integration mode
integration-patches: refresh integration patch
integration-patches: make patches per target kernel version
integration-patches: support 5.4 target kernel
patches: fixup skb list patch

 Makefile.subtrees                             |   10 +
 backport/Kconfig.integrate                    |    7 +-
 backport/Kconfig.package                      |   18 +-
 backport/Kconfig.package.hacks                |   10 +
 backport/Kconfig.sources                      |   22 +-
 backport/Makefile.real                        |   32 +-
 backport/compat/Kconfig                       |    9 -
 backport/kconf/.gitignore                     |   15 +-
 backport/kconf/GPL-2.0                        |  359 ++++
 backport/kconf/Kbuild.include                 |   73 +
 backport/kconf/Makefile                       |   69 +-
 backport/kconf/README.kconfig                 |   13 +
 backport/kconf/conf.c                         |  548 ++++--
 backport/kconf/confdata.c                     | 1139 ++++++------
 backport/kconf/expr.c                         |   28 +-
 backport/kconf/expr.h                         |   21 +-
 backport/kconf/internal.h                     |    9 +
 backport/kconf/kconf_id.c                     |    1 -
 backport/kconf/kconfig.Makefile               |   65 +
 backport/kconf/kconfig/.gitignore             |   16 +
 backport/kconf/{zconf.l => lexer.l}           |  288 ++-
 backport/kconf/lkc.h                          |  106 +-
 backport/kconf/lkc_proto.h                    |   37 +-
 backport/kconf/lxdialog/BIG.FAT.WARNING       |    2 +-
 backport/kconf/lxdialog/check-lxdialog.sh     |   93 -
 backport/kconf/lxdialog/checklist.c           |   19 +-
 backport/kconf/lxdialog/dialog.h              |   23 +-
 backport/kconf/lxdialog/inputbox.c            |   22 +-
 backport/kconf/lxdialog/menubox.c             |   25 +-
 backport/kconf/lxdialog/textbox.c             |   17 +-
 backport/kconf/lxdialog/util.c                |   19 +-
 backport/kconf/lxdialog/yesno.c               |   19 +-
 backport/kconf/mconf-cfg.sh                   |   52 +
 backport/kconf/mconf.c                        |  178 +-
 backport/kconf/menu.c                         |  256 +--
 backport/kconf/nconf-cfg.sh                   |   50 +
 backport/kconf/nconf.c                        | 1549 +++++++++++++++++
 backport/kconf/nconf.gui.c                    |  614 +++++++
 backport/kconf/nconf.h                        |   83 +
 backport/kconf/{zconf.y => parser.y}          |  374 ++--
 backport/kconf/preprocess.c                   |  574 ++++++
 backport/kconf/setlocalversion                |  118 ++
 backport/kconf/symbol.c                       |  286 +--
 backport/kconf/update-upstream-kconfig.sh     |   28 +
 backport/kconf/util.c                         |   64 +-
 gentree.py                                    |   65 +-
 .../0001-enable-backports-built-in.patch      |   40 -
 .../0001-enable-backports-built-in.patch      |   36 +
 .../0001-enable-backports-built-in.patch      |   40 +
 lib/bpversion.py                              |   11 +-
 lib/kconfig.py                                |    5 +-
 patches/0097-skb-list/mac80211-rx.patch       |    7 +-
 52 files changed, 5542 insertions(+), 2022 deletions(-)
 create mode 100644 Makefile.subtrees
 create mode 100644 backport/kconf/GPL-2.0
 create mode 100644 backport/kconf/Kbuild.include
 create mode 100644 backport/kconf/README.kconfig
 create mode 100644 backport/kconf/internal.h
 create mode 100644 backport/kconf/kconfig.Makefile
 create mode 100644 backport/kconf/kconfig/.gitignore
 rename backport/kconf/{zconf.l => lexer.l} (55%)
 delete mode 100755 backport/kconf/lxdialog/check-lxdialog.sh
 create mode 100755 backport/kconf/mconf-cfg.sh
 create mode 100755 backport/kconf/nconf-cfg.sh
 create mode 100644 backport/kconf/nconf.c
 create mode 100644 backport/kconf/nconf.gui.c
 create mode 100644 backport/kconf/nconf.h
 rename backport/kconf/{zconf.y => parser.y} (68%)
 create mode 100644 backport/kconf/preprocess.c
 create mode 100755 backport/kconf/setlocalversion
 create mode 100755 backport/kconf/update-upstream-kconfig.sh
 delete mode 100644 integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
 create mode 100644 integration-patches/4.19/0001-enable-backports/0001-enable-backports-built-in.patch
 create mode 100644 integration-patches/5.4/0001-enable-backports/0001-enable-backports-built-in.patch
Signature · 4 lines
2.30.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in