This allows us to avoid conflicts, especially when basing on master and targeting merge into next.
An extra benefit is that the upcoming migration guides are no longer hidden and thus easier to review after a local build. Signed-off-by: Ahmad Fatoum <[email protected]> --- Sending again after rebase on newest master. --- Documentation/migration-guides/index.rst | 1 + .../migration-guides/migration-master.rst | 16 ++++++++++------ .../migration-master/stm32mp-deep-probe.rst | 6 ++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Documentation/migration-guides/migration-master/stm32mp-deep-probe.rst diff --git a/Documentation/migration-guides/index.rst b/Documentation/migration-guides/index.rst index 5e1a0cfbc7a0..ded638639e1e 100644 --- a/Documentation/migration-guides/index.rst +++ b/Documentation/migration-guides/index.rst @@ -12,3 +12,4 @@ causes build errors is generally out-of-scope for these documents. :glob: migration-20* + migration-master diff --git a/Documentation/migration-guides/migration-master.rst b/Documentation/migration-guides/migration-master.rst index 75c4880aa6d4..a5ca0a7f3b46 100644 --- a/Documentation/migration-guides/migration-master.rst +++ b/Documentation/migration-guides/migration-master.rst @@ -1,8 +1,12 @@ -:orphan: +Pending changes +=============== -Deep probe is now the default on STM32MP13 and STM32MP15 --------------------------------------------------------- +This sections lists possibly backwards-incompatible changes that have been committed +to the barebox source tree, but have not yet been included into a release. +If you have concerns about any of them, now's a good time to reach out to the +:ref:`mailing list <feedback>`. -barebox now enables deep probe for every ``st,stm32mp1xx`` compatible, even -over ``barebox,disable-deep-probe``. Report to the mailing list if that -breaks your board. +.. toctree:: + :glob: + + migration-master/* diff --git a/Documentation/migration-guides/migration-master/stm32mp-deep-probe.rst b/Documentation/migration-guides/migration-master/stm32mp-deep-probe.rst new file mode 100644 index 000000000000..8ff966a4dcf5 --- /dev/null +++ b/Documentation/migration-guides/migration-master/stm32mp-deep-probe.rst @@ -0,0 +1,6 @@ +Deep probe is now the default on STM32MP13 and STM32MP15 +-------------------------------------------------------- + +barebox now enables deep probe for every ``st,stm32mp1xx`` compatible, even +over ``barebox,disable-deep-probe``. Report to the mailing list if that +breaks your board. -- 2.47.3
