The important thing for cherry-picks FROMGIT are that the content of the
change doesn't change (by the maintainer just before a merge request, or
due to rebasing a tree), not so much that it is a "stable maintainer"
tree, so update the language a little.
Also, explicitly call out 'net' and 'net-next' as these trees are
"special", and in the opposite way to 'linux-next'.
Change-Id: I7b2c009d237fbc44bb515fce497cdd92e2138420
Signed-off-by: Alistair Delva <adelva@google.com>
Recently, multiple patch series have been submitted to Android kernels
with the FROMLIST: tag, despite them containing changes that have been
rejected by the upstream community, sometimes many years ago.
FROMLIST is to be used for things that have a chance to be accepted
upstream, or for work-in-progress changes, NOT for rejected submissions,
as using this tag should not hide this rejection state.
Bug: 391973735
Change-Id: I2e73d43dd780c01e9cfd6d1f249c1c9eebcf1a3d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
For some cases, the cherry pick might be done for the newer
branch already, say the android-mainline branch, and some time later
it's required for the old version branch as well, say the android14-6.1
branch, for this case it would be better to do the cherry pick from the
upstream 6.1, and list the commit id from the upstream 6.1 branch,
instead of doing the cherry pick via gerrit from the previous
android-mainline commit.
According to the review comments here:
https://r.android.com/3189259/comment/83b58e0e_e46cf52c/
Change-Id: Ic572be6fd5b453d6c6cdf347d25163fc8c41a83a
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
[cmllamas: more consice instructions, drop fixes tag, extern URL]
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Fixes: 2f886a659a ("ANDROID: README.md: add text on upstreaming patches")
Change-Id: Ib666461f84cbe50f9503e4501af44681a45091f7
Signed-off-by: Eric Biggers <ebiggers@google.com>
There needs to be a bug for FROMLIST patches to discuss
rationale for why the patch is so urgent that it needs
to be merged before maintainers accept it upstream.
Bug: 155420414
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I33bfc9b1edcead7a9b300ba57a2d371a9ea2f74e
The backporting comment shall refer to the user adding the comment. It
otherwise might become ambiguous.
Fixes: f8978f4f6a ("ANDROID: add README.md")
Change-Id: I40974a4c2e536fea6f2042b7322bba415640a552
Signed-off-by: Matthias Maennich <maennich@google.com>
Added text to README.md to remind developers that
upstream maintainers need to see uses of exported
symbols if new exports are being added and that
enablement of out-of-tree functionality is not
a sufficient argument for patches to be added.
Change-Id: I633307e7633aab81cb8ae79a9a10bd2d4bc1cebb
Signed-off-by: Todd Kjos <tkjos@google.com>
Some renderers include this bullet in the code
block. Make sure it is not in the code block
and is still indented.
Change-Id: Ic7fd075eec2318934dac7b2f75a8f0fd75304950
Signed-off-by: Todd Kjos <tkjos@google.com>
The instructions in the README should match what `git cherry-pick -x` is
producing to get a consistent format that we can later rely on.
Fixes: f8978f4f6a ("ANDROID: add README.md")
Change-Id: I7c9f06af65654ae141ef85b52a081641c7320348
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
Add md file to communicate requirements for patches submitted
to common kernel
Change-Id: I92c3d8a6c40d8a8e5e9cfc9cb42887a5a858faf9
Signed-off-by: Todd Kjos <tkjos@google.com>
Aaliyah Merchant
Alistair Delva
Greg Kroah-Hartman
Yongqin Liu
Eric Biggers
Carlos Llamas
Todd Kjos
Matthias Maennich