Age | Commit message (Collapse) | Author |
|
0d504ce9dc
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656550
Change-Id: I6489fd0da08172f07d83675727ee455f4e32f47f
|
|
011679b6d4
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656549
Change-Id: I9abf6b80b0223e689be106c96015480ab0aa6bd9
|
|
56a4631b73
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656548
Change-Id: I2015e6dd6265fb5b438b1817f990a0f95a601406
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656550
Change-Id: I11e406c365b5d54d356de5cd4d02da140a50f79f
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656549
Change-Id: Iabe016aed24efc73b02e2120bfa6b1cad40f2226
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656548
Change-Id: Ie07391ac46e5369fe755e784dbdea386f7a3204b
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656550
Change-Id: I2498b007c5d47986a5b5c36356302bce09a77d11
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656549
Change-Id: I3c1de551becf9583d1c839af8449ce4796df595e
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1656548
Change-Id: Ifa8aab322938de0d21c87a939ef1b1554022f3f8
|
|
3abbca9de507 Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.10' into meson-5.10
5af07d297daf FROMGIT: power: supply: Fix build error when CONFIG_POWER_SUPPLY is not enabled.
b015d2efa12f FROMGIT: usb: dwc3: gadget: modify the scale in vbus_draw callback
76284302b658 BACKPORT: FROMLIST: usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable
dcf3827b8b2e FROMLIST: Makefile: fix GDB warning with CONFIG_RELR
dfbe3db20de2 ANDROID: refresh ABI XML before enabling KMI enforcement
965dff4e922a Revert "Revert "ANDROID: GKI: Enable bounds sanitizer""
42e7f89d7942 Revert "ANDROID: Revert "f2fs: fix to tag FIEMAP_EXTENT_MERGED in f2fs_fiemap()""
d6aa6f9c688e ANDROID: Enforce KMI stability
822a31b72e7c ANDROID: enable options prior to enforcing KMI
64ac4d81560a Revert "ANDROID: GKI: temporarily disable LTO/CFI"
99941e23f7da Merge branch 'android12-5.10-lts' into 'android12-5.10'
4a02f3d509a9 ANDROID: gki_defconfig: Enable NET_CLS_{BASIC,TCINDEX,MATCHALL} & NET_ACT_{GACT,MIRRED}
01505265182c FROMLIST: selftests: Add a MREMAP_DONTUNMAP selftest for shmem
1d695ccfc64c FROMLIST: mm: Extend MREMAP_DONTUNMAP to non-anonymous mappings
f45afb45088c ANDROID: GKI: enable CONFIG_CMA_SYSFS
2cf6f07bf089 ANDROID: make cma_sysfs experimental
a5903592595d FROMLIST: mm: cma: support sysfs
e826368ff63c ANDROID: cpuidle: Move vendor hook to enter proper state
d5992d56cc69 ANDROID: fix up ext4 build from 5.10.26
57b60a3a15e5 Merge 5.10.26 into android12-5.10-lts
6499e464d59f ANDROID: GKI: Enable DETECT_HUNG_TASK
4fae3d166d92 ANDROID: refresh ABI XML to new version
0f2e4e314a21 ANDROID: GKI: refresh ABI XML
856cd02bbdd4 Linux 5.10.26
de1126ea44bb cifs: Fix preauth hash corruption
...
Bug: 181632099
Bug: 181904027
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ib1c7759b275b963eb82be59c681e88aed2abf0eb
|
|
749bf265b0bd Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.4' into meson-5.4
1dc47fb418c8 ANDROID: ABI: update symbols to unisoc whitelist for the third time
7af03784d889 ANDROID: Make vsock virtio packet buff size configurable
e38d280ef670 ANDROID: gki_defconfig: Enable NET_CLS_{BASIC,TCINDEX,MATCHALL} & NET_ACT_{GACT,MIRRED}
40881c4e8a9b ANDROID: refresh ABI XML to new version
54c96920b322 ANDROID: GKI: refresh ABI XML
e77a35f018fb ANDROID: Enforce KMI stability
16fecc84e376 ANDROID: update abi before first KMI freeze
be1170d846f3 ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for arm
b55984a5b232 FROMLIST: ARM: kprobes: rewrite test-arm.c in UAL
3c86b178121b FROMLIST: ARM: kprobes: fix UNPREDICTABLE warnings
b5d96072a6a2 UPSTREAM: ARM: 9029/1: Make iwmmxt.S support Clang's integrated assembler
...
7cae64314afa FROMGIT: binder: use EINTR for interrupted wait for work
53bb1a64c761 BACKPORT: FROMGIT: binder: BINDER_FREEZE ioctl
b90344f7d600 Linux 5.4.108
819eb4d7a85e cifs: Fix preauth hash corruption
...
Bug: N/A
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: I6de670206266399300b64d3316c066d3e7e6cc7a
|
|
26a92454997d Merge remote-tracking branch 'hikey-aosp/mirror-android-4.19-stable' into meson-4.19
ec2be24ab757 ANDROID: Make vsock virtio packet buff size configurable
2758bb8ad15e ANDROID: fix up ext4 build from 4.19.183
72af4b843304 Merge 4.19.183 into android-4.19-stable
c1cb48892153 ANDROID: refresh ABI XML to new version
7863d393d8fe ANDROID: refresh ABI XML
78fec1611cbf Linux 4.19.183
b0834edc70e4 cifs: Fix preauth hash corruption
...
Bug: N/A
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: I2207df08f9d2b30812cd1b56d94613d208497b84
|
|
ours am: 21f4f3126a -s ours
am skip reason: Change-Id I824a8a7f8ecf2cc629ca96ea3002255e1199dcd8 with SHA-1 3604a40dfb is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b977e5aa6dff9c2af5cd7ba1d733ffd282ae390
|
|
am skip reason: Change-Id I824a8a7f8ecf2cc629ca96ea3002255e1199dcd8 with SHA-1 3604a40dfb is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82603ef55c0ffee77024c31e265e96f67a37e1b0
|
|
Bug: 180401296
Merged-In: I824a8a7f8ecf2cc629ca96ea3002255e1199dcd8
Change-Id: I6f71e0aeef66db6aed0ceda0b771fee99aa95ed9
|
|
f0bf409106
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1577703
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d017c88173604c4844b5f62e26ce12d0665b1a5
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1577703
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib18cc9edcdad423e61b612a2be25593042b67d25
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1577703
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I043fa41fc9e8730a3800072b47c7e411cb7c7baf
|
|
To prepare for more kernel versions, but also kernel versions with
lots of modules, use separate dirs for each kernel version.
This drops the kernel version suffix from all files and uses the
directory instead. Doing so also allows better integration with the
android kernel/common builds using DIST_DIR without the need to add
version suffix to all files.
Requires corresponding change in device/amlogic/yukawa to be merged
at the same time.
Change-Id: If834c6b5ad20344b097e961b3d414fcde799c9d9
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
|
|
6edbe51a6e am: f3cd9316c3 am: 4b035b7b29
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1554436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d4fa77b895be642ce346ff30e9f11660a2d074b
|
|
6edbe51a6e am: f3cd9316c3
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1554436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17b40614e4dac49ec23763a1b54b1bd2bc408e39
|
|
6edbe51a6e
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1554436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64529fa49e28e521ada7af3cee985150af9fbc86
|
|
04d89de12735 YUKAWA: Disable CONFIG_RC_MAP
82679f8bb674 Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.4' into meson-5.4
4400285ab619 FROMGIT: dma-buf: cma_heap: Fix memory leak in CMA heap
7df22911a1df ANDROID: Update hikey960 config fragment and kabi to add DMA BUF Heaps
06fb191a3ca7 ANDROID: dm: dm-user: New target that proxies BIOs to userspace
40391ed0f131 ANDROID: uapi: Add dm-user structure definition
62ec51519fa1 UPSTREAM: iommu: Add gfp parameter to iommu_ops::map
c9951e5d80dd Merge 5.4.88 into android12-5.4
f3a4c8d50145 Linux 5.4.88
...
Bug: 158821916
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ia4c7c64c134ce8a021119fbb2dec209a2dcc57f1
|
|
9c66f145f5 am: 933ba4f580 am: 246c82e579
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1551554
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1b4c753a860adc5cf3c28fb94868289f93acf4a
|
|
9c66f145f5 am: 933ba4f580
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1551554
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If57d19c978df02a7c0709552d3c8a2f08a6265f1
|
|
9c66f145f5
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1551554
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8565d52455388e3903320e76a3af201a8a0d085f
|
|
5df83be53767 Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.10' into meson-5.10
770b9654b0c6 YUKAWA: Disable CONFIG_RC_MAP
7cfc6861b888 ANDROID: iommu/dma: Add support for DMA_ATTR_SYS_CACHE_ONLY_NWA
0b653f27bba4 ANDROID: iommu/dma: Add support fo DMA_ATTR_SYS_CACHE_ONLY
261c5080bb87 ANDROID: arm64: Add support for system cache memory type
084fab46dd7c ANDROID: ftrace: vendor hook for ftrace dump on oops
8420cd4a8cf0 ANDROID: irqdesc: Export symbol for vendor modules
7eadb0006a9b Merge 5.10.7 into android12-5.10
...
Bug: 158821916
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ic1dd78f11cd5893ad231f10b1002654a31b4e8cb
|
|
609e2f8a59 am: 0bcbeb389f am: 4570ce1b48
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1549743
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c1b80feab66266c67031f770198b6dc229d1b88
|
|
609e2f8a59 am: 0bcbeb389f
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1549743
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8869337ceb07d17c4311f73773af770a2eca0670
|
|
609e2f8a59
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1549743
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I18ea38069844811a8f0104d7f9a4d6b961df8839
|
|
528e2b02c5d3 YUKAWA: Disable CONFIG_RC_MAP
27ebb73641cc Merge remote-tracking branch 'hikey-aosp/mirror-android-4.19-stable' into meson-4.19
6084ca221033 Merge changes I8ed6c515,I58d7415d into android-amlogic-bmeson-4.19
0856e25f44b9 ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for aarch64
8e482856b5b9 Revert "ANDROID: arm64: lse: fix LSE atomics with LTO"
1817b1966de7 ANDROID: uapi: Add dm-user structure definition
1caf05ce9038 ANDROID: dm: dm-user: New target that proxies BIOs to userspace
d547cb391b7a ANDROID: GKI: Enable XFRM_MIGRATE
f0eb67744ba6 Merge 4.19.166 into android-4.19-stable
610bdbf6a174 Linux 4.19.166
...
Bug: 158821916
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ic673015cf1e86402add3f5eabb9e0d62f385dbde
|
|
3604a40dfb
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1533620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a9194abf2fa24629208b80ecc25de9e5e6f2736
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1533620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I824a8a7f8ecf2cc629ca96ea3002255e1199dcd8
|
|
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1533620
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5422ba32dbfb1ca4ca955dabc1d7440f4879f993
|
|
|
|
f28acb05116c YUKAWA: Fix version field cutting
ea42c9c8c896 Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.10' into android-amlogic-bmeson-5.10
7bce37ec80d2 ANDROID: Disable dynamic ftrace for allmodconfig builds
Bug: 175624526
Test: make TARGET_KERNEL_USE=5.10 -j24
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: I9b6a9138f48d70c9f7912afed48a397ac38c945e
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/13111967
Change-Id: Iedbfffb1448d9a206a5c8debf0f9b99775068654
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/13111967
Change-Id: I7ba5ba3b4d585f36cece6d77f46fe4983abe66cd
|
|
Bug: 172690556
Change-Id: Ic8ab41ccb9900840f1f7b844221696e3ec8abd81
|
|
CONFIG_RT_GROUP_SCHED am: 0e27bf119a am: c8753d8db3 am: d223233b5a am: 62ab4b033f
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503796
Change-Id: I8a899598dd51d44a1df8781b64e3c6e99361cb73
|
|
CONFIG_RT_GROUP_SCHED am: 460d9c17f3 am: 789dfd0c53 am: 4f7d0d426a am: add64ec6ef
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503795
Change-Id: Ifcadc46a48ca529b85fecc5c3eb70da24463fdfd
|
|
CONFIG_RT_GROUP_SCHED am: 0e27bf119a am: c8753d8db3 am: d223233b5a
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503796
Change-Id: I930998fb492ee765a15c48578ca1e9a9b68b58d4
|
|
CONFIG_RT_GROUP_SCHED am: 460d9c17f3 am: 789dfd0c53 am: 4f7d0d426a
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503795
Change-Id: I3380fc1a0561e509bf67a0a47123222385578c32
|
|
CONFIG_RT_GROUP_SCHED am: 0e27bf119a am: c8753d8db3
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503796
Change-Id: Idf73a45c7b96f961957169bab43a5a9f677e407e
|
|
CONFIG_RT_GROUP_SCHED am: 460d9c17f3 am: 789dfd0c53
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503795
Change-Id: I5abf0d6f6ff8722c089310363a9884449ee5d636
|
|
CONFIG_RT_GROUP_SCHED am: 0e27bf119a
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503796
Change-Id: I761533f26874e5aeb3aefba6a3fe9eb9c3a031c8
|
|
CONFIG_RT_GROUP_SCHED am: 460d9c17f3
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1503795
Change-Id: Iaf1cf0c855af6a98fe009a2873fc1c073a190aa3
|
|
CONFIG_RT_GROUP_SCHED
f1ffb4ef9f2f YUKAWA: Remove CONFIG_RT_GROUP_SCHED=y
09ace7871e52 YUKAWA: Remove CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
53f91704fdd2 Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.4' into meson-5.4
59739294879a UPSTREAM: thermal/drivers/sprd: Fix return value of sprd_thm_probe()
5ec5f8c2e3c8 UPSTREAM: scsi: ufs: Fix interrupt error message for shared interrupts
83cf644fa322 UPSTREAM: scsi: ufs: Fix missing brace warning for old compilers
...
2544d06afd8d Linux 5.4.77
19f6d91bdad4 powercap: restrict energy meter to root access
...
Bug: 173637592
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ibb96428377aadd6de3b8bfca23d1ffa526f36968
|
|
CONFIG_RT_GROUP_SCHED
8f875fcf6f9d YUKAWA: Remove CONFIG_RT_GROUP_SCHED=y
d3b8c78f4757 Merge remote-tracking branch 'hikey-aosp/mirror-android-4.19-stable' into meson-4.19
7f0c07bea50d FROMGIT: Input: Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE
e028389dab57 ANDROID: arm64: Fix off-by-one vdso trampoline return value
4a1753307d32 ANDROID: Add dependencies of dm-user.ko
730887909d42 UPSTREAM: arm64: vdso: Add -fasynchronous-unwind-tables to cflags
...
31acccdc8774 Linux 4.19.157
900281e167f4 powercap: restrict energy meter to root access
...
Bug: 173637592
Test: Manual
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ic377b292dcd4c761485fcf6e332562ef0d55e7a2
|
|
fc049ed9b7 am: db576b27d5 am: ae12e8ebd9 am: 621e03cd15
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa-kernel/+/1489878
Change-Id: I67061b179a737dc8683e56a01c976bc9b882fa37
|