Merge tag 'android12-5.4.290_r00' into android12-5.4

This merges the android12-5.4.290_r00 tag into the android12-5.4 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* f66c95f02852 Revert "net: net_namespace: Optimize the code"
* ce66276ad576 Revert "net: add exit_batch_rtnl() method"
* 16d892c31453 Revert "gtp: use exit_batch_rtnl() method"
* b617ec775aaf Revert "gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp()."
* 35928fe3e55c Revert "gtp: Destroy device along with udp socket's netns dismantle."
*   5b4357bdf9f7 Merge 5.4.290 into android12-5.4-lts
|\
| * 856a224845f9 Linux 5.4.290
| * 4b7032d01ea1 Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals
| * 1f91ebde6e35 xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals
| * 9793206fbf52 drm/v3d: Assign job pointer to NULL before signaling the fence
| * 9e87fc214ed9 Input: xpad - add support for wooting two he (arm)
| * 20c54dc14d3c Input: xpad - add unofficial Xbox 360 wireless receiver clone
| * e9ba82343e87 Input: atkbd - map F23 key to support default copilot shortcut
| * 76e7577bb89b Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null"
| * fa4c7472469d USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb()
| * 448100a29395 ext4: fix slab-use-after-free in ext4_split_extent_at()
| * 34b2d3843a53 ext4: avoid ext4_error()'s caused by ENOMEM in the truncate path
| * f21636f24b67 vfio/platform: check the bounds of read/write syscalls
| * 3c4423b0c4b9 net/xen-netback: prevent UAF in xenvif_flush_hash()
| * 4b978070c505 net: xen-netback: hash.c: Use built-in RCU list checking
| * d30436529321 signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
| * 28810b2aa0b1 m68k: Add missing mmap_read_lock() to sys_cacheflush()
| * 2354a75095b9 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
| * 2b0bd5051ad1 gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
| * d26c6ec19cdf irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
| * c7cbdb506d40 scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
| * 820bc91224da ASoC: wm8994: Add depends on MFD core
| * 695fb0b9aecf net: fix data-races around sk->sk_forward_alloc
| * e19acb1926c4 scsi: sg: Fix slab-use-after-free read in sg_release()
| * a61a174280da ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()
| * 95e4f62df23f hrtimers: Handle CPU state correctly on hotplug
| * 1a544a2d424b irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
| * 84c4ed156265 fs/proc: fix softlockup in __read_vmcore (part 2)
| * fbd7d5d954ea net: ethernet: xgbe: re-add aneg to supported features in PHY quirks
| * fb6114c857aa nvmet: propagate npwg topology
| * df19e2d7bdf7 poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()
| * be1d9d4cb1dc kheaders: Ignore silly-rename files
| * 296b89c569f5 hfs: Sanity check the root record
| * 0d11dc30edfc mac802154: check local interfaces before deleting sdata list
| * 5d2b25cbeee2 i2c: mux: demux-pinctrl: check initial mux selection, too
| * 1bd6303d08c8 drm/v3d: Ensure job pointer is set to NULL after job completion
| * 8e87be55db4e nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
| * c986380c1d52 gtp: Destroy device along with udp socket's netns dismantle.
| * 574c3f3f8e5e gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp().
| * 85d966336098 gtp: use exit_batch_rtnl() method
| * 213131557102 net: add exit_batch_rtnl() method
| * 378b81b09235 net: net_namespace: Optimize the code
| * b42e21d09788 net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()
| * c8d179f3b1c1 sctp: sysctl: rto_min/max: avoid using current->nsproxy
| * 58f9e20e2a76 ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
| * a57944e99e1f ocfs2: correct return value of ocfs2_local_free_info()
| * 1abde0742921 phy: core: Fix that API devm_of_phy_provider_unregister() fails to unregister the phy provider
| * 5c51a223fed1 phy: core: fix code style in devm_of_phy_provider_unregister
| * d6c8871e3f10 arm64: dts: rockchip: add hevc power domain clock to rk3328
| * 2c574e1a1c3e arm64: dts: rockchip: add #power-domain-cells to power domain nodes
| * 2aa7a5086942 arm64: dts: rockchip: fix pd_tcpc0 and pd_tcpc1 node position on rk3399
| * a0dfff81549f arm64: dts: rockchip: fix defines in pd_vio node for rk3399
| * 56c85e6bc9cd iio: inkern: call iio_device_put() only on mapped devices
| * b549c90bfe66 iio: adc: at91: call input_free_device() on allocated iio_dev
| * 5856a85425ae iio: adc: ti-ads124s08: Use gpiod_set_value_cansleep()
| * 4bb2b90fc971 iio: gyro: fxas21002c: Fix missing data update in trigger handler
| * 1c80a0985a9a iio: adc: ti-ads8688: fix information leak in triggered buffer
| * 0871eb8d700b iio: imu: kmx61: fix information leak in triggered buffer
| * 13e56229fc81 iio: light: vcnl4035: fix information leak in triggered buffer
| * 03fa47621bf8 iio: dummy: iio_simply_dummy_buffer: fix information leak in triggered buffer
| * 9629ff1a8682 iio: pressure: zpa2326: fix information leak in triggered buffer
| * bfe60030fcd9 usb: gadget: f_fs: Remove WARN_ON in functionfs_bind
| * b24a6afa564f usb: fix reference leak in usb_new_device()
| * 7369c8ffc225 USB: core: Disable LPM only for non-suspended ports
| * 01af472c23bf USB: usblp: return error when setting unsupported protocol
| * f5f33fb57aae usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null
| * faa0eeaf3625 USB: serial: cp210x: add Phoenix Contact UPS Device
| * a5754f733185 usb-storage: Add max sectors quirk for Nokia 208
| * dd4f2d935d58 staging: iio: ad9832: Correct phase range check
| * 9d16b310e428 staging: iio: ad9834: Correct phase range check
| * dffc4f7d2eca USB: serial: option: add Neoway N723-EA support
| * f8d57de3c801 USB: serial: option: add MeiG Smart SRM815
| * 04301fadfb52 drm/amd/display: increase MAX_SURFACES to the value supported by hw
| * 9771233b7ab1 ACPI: resource: Add Asus Vivobook X1504VAP to irq1_level_low_skip_override[]
| * b03307c1a1b0 ACPI: resource: Add TongFang GM5HG0A to irq1_edge_low_force_override[]
| * 8a9315e6f7b2 drm/amd/display: Add check for granularity in dml ceil/floor helpers
| * 10c869a52f26 sctp: sysctl: auth_enable: avoid using current->nsproxy
| * 1031462a944b sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy
| * ec037fe8c0d0 dm thin: make get_first_thin use rcu-safe list first function
| * 6429f52ed1a5 tls: Fix tls_sw_sendmsg error handling
| * 9858f4afeb2e net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute
| * 69c312572ec2 tcp/dccp: allow a connection when sk_max_ack_backlog is zero
| * 736fe12ce675 tcp/dccp: complete lockless accesses to sk->sk_max_ack_backlog
| * 0f25193e53a1 net: 802: LLC+SNAP OID:PID lookup on start of skb data
| * ca254b280592 ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe()
| * e231d0390752 dm array: fix cursor index when skipping across block boundaries
| * 28c628d20094 dm array: fix unreleased btree blocks on closing a faulty array cursor
| * 9c7c03d0e926 dm array: fix releasing a faulty array block twice in dm_array_cursor_end
| * 82235ad55a9e jbd2: flush filesystem device before updating tail sequence
* 062a622d9abd Merge branch 'android12-5.4' into android12-5.4-lts

Change-Id: Ic655bbc8a95cc69c6325c7e3578d70c7089bffc9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: 784964a863a870a5d5fe83d022292ddc7979e14b
  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.gki_kprobes
  47. build.config.gki_kprobes.aarch64
  48. build.config.gki_kprobes.x86_64
  49. build.config.hikey960
  50. build.config.x86_64
  51. COPYING
  52. CREDITS
  53. Kbuild
  54. Kconfig
  55. MAINTAINERS
  56. Makefile
  57. OWNERS
  58. README
  59. 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)