Google Git
Sign in
android / kernel / common.git / d65ba7d6e90b50129693c47c3634c664e5d06317
commitd65ba7d6e90b50129693c47c3634c664e5d06317[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Fri Oct 02 11:06:03 2020 +0200
committerGreg Kroah-Hartman <gregkh@google.com>Fri Oct 02 11:06:03 2020 +0200
tree8517694a4af9131c462a5d6561354bd9a34dc25b
parent05dd8fe69866d177ce2c3e7baf19c87d49e83146 [diff]
ANDROID: GKI: Update .xml definition for 5.4.69 merge

Leaf changes summary: 1784 artifacts changed (26 filtered out)
Changed leaf types summary: 5 leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 1758 Changed (26 filtered out), 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 21 Changed, 0 Added variable

1758 functions with some sub-type change:
21 Changed variables:

'struct linux_binprm at binfmts.h:17:1' changed:
  type size hasn't changed
  1 data member insertion:
    'unsigned int linux_binprm::called_exec_mmap', at offset 28 (in bits) at binfmts.h:53:1
  3013 impacted interfaces

'struct mmc_card at card.h:244:1' changed (indirectly):
  type size changed from 14272 to 14464 (in bits)
  there are data member changes:
    'mmc_part mmc_card::part[7]' size changed from 2016 to 2240 (in bits) (by +224 bits)
    'unsigned int mmc_card::nr_parts' offset changed from 14112 to 14336 (in bits) (by +224 bits)
    'unsigned int mmc_card::bouncesz' offset changed from 14144 to 14368 (in bits) (by +224 bits)
    'workqueue_struct* mmc_card::complete_wq' offset changed from 14208 to 14400 (in bits) (by +192 bits)
  89 impacted interfaces

'struct mmc_part at card.h:229:1' changed:
  type size changed from 288 to 320 (in bits)
  there are data member changes:
    type 'unsigned int' of 'mmc_part::size' changed:
      entity changed from 'unsigned int' to compatible type 'typedef u64' at int-ll64.h:23:1
      type size changed from 32 to 64 (in bits)
    'unsigned int mmc_part::part_cfg' offset changed from 32 to 64 (in bits) (by +32 bits)
    'char mmc_part::name[20]' offset changed from 64 to 96 (in bits) (by +32 bits)
    'bool mmc_part::force_ro' offset changed from 224 to 256 (in bits) (by +32 bits)
    'unsigned int mmc_part::area_type' offset changed from 256 to 288 (in bits) (by +32 bits)
  89 impacted interfaces

'struct opp_table at opp.h:163:1' changed:
  type size hasn't changed
  1 data member deletion:
    'kref opp_table::list_kref', at offset 864 (in bits) at opp.h:170:1
  there are data member changes:
    type 'typedef bool' of 'opp_table::parsed_static_opps' changed:
      entity changed from 'typedef bool' to compatible type 'unsigned int'
      type size changed from 8 to 32 (in bits)
  19 impacted interfaces

'struct signal_struct at signal.h:81:1' changed:
  type size changed from 8320 to 8576 (in bits)
  1 data member insertion:
    'mutex signal_struct::exec_update_mutex', at offset 8064 (in bits) at signal.h:232:1
  there are data member changes:
    'u64 signal_struct::android_kabi_reserved1' offset changed from 8064 to 8320 (in bits) (by +256 bits)
    'u64 signal_struct::android_kabi_reserved2' offset changed from 8128 to 8384 (in bits) (by +256 bits)
    'u64 signal_struct::android_kabi_reserved3' offset changed from 8192 to 8448 (in bits) (by +256 bits)
    'u64 signal_struct::android_kabi_reserved4' offset changed from 8256 to 8512 (in bits) (by +256 bits)
  3013 impacted interfaces

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I132721d8c5dfb0377928307ca7d697f8a00e255a
1 file changed
tree: 8517694a4af9131c462a5d6561354bd9a34dc25b
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. LICENSES/
  15. mm/
  16. net/
  17. samples/
  18. scripts/
  19. security/
  20. sound/
  21. tools/
  22. usr/
  23. virt/
  24. .clang-format
  25. .cocciconfig
  26. .get_maintainer.ignore
  27. .gitattributes
  28. .gitignore
  29. .mailmap
  30. build.config.aarch64
  31. build.config.allmodconfig
  32. build.config.allmodconfig.aarch64
  33. build.config.allmodconfig.arm
  34. build.config.allmodconfig.x86_64
  35. build.config.arm
  36. build.config.common
  37. build.config.db845c
  38. build.config.gki
  39. build.config.gki-debug.aarch64
  40. build.config.gki-debug.x86_64
  41. build.config.gki.aarch64
  42. build.config.gki.x86_64
  43. build.config.gki_kasan
  44. build.config.gki_kasan.aarch64
  45. build.config.gki_kasan.x86_64
  46. build.config.hikey960
  47. build.config.x86_64
  48. COPYING
  49. CREDITS
  50. Kbuild
  51. Kconfig
  52. MAINTAINERS
  53. Makefile
  54. README
  55. README.md
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass script/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry-picked from ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

    - then Joe Smith would upload the patch for the common kernel as

        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry-picked from ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [ Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

    - then Joe Smith would upload the patch for the common kernel as

        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)