Google Git
Sign in
android / kernel / common / 6d7fe6dcb2e23e18b416d54aadc915072b2168e1
commit6d7fe6dcb2e23e18b416d54aadc915072b2168e1[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Fri Dec 11 10:53:25 2020 +0100
committerGreg Kroah-Hartman <gregkh@google.com>Fri Dec 11 16:10:15 2020 +0100
tree004b726098d99d0ffae8b10ea470a3da2c2fd772
parent6dd7aff0b143607749a2008cd8fc514c943693ab [diff]
ANDROID: GKI: update .xml due to recent changes

There's been a bunch of recent changes with no update to the abi .xml
file.

So update it and get back in sync.

Leaf changes summary: 1193 artifacts changed
Changed leaf types summary: 3 leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 1174 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 16 Changed, 0 Added variable

1174 functions with some sub-type change:
16 Changed variables:

'struct cgroup at cgroup-defs.h:351:1' changed (indirectly):
  type size changed from 18752 to 18624 (in bits)
  there are data member changes:
    type 'struct psi_group' of 'cgroup::psi' changed:
      type size changed from 5440 to 5312 (in bits)
      1 data member deletion:
        'kthread_delayed_work psi_group::poll_work', at offset 3584 (in bits) at psi_types.h:150:1
      2 data member insertions:
        'wait_queue_head_t psi_group::poll_wait', at offset 3968 (in bits) at psi_types.h:150:1
        'atomic_t psi_group::poll_wakeup', at offset 4160 (in bits) at psi_types.h:151:1
      there are data member changes:
        type 'typedef atomic_t' of 'psi_group::poll_scheduled' changed:
          entity changed from 'typedef atomic_t' to 'task_struct*'
          type size changed from 32 to 64 (in bits)
        and name of 'psi_group::poll_scheduled' changed to 'psi_group::poll_task' at psi_types.h:148:1
        type 'kthread_worker*' of 'psi_group::poll_kworker' changed:
          entity changed from 'kthread_worker*' to 'struct timer_list' at timer.h:12:1
          type size changed from 64 to 448 (in bits)
        and name of 'psi_group::poll_kworker' changed to 'psi_group::poll_timer' at psi_types.h:149:1
        'mutex psi_group::trigger_lock' offset changed from 4352 to 4224 (in bits) (by -128 bits)
        'list_head psi_group::triggers' offset changed from 4608 to 4480 (in bits) (by -128 bits)
        'u32 psi_group::nr_triggers[5]' offset changed from 4736 to 4608 (in bits) (by -128 bits)
        'u32 psi_group::poll_states' offset changed from 4896 to 4768 (in bits) (by -128 bits)
        'u64 psi_group::poll_min_period' offset changed from 4928 to 4800 (in bits) (by -128 bits)
        'u64 psi_group::polling_total[5]' offset changed from 4992 to 4864 (in bits) (by -128 bits)
        'u64 psi_group::polling_next_update' offset changed from 5312 to 5184 (in bits) (by -128 bits)
        'u64 psi_group::polling_until' offset changed from 5376 to 5248 (in bits) (by -128 bits)
      2956 impacted interfaces
    'cgroup_bpf cgroup::bpf' offset changed from 12480 to 12352 (in bits) (by -128 bits)
    'atomic_t cgroup::congestion_count' offset changed from 18560 to 18432 (in bits) (by -128 bits)
    'cgroup_freezer_state cgroup::freezer' offset changed from 18592 to 18464 (in bits) (by -128 bits)
    'int cgroup::ancestor_ids[]' offset changed from 18720 to 18592 (in bits) (by -128 bits)
  2956 impacted interfaces

'struct cgroup_root at cgroup-defs.h:499:1' changed (indirectly):
  type size changed from 52608 to 52480 (in bits)
  there are data member changes:
    type 'struct cgroup' of 'cgroup_root::cgrp' changed, as reported earlier
    'int cgroup_root::cgrp_ancestor_id_storage' offset changed from 18880 to 18752 (in bits) (by -128 bits)
    'atomic_t cgroup_root::nr_cgrps' offset changed from 18912 to 18784 (in bits) (by -128 bits)
    'list_head cgroup_root::root_list' offset changed from 18944 to 18816 (in bits) (by -128 bits)
    'unsigned int cgroup_root::flags' offset changed from 19072 to 18944 (in bits) (by -128 bits)
    'idr cgroup_root::cgroup_idr' offset changed from 19136 to 19008 (in bits) (by -128 bits)
    'char cgroup_root::release_agent_path[4096]' offset changed from 19328 to 19200 (in bits) (by -128 bits)
    'char cgroup_root::name[64]' offset changed from 52096 to 51968 (in bits) (by -128 bits)
  2956 impacted interfaces

'struct psi_group at psi_types.h:128:1' changed:
  details were reported earlier

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I30788d9234b7f9e980231535b6072cf1065e078b
1 file changed
tree: 004b726098d99d0ffae8b10ea470a3da2c2fd772
  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)