| Message ID | 20210301102826.GK641347@dell |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [GIT,PULL] Immutable branch between MFD, PWM and RTC due for the v5.13 merge window | expand |
On Mon, 01 Mar 2021, Lee Jones wrote: > Enjoy! > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pwm-rtc-v5.13 > > for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a5872504: > > MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01 10:26:17 +0000) > > ---------------------------------------------------------------- > Immutable branch between MFD, PWM and RTC due for the v5.13 merge window > > ---------------------------------------------------------------- > Jonathan Neuschäfer (6): > dt-bindings: Add vendor prefix for Netronix, Inc. > dt-bindings: mfd: Add binding for Netronix embedded controller > mfd: Add base driver for Netronix embedded controller > pwm: ntxec: Add driver for PWM function in Netronix EC > rtc: New driver for RTC in Netronix embedded controller > MAINTAINERS: Add entry for Netronix embedded controller > > .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 +++++++ > .../devicetree/bindings/vendor-prefixes.yaml | 2 + > MAINTAINERS | 9 + > drivers/mfd/Kconfig | 11 + > drivers/mfd/Makefile | 1 + > drivers/mfd/ntxec.c | 221 +++++++++++++++++++++ > drivers/pwm/Kconfig | 8 + > drivers/pwm/Makefile | 1 + > drivers/pwm/pwm-ntxec.c | 184 +++++++++++++++++ > drivers/rtc/Kconfig | 8 + > drivers/rtc/Makefile | 1 + > drivers/rtc/rtc-ntxec.c | 145 ++++++++++++++ > include/linux/mfd/ntxec.h | 37 ++++ > 13 files changed, 704 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml > create mode 100644 drivers/mfd/ntxec.c > create mode 100644 drivers/pwm/pwm-ntxec.c > create mode 100644 drivers/rtc/rtc-ntxec.c > create mode 100644 include/linux/mfd/ntxec.h FYI, if anyone has pulled this, they should probably rebase it onto v5.12-rc2 and delete the v5.12-rc1 tag from their tree: https://lwn.net/Articles/848431/
On Tue, 09 Mar 2021, Lee Jones wrote: > On Mon, 01 Mar 2021, Lee Jones wrote: > > > Enjoy! > > > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pwm-rtc-v5.13 > > > > for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a5872504: > > > > MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01 10:26:17 +0000) > > > > ---------------------------------------------------------------- > > Immutable branch between MFD, PWM and RTC due for the v5.13 merge window > > > > ---------------------------------------------------------------- > > Jonathan Neuschäfer (6): > > dt-bindings: Add vendor prefix for Netronix, Inc. > > dt-bindings: mfd: Add binding for Netronix embedded controller > > mfd: Add base driver for Netronix embedded controller > > pwm: ntxec: Add driver for PWM function in Netronix EC > > rtc: New driver for RTC in Netronix embedded controller > > MAINTAINERS: Add entry for Netronix embedded controller > > > > .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 +++++++ > > .../devicetree/bindings/vendor-prefixes.yaml | 2 + > > MAINTAINERS | 9 + > > drivers/mfd/Kconfig | 11 + > > drivers/mfd/Makefile | 1 + > > drivers/mfd/ntxec.c | 221 +++++++++++++++++++++ > > drivers/pwm/Kconfig | 8 + > > drivers/pwm/Makefile | 1 + > > drivers/pwm/pwm-ntxec.c | 184 +++++++++++++++++ > > drivers/rtc/Kconfig | 8 + > > drivers/rtc/Makefile | 1 + > > drivers/rtc/rtc-ntxec.c | 145 ++++++++++++++ > > include/linux/mfd/ntxec.h | 37 ++++ > > 13 files changed, 704 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml > > create mode 100644 drivers/mfd/ntxec.c > > create mode 100644 drivers/pwm/pwm-ntxec.c > > create mode 100644 drivers/rtc/rtc-ntxec.c > > create mode 100644 include/linux/mfd/ntxec.h > > FYI, if anyone has pulled this, they should probably rebase it onto > v5.12-rc2 and delete the v5.12-rc1 tag from their tree: > > https://lwn.net/Articles/848431/ In case you haven't pulled this in yet, I have created a new tag: ib-mfd-pwm-rtc-v5.13-1
Hello Lee, On Tue, Mar 09, 2021 at 08:05:20PM +0000, Lee Jones wrote: > On Mon, 01 Mar 2021, Lee Jones wrote: > > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pwm-rtc-v5.13 > > > > for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a5872504: > > > > MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01 10:26:17 +0000) > > > > ---------------------------------------------------------------- > > Immutable branch between MFD, PWM and RTC due for the v5.13 merge window > > > > ---------------------------------------------------------------- > > [...] > > FYI, if anyone has pulled this, they should probably rebase it onto > v5.12-rc2 and delete the v5.12-rc1 tag from their tree: > > https://lwn.net/Articles/848431/ I'm not directly affected, but I wonder: The idea of an immutable branch is that the same history gets included in different trees. If now each maintainer rebases individually the result isn't the same history any more in each tree which somewhat defeats the idea of using immutable branches. IMHO there are two ways forward: Either someone (Lee again?) creates a new pull request for this series rebased on -rc2; or we accept that these few patches are based on -rc1. For the latter it would be beneficial to merge the tag into a tree that is already based on -rc2. Currently this branch makes it into next only via mfd[1]. A little bit of statistics for the interested: Between the broken commit 48d15436fde6 and its fix (caf6912f3f4a) there are 655 commits that are broken (git rev-list --ancestry-path 48d15436fde6..caf6912f3f4a | wc -l). We won't get rid of these. (Well unless Linus descides to rewrite history which would surprise me.) In current next (b01d57bfdc41c8f635b08b8a5af8a31217d46936) there are 3244 commits that include the broken commit 48d15436fde6 (git rev-list --ancestry-path 48d15436fde6..next/master | wc -l) and only 1411 of them also include the fix (git rev-list --ancestry-path caf6912f3f4a..next/master | wc -l). So next currently introduces 3244 - 1411 - 655 = 1178 additional broken commits. My feeling is that unless this number goes down considerably, we don't have to recourse to special measures to fix the 6 commits in this pull request and merging it based on -rc1-dontuse should be fine. A list of merges into next that contain the problematic commit but not its fix can be generated using git rev-list --merges --first-parent linus/master..next/master | while read c; do if git merge-base --is-ancestor 48d15436fde6 $c^2 && ! git merge-base --is-ancestor caf6912f3f4a $c^2; then git show -s --pretty=oneline "$c"; fi; done | nl It currently shows 37 merges. Best regards Uwe [1] git rev-list --merges --first-parent 80629611215d1c5d52ed3cf723fd6d24a5872504..next/master | while read c; do if git merge-base --is-ancestor 80629611215d1c5d52ed3cf723fd6d24a5872504 $c^2; then git show -s --pretty=oneline "$c"; fi; done
On 10/03/2021 12:39:59+0100, Uwe Kleine-König wrote: > Hello Lee, > > On Tue, Mar 09, 2021 at 08:05:20PM +0000, Lee Jones wrote: > > On Mon, 01 Mar 2021, Lee Jones wrote: > > > > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > > > > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pwm-rtc-v5.13 > > > > > > for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a5872504: > > > > > > MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01 10:26:17 +0000) > > > > > > ---------------------------------------------------------------- > > > Immutable branch between MFD, PWM and RTC due for the v5.13 merge window > > > > > > ---------------------------------------------------------------- > > > [...] > > > > FYI, if anyone has pulled this, they should probably rebase it onto > > v5.12-rc2 and delete the v5.12-rc1 tag from their tree: > > > > https://lwn.net/Articles/848431/ > > I'm not directly affected, but I wonder: The idea of an immutable branch > is that the same history gets included in different trees. If now each > maintainer rebases individually the result isn't the same > history any more in each tree which somewhat defeats the idea of using > immutable branches. > > IMHO there are two ways forward: Either someone (Lee again?) creates a > new pull request for this series rebased on -rc2; or we accept that > these few patches are based on -rc1. For the latter it would be > beneficial to merge the tag into a tree that is already based on -rc2. > The solution is simply for the maintainers merging the immutable branch to do that in a branch based on -rc2. Eg. I've rebased rtc-next on -rc2 (fast forward, I didn't have any patch). I can now merge this branch if necessary, problem solved. If you can't rebased, nothing prevents you from merging -rc2 in any branch.
On Wed, Mar 10, 2021 at 12:54:08PM +0100, Alexandre Belloni wrote: > On 10/03/2021 12:39:59+0100, Uwe Kleine-König wrote: > > IMHO there are two ways forward: Either someone (Lee again?) creates a > > new pull request for this series rebased on -rc2; or we accept that > > these few patches are based on -rc1. For the latter it would be > > beneficial to merge the tag into a tree that is already based on -rc2. > The solution is simply for the maintainers merging the immutable branch > to do that in a branch based on -rc2. Eg. I've rebased rtc-next on -rc2 > (fast forward, I didn't have any patch). I can now merge this branch if > necessary, problem solved. If you can't rebased, nothing prevents you > from merging -rc2 in any branch. That doesn't exactly address the issue - the goal was to reduce the number of commits that a bisect could hit which have the swapfile bug but lack the fix. How serious a few extra commits on a shared branch really are is of course an open question though.
Enjoy! The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pwm-rtc-v5.13 for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a5872504: MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01 10:26:17 +0000) ---------------------------------------------------------------- Immutable branch between MFD, PWM and RTC due for the v5.13 merge window ---------------------------------------------------------------- Jonathan Neuschäfer (6): dt-bindings: Add vendor prefix for Netronix, Inc. dt-bindings: mfd: Add binding for Netronix embedded controller mfd: Add base driver for Netronix embedded controller pwm: ntxec: Add driver for PWM function in Netronix EC rtc: New driver for RTC in Netronix embedded controller MAINTAINERS: Add entry for Netronix embedded controller .../devicetree/bindings/mfd/netronix,ntxec.yaml | 76 +++++++ .../devicetree/bindings/vendor-prefixes.yaml | 2 + MAINTAINERS | 9 + drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/ntxec.c | 221 +++++++++++++++++++++ drivers/pwm/Kconfig | 8 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-ntxec.c | 184 +++++++++++++++++ drivers/rtc/Kconfig | 8 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-ntxec.c | 145 ++++++++++++++ include/linux/mfd/ntxec.h | 37 ++++ 13 files changed, 704 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml create mode 100644 drivers/mfd/ntxec.c create mode 100644 drivers/pwm/pwm-ntxec.c create mode 100644 drivers/rtc/rtc-ntxec.c create mode 100644 include/linux/mfd/ntxec.h