summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-30Merge changes I90693fb4,Ibb3d4c77 into mainHEADmastermainTreehugger Robot
* changes: aosp/android-mainline: fixup Kunit tools patch into tools commit aosp/android-mainline: update series (rebase onto v6.7)
2024-01-30Merge changes If9caece8,I762c1f4a into mainTreehugger Robot
* changes: aosp/android-mainline: update series (rebase onto v6.7-rc8-177-g52b1853b080a0) aosp/android-mainline: update series
2024-01-30Merge "aosp/android-mainline: update series (rebase onto ↵Treehugger Robot
v6.7-rc8-174-g95c8a35f1c017)" into main
2024-01-30Merge changes I5ecf8231,I96a15f5f into mainTreehugger Robot
* changes: aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.7-rc8-161-g0d3ac66ed81cb)
2024-01-30Merge changes I2442669f,Id5f0e2cd,I6d0bd4f4,I5b768637 into mainTreehugger Robot
* changes: aosp/android-mainline: update series (rebase onto v6.7-rc8-159-ga4ab2706bb128) aosp/android-mainline: update series (rebase onto v6.7-rc8-157-g6c23529c08fc7) aosp/android-mainline: update series (rebase onto v6.7-rc8-152-g2b5bd1498da55) aosp/android-mainline: update series (rebase onto v6.7-rc8-130-g6d0dc8559c847)
2024-01-30Merge "aosp/android-mainline: update series (rebase onto ↵Treehugger Robot
v6.7-rc8-123-g3eca89454aec4)" into main
2024-01-30Merge changes I84e3e7ab,Ia2272b4c,If8769655,Ida1f7b9a into mainTreehugger Robot
* changes: aosp/android-mainline: update series (rebase onto v6.7-rc8-53-g08bd31ece0820) aosp/android-mainline: update series (rebase onto v6.7-rc8) aosp/android-mainline: update series (rebase onto v6.7-rc7) aosp/android-mainline: update series (rebase onto v6.7-rc6)
2024-01-30Merge "aosp/android-mainline: update series (rebase onto v6.7-rc5)" into mainTreehugger Robot
2024-01-30Merge changes I7e8ab57e,I105900f4,I82b71d9c,Iaf936ad1,I6983bf67, ... into mainTreehugger Robot
* changes: aosp/android-mainline: update series (rebase onto v6.7-rc4) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.7-rc3) aosp/android-mainline: update series (rebase onto v6.7-rc2) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-15119-g7f851936a0ca4) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-15100-gc9d01179e185f) aosp/android-mainline: update series (rebase onto v6.6-15029-gbe3ca57cfb777) aosp/android-mainline: update series aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-13985-gd934aef6bb9ec) aosp/android-mainline: update series (rebase onto v6.6-13255-gb06f58ad8e8c4) aosp/android-mainline: update series (rebase onto v6.6-13233-gd99b91a99be43) aosp/android-mainline: update series (rebase onto v6.6-12893-ge392ea4d4d008) aosp/android-mainline: update series (rebase onto v6.6-12401-g8f6f76a6a29f3) aosp/android-mainline: update series aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-11928-gbc3012f4e3a97) aosp/android-mainline: update series (rebase onto v6.6-11644-g6803bd7956ca8) aosp/android-mainline: update series (rebase onto v6.6-11432-g43468456c95b9) aosp/android-mainline: update series (rebase onto v6.6-11379-g6ed92e559a2ea) aosp/android-mainline: update series (rebase onto v6.6-11236-g90a300dc0553c) aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-11104-gedd8e84ae9514) aosp/android-mainline: update series
2024-01-30Merge changes Ia68c2ac5,I3e7c6f6e,I6a005820 into mainTreehugger Robot
* changes: aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-10372-ge9806ff8a0f9e) aosp/android-mainline: update series
2024-01-30Merge changes If5fb70b1,Ie92dc21e,Ia70b34e0 into mainTreehugger Robot
* changes: aosp/android-mainline: update series aosp/android-mainline: update series (rebase onto v6.6-6789-gf9ae180416e04) aosp/android-mainline: update series (rebase onto v6.6-6369-g34aac0a33de21)
2024-01-30aosp/android-mainline: fixup Kunit tools patch into tools commitLee Jones
Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I90693fb4a9d9ca831dbbca2809589a7b0ba936ea
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-177-g52b1853b080a0)Lee Jones
up to 564c96e25b892 ("Merge 52b1853b080a ("Merge tag 'i2c-for-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: If9caece8d5bb28822429df3b15ca91db8394bb38
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-174-g95c8a35f1c017)Lee Jones
up to 34bd5a3324056 ("Merge 95c8a35f1c01 ("Merge tag 'mm-hotfixes-stable-2024-01-05-11-35' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ic1aad78a697f9a247c5b0621957b876b87cd768a
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 22858186da5ac ("ANDROID: Revert "gen_compile_commands.py: fix path resolve with symlinks in it"") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I5ecf8231b8f2cf11e8f9b0788d20eb006098a1a7
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-159-ga4ab2706bb128)Lee Jones
up to 0d8a6c7eb97fc ("Merge a4ab2706bb12 ("Merge tag 'firewire-fixes-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I2442669f75d67dec38b8f7ef83f314d395171e68
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-123-g3eca89454aec4)Lee Jones
up to bf7cf4b92c292 ("Merge 3eca89454aec ("Merge tag '6.7-rc8-smb3-mchan-fixes' of git://git.samba.org/sfrench/cifs-2.6") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Iadb7c825b0994f9e813f7dfcfa831113a7e5dfc5
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-53-g08bd31ece0820)Lee Jones
up to 818858f54a3c1 ("Merge 08bd31ece082 ("Merge tag 'sound-6.7-final' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I84e3e7ab12c16c5c372c42360224ae1317d53fab
2024-01-30aosp/android-mainline: update series (rebase onto v6.7)Lee Jones
up to cb4cf525e1279 ("Merge tag 'v6.7' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ibb3d4c7746607e34712b10c3f48f1a43296b408d
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 2f709c8d65a4a ("Revert "mm: align larger anonymous mappings on THP boundaries"") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I762c1f4a481f78bd2215cdd4bc6f6588cafd5714
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-161-g0d3ac66ed81cb)Lee Jones
up to 1110c3c60ed28 ("Merge 0d3ac66ed81c ("Merge tag 'nfsd-6.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I96a15f5f828067a8c4b8c06220475ece23127059
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-157-g6c23529c08fc7)Lee Jones
up to 560c91f932d41 ("Merge 6c23529c08fc ("Merge tag 'mmc-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Id5f0e2cde3d2562e5838bc537c480a4f5fae2b21
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8)Lee Jones
up to 412675dc28f96 ("Merge tag 'v6.7-rc8' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ia2272b4cc42173ce9c6315b5c435f98c9c686607
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-152-g2b5bd1498da55)Lee Jones
up to 56e81ebfdb5a1 ("Merge 2b5bd1498da5 ("Merge tag 'drm-fixes-2024-01-05' of git://anongit.freedesktop.org/drm/drm") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I6d0bd4f42795f71ef80ae892d52351f6366731a5
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc8-130-g6d0dc8559c847)Lee Jones
up to 753463b582bc4 ("Merge 6d0dc8559c84 ("Merge tag 'soc-fixes-6.7-3a' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I5b7686376495812126c6a83ca8d89fb0091d9af6
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc5)Lee Jones
up to b5f0c45652ff9 ("Merge tag 'v6.7-rc5' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I3df6f0d62aab0af20038104f3e62ec8b00908526
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc4)Lee Jones
up to c16f17d26433a ("Merge tag 'v6.7-rc4' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I7e8ab57ecc89380c0e48998655086934ae47c5c4
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc7)Lee Jones
up to fd33f2c2e1623 ("Merge tag 'v6.7-rc7' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: If8769655b89d2500b0dd0cdfacb30b0204c2034c
2024-01-30aosp/android-mainline: update seriesLee Jones
up to af8564b53bb48 ("ANDROID: GKI: Revert "default enable VHOST_TASK"") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I105900f49b6be8bea68ef30e254775f7ae8fc169
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc6)Lee Jones
up to d4053d8aa8f31 ("Merge tag 'v6.7-rc6' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ida1f7b9aabc186cb470e6d809ed3b820ef2a83de
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc3)Lee Jones
up to 30460eebfd6df ("Merge tag 'v6.7-rc3' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I82b71d9c880c75f33e7b1df71fc6df3393a8f7d5
2024-01-30aosp/android-mainline: update series (rebase onto v6.7-rc2)Lee Jones
up to 4d97e4c41de58 ("Merge tag 'v6.7-rc2' into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Iaf936ad199cadc7b8f32f1cc8c0b333aeb1a71a2
2024-01-30aosp/android-mainline: update seriesLee Jones
up to bf309bfecfed8 ("ANDROID: gki_defconfig: enable debug_kinfo") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I6983bf675708daed8f011c86a5637c60fcf873ce
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-15119-g7f851936a0ca4)Lee Jones
up to 1b38c775af768 ("Merge 7f851936a0ca ("Merge tag 'ovl-update-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Iabb4c4b745fe71c4798ae56db5ced8118f19fcc3
2024-01-30aosp/android-mainline: update seriesLee Jones
up to dea76525f98d8 ("ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ic812dab895c07aa047dacd7d2c393456446b6575
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-15100-gc9d01179e185f)Lee Jones
up to 7b33d5fab923d ("Merge c9d01179e185 ("Merge tag 'bcachefs-2023-11-5' of https://evilpiepirate.org/git/bcachefs") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ib39965f1173ca8f59d2d2555675e493c32cc7ab0
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-15029-gbe3ca57cfb777)Lee Jones
up to 2568ddca4f864 ("Merge be3ca57cfb77 ("Merge tag 'media/v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I35583d4dcb96b95c3ca923dbed9253e0597a8de6
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 68ae8f5f4fdba ("ANDROID: GKI: Remove GENERIC_PHY from gki_defconfig") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I95d016afdd80a292306f593e4d1dfeaad8ea4200
2024-01-30aosp/android-mainline: update seriesLee Jones
up to ec2e16e5160b3 ("ANDROID: update binary names for timer tests") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ia8fb2b8c547a6b2285cc99c5b3756a29a0e59661
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-13985-gd934aef6bb9ec)Lee Jones
up to f7c8b50ab51b0 ("Merge d934aef6bb9e ("Merge tag 'dmaengine-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ia72c44c82ec3d168941ca861f86b8c875589d5ab
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-13255-gb06f58ad8e8c4)Lee Jones
up to 8ea8f83d675c5 ("Merge b06f58ad8e8c ("Merge tag 'driver-core-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I8d58fc72ecd51cee4c3eb03675e53dc688474884
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-13233-gd99b91a99be43)Lee Jones
up to afb85200e5512 ("Merge d99b91a99be4 ("Merge tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I3496345adde4685f7089ba6df846bef420d66bc0
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-12893-ge392ea4d4d008)Lee Jones
up to e7d9a0a6ed4ac ("Merge e392ea4d4d00 ("Merge tag 's390-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I23d2e0425e074185c357b609ee80b5285348458c
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 3851c83bf23ba ("ANDROID: timers: Use original names for outputs of some timer binaries") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ia68c2ac55d9f3120a0249cc52ebf2a3e2879e874
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 2597aed6bcec2 ("ANDROID: Update license for selftest build and configs") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: If5fb70b1cb793c0520f1b7c972688471e3cebd93
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-12401-g8f6f76a6a29f3)Lee Jones
up to 8246e3171b49c ("Merge 8f6f76a6a29f ("Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I78adf61145ff1458736e73a2674ef12cb8092f9c
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-10372-ge9806ff8a0f9e)Lee Jones
up to a09213bd847d4 ("Merge e9806ff8a0f9 ("Merge tag 'jfs-6.7' of https://github.com/kleikamp/linux-shaggy") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I3e7c6f6ef88f19af4b3af26e6cf6f6f2122dab35
2024-01-30aosp/android-mainline: update series (rebase onto v6.6-6789-gf9ae180416e04)Lee Jones
up to 804ee293f248a ("Merge f9ae180416e0 ("Merge tag 'for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply") into android-mainline") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ie92dc21e2fed9fd0c263c7d1c34fc888fafc6ef7
2024-01-30aosp/android-mainline: update seriesLee Jones
up to 6ed7417924f2a ("ANDROID: Revert "mm: handle read faults under the VMA lock"") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Ib790d0f51f71be24266aa1c34098b1cb3b009242
2024-01-30aosp/android-mainline: update seriesLee Jones
up to ed08eac104d17 ("ANDROID: fix up location of qcom-scm.ko module") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I6a005820b1c26bdfeef1d957c452a8f410ffc6e8