All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Pedersen <thomas@adapt-ip.com>
To: backports <backports@vger.kernel.org>
Cc: Hauke Mehrtens <hauke@hauke-m.de>,
	Luis Chamberlain <mcgrof@kernel.org>,
	Thomas Pedersen <thomas@adapt-ip.com>
Subject: [PATCH v2 00/15] Resurrect Integration Mode v2
Date: Fri, 13 May 2022 09:05:08 -0700	[thread overview]
Message-ID: <20220513160523.2944694-1-thomas@adapt-ip.com> (raw)

Original submission here:

https://lore.kernel.org/all/YfyN2GnfeANyNhaS@bombadil.infradead.org/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/Yf2eRJmG80L9htvo@bombadil.infradead.org/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

-- 
2.30.2

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

             reply	other threads:[~2022-05-13 16:05 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-13 16:05 Thomas Pedersen [this message]
2022-05-13 16:05 ` [PATCH v2 01/15] backport/kconf: remove our version of kconfig Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 02/15] Squashed 'backport/kconf/' content from commit 98bda615 Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 03/15] kconfig: fix backport syntax to work with linux-next next-20220204 Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 04/15] Makefile.subtrees: document how to update kconfig Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 05/15] backport: define BACKPORT_DIR for Kconfig.integrate Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 06/15] gentree: update kconfig source var to new kconfig format Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 07/15] gentree: try to make patch operation idempotent in case of --clean Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 08/15] gentree: do not prefix Kernel.local symbols Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 09/15] lib/bpversion: calculate Kconfig.versions for next major version Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 10/15] backport: expose BP_MODULES in package mode only Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 11/15] kconfig: fix select conversion for BPAUTO_ symbols in integration mode Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 12/15] integration-patches: refresh integration patch Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 13/15] integration-patches: make patches per target kernel version Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 14/15] integration-patches: support 5.4 target kernel Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 15/15] patches: fixup skb list patch Thomas Pedersen
2022-05-13 16:37 ` [PATCH v2 00/15] Resurrect Integration Mode v2 Luis Chamberlain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220513160523.2944694-1-thomas@adapt-ip.com \
    --to=thomas@adapt-ip.com \
    --cc=backports@vger.kernel.org \
    --cc=hauke@hauke-m.de \
    --cc=mcgrof@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.