Google Git
Sign in
kernel / pub / scm / linux / kernel / git / jaegeuk / f2fs-stable / refs/tags/ASB-2020-01-05_mainline
tageaa069d00fdc3414d6a26c414466837a2c9be4df
taggerTodd Kjos <tkjos@google.com>Mon Jan 06 13:46:32 2020 -0800
objecta931d512252fc01b1330780fca1f588cfc20f329 
https://source.android.com/security/bulletin/2020-01-01
CVE-2019-17666
CVE-2018-20856
CVE-2019-11599
CVE-2019-15214
commita931d512252fc01b1330780fca1f588cfc20f329[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Mon Jan 06 10:37:23 2020 +0100
committerGreg Kroah-Hartman <gregkh@google.com>Mon Jan 06 10:37:42 2020 +0100
treeeddb9a56b83aaeed41a343304607d9a4d9c53c97
parent53b7fdd2cb617d6f3abffb26823f5617ce3964f8 [diff]
ANDROID: abi update for 5.5-rc5

Leaf changes summary: 1 artifact changed
Changed leaf types summary: 1 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

'struct tcf_proto_ops at sch_generic.h:290:1' changed:
  type size changed from 1408 to 1472 (in bits)
  1 data member insertion:
    'void ()* tcf_proto_ops::delete_empty', at offset 704 (in bits) at sch_generic.h:311:1
  there are data member changes:
   'void ()* tcf_proto_ops::walk' offset changed from 704 to 768 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::reoffload' offset changed from 768 to 832 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::hw_add' offset changed from 832 to 896 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::hw_del' offset changed from 896 to 960 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::bind_class' offset changed from 960 to 1024 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::tmplt_create' offset changed from 1024 to 1088 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::tmplt_destroy' offset changed from 1088 to 1152 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::dump' offset changed from 1152 to 1216 (in bits) (by +64 bits)
   'void ()* tcf_proto_ops::tmplt_dump' offset changed from 1216 to 1280 (in bits) (by +64 bits)
   'module* tcf_proto_ops::owner' offset changed from 1280 to 1344 (in bits) (by +64 bits)
   'int tcf_proto_ops::flags' offset changed from 1344 to 1408 (in bits) (by +64 bits)

  483 impacted interfaces:

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If1e46a719623e703873c843af50fc698567f18c9
1 file changed
tree: eddb9a56b83aaeed41a343304607d9a4d9c53c97
  1. arch/
  2. block/
  3. certs/
  4. crypto/
  5. Documentation/
  6. drivers/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. LICENSES/
  14. mm/
  15. net/
  16. samples/
  17. scripts/
  18. security/
  19. sound/
  20. tools/
  21. usr/
  22. virt/
  23. .clang-format
  24. .cocciconfig
  25. .get_maintainer.ignore
  26. .gitattributes
  27. .gitignore
  28. .mailmap
  29. abi_gki_aarch64.xml
  30. abi_gki_aarch64_whitelist
  31. build.config.aarch64
  32. build.config.allmodconfig
  33. build.config.allmodconfig.aarch64
  34. build.config.allmodconfig.x86_64
  35. build.config.common
  36. build.config.gki
  37. build.config.gki.aarch64
  38. build.config.gki.x86_64
  39. build.config.x86_64
  40. COPYING
  41. CREDITS
  42. Kbuild
  43. Kconfig
  44. MAINTAINERS
  45. Makefile
  46. README
  47. 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.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

  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 commit ...) 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 commit 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 commit ...) 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 commit 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)