shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,055,432 Commits 55 Branches 2,486 Tags
48487cfbab468397107486809ad4dfd41785eca1
Commit Graph

1055432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Kroah-Hartman
48487cfbab Merge 43e1b12927 ("Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5e5952a486b20df66e03214d5828c7ed92f6e2c4
 2021-11-15 13:13:18 +01:00
Greg Kroah-Hartman
4b17c0982d Merge f083937247 ("virtio_blk: correct types for status handling") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iec7abbb246928e74ac8ccc47cdeaca4adace7de9
 2021-11-15 09:59:31 +01:00
Greg Kroah-Hartman
89952f5504 Merge ead65f7695 ("virtio_blk: allow 0 as num_request_queues") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I747a1c9969a407dae63926631299bea88e138331
 2021-11-15 09:59:19 +01:00
Greg Kroah-Hartman
a9d0d6f322 Merge dcce162559 ("i2c: virtio: Add support for zero-length requests") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I53578b96e0d3e89ba05244bb9a1fec2173bf755a
 2021-11-14 14:35:47 +01:00
Greg Kroah-Hartman
ecfe50b9c3 Merge 9e35276a53 ("virtio_pci: harden MSI-X interrupts") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1f7761cf3b6e783b38da3d6806bf50e9bc181924
 2021-11-14 12:49:19 +01:00
Greg Kroah-Hartman
1ad353f132 Merge 28962ec595 ("virtio_console: validate max_nr_ports before trying to use it") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I41a68beb0e435043975a501b238ce713a41b04c5
 2021-11-14 12:49:05 +01:00
Greg Kroah-Hartman
dd4e4c9daf Merge 6ae6ff6f6e ("virtio-blk: validate num_queues during probe") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I98ca89d9b71e4714220424db8de78d67b27de217
 2021-11-14 12:48:53 +01:00
Greg Kroah-Hartman
a91b6a777b Merge 601695aa8e ("ALSA: virtio: Replace zero-length array with flexible-array member") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I17a4d12cf0d8d19d7d5d7b44ce9dddaa68a7a514
 2021-11-14 12:48:34 +01:00
Greg Kroah-Hartman
42113b8cd0 Merge fc6d70f40b ("virtio_ring: check desc == NULL when using indirect with packed") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7196f49b7264d3f22de3b532aadf389daada8acd
 2021-11-13 19:11:43 +01:00
Greg Kroah-Hartman
67923a0609 Revert "ANDROID: virtio_blk: Remove BUG_ON for discard/zero ops" 
This reverts commit 187c494456.

This commit conflicts with other virtio_blk changes that are coming in
5.16-rc1 so needs to be reverted.  Also, if this really has been an
issue since the 4.20 kernel release (i.e. Feb 2017), and not resolved
yet, upstream should be told about it to resolve it as this has been a
long time.

Bug: 144592287
Cc: Satya Tangirala <satyat@google.com>
Cc: Alistair Delva <adelva@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I43339aad3704073d005d2fba91f159c68e099e97
 2021-11-13 16:04:34 +01:00
Greg Kroah-Hartman
f82ce01c0d Merge d4ec3d5535 ("Merge tag 'vfio-v5.16-rc1' of git://github.com/awilliam/linux-vfio") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieec4238686ae00d8689ab4f1bdaf3d2a9e30cfde
 2021-11-13 16:04:24 +01:00
Greg Kroah-Hartman
1b5e1a7fd9 Merge a602285ac1 ("Merge branch 'per_signal_struct_coredumps-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iadab704071e9cbf8deaacafd8ac8f5bd257ef2dc
 2021-11-13 16:03:47 +01:00
Greg Kroah-Hartman
3bbb661512 Merge 655fedaad3 ("Merge tag 'jfs-5.16' of git://github.com/kleikamp/linux-shaggy") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie9f09f93a3a4f2525e3000a8325d6e4dcdbe2cad
 2021-11-13 16:03:34 +01:00
Greg Kroah-Hartman
35dba11eb2 Merge e1fd0b2acd ("Merge tag 'trace-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic37fbe59e3b95af4d8f6e461fc31c9b0537eec11
 2021-11-13 16:03:09 +01:00
Greg Kroah-Hartman
9cb10a6ad2 Merge 25edbc383b ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8150cf259f18904501205a260249ea509b1863f8
 2021-11-13 16:02:15 +01:00
Greg Kroah-Hartman
53f47613b5 Merge ff0700f036 ("Merge tag 'sound-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound") into android-mainline 
Steps on the way to 5.16

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I23584f8838e4c7b4822baac7f807a4ed2ca955e7
 2021-11-13 16:00:35 +01:00
Greg Kroah-Hartman
0bc9a82c5f Revert "kbuild: Enable DT schema checks for %.dtb targets" 
This reverts commit 53182e81f4.

Right now it breaks the Android kernel build as libyaml needs to be
added to it, and an updated version of DTC also needs to be added to the
build system.

Until then, revert this change as we don't "need" to validate the yaml
at this point in time as we "trust" the files are good for now.

Cc: Rob Herring <robh@kernel.org>
Fixes: 53182e81f4 ("kbuild: Enable DT schema checks for %.dtb targets")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I72acd7d9a2475137c53d910d997e0c9b8f4fe905
 2021-11-13 15:58:38 +01:00
Greg Kroah-Hartman
7ebc9cfb38 Revert "of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings" 
This reverts commit b68d0924ad as it
breaks the build on clang-based systems with the errors:
	FATAL ERROR: Unrecognized check name "interrupt_map"
	FATAL ERROR: Unrecognized check name "node_name_vs_property_name"

Cc: Rob Herring <robh@kernel.org>
Fixes: b68d0924ad ("of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia90d9a1d73604f7f1cace2397fc97e3e35ce5b1c
 2021-11-13 15:58:09 +01:00
Greg Kroah-Hartman
1e5a1d093b Merge dcd68326d2 ("Merge tag 'devicetree-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I942a9a77b0f1da12e3e6577318643e1998d076c1
 2021-11-13 15:57:35 +01:00
Greg Kroah-Hartman
1cc0f16c01 Merge 624ad333d4 ("Merge tag 'docs-5.16' of git://git.lwn.net/linux") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I73d8bec65f45ab651aeab83ee60cc66dc36467e3
 2021-11-13 15:57:00 +01:00
Greg Kroah-Hartman
1d0a965dda Merge 313b6ffc8e ("Merge tag 'linux-kselftest-kunit-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I877a4703c8d622c753063158807acd4ad49f47bc
 2021-11-13 15:56:15 +01:00
Greg Kroah-Hartman
9602912266 Merge 84924e2e62 ("Merge tag 'linux-kselftest-next-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id08e6b2d2eb419c69a99d31cad114c69610f4115
 2021-11-13 15:55:40 +01:00
Greg Kroah-Hartman
6ff08305e3 Merge 6ab1d4839a ("Merge tag 'platform-drivers-x86-v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4c8077ac9b98672c29033f4f25dde588a12beb3b
 2021-11-13 15:54:24 +01:00
Greg Kroah-Hartman
e8a7240707 Revert "drm/virtio: implement context init: add virtio_gpu_fence_event" 
This reverts commit cd7f5ca335.

It causes a crash in cuttlefish when using the virtio gpu driver.

Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Nicholas Verne <nverne@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I57bfa710c6b750a5bf30806d0e2cabe3e4e42772
 2021-11-13 13:59:08 +01:00
Greg Kroah-Hartman
172272a5e9 Revert "drm/virtio: implement context init: advertise feature to userspace" 
This reverts commit 78aa20fa43.

It causes a crash in cuttlefish when using the virtio gpu driver.

Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Nicholas Verne <nverne@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icfeade9b434e2c5419b3fbb68e7327699bbdcb71
 2021-11-13 13:58:52 +01:00
Greg Kroah-Hartman
6a9c0ec079 Merge 56d3375448 ("Merge tag 'drm-next-2021-11-03' of git://anongit.freedesktop.org/drm/drm") into android-mainline 
Resolves conflicts in:
	drivers/gpu/drm/amd/display/include/dal_asic_id.h
	drivers/gpu/drm/i915/gem/i915_gem_context.c
	drivers/gpu/drm/i915/gt/intel_context.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5412a9d724fed352e2cc6448be33366ffd914dcc
 2021-11-13 13:54:40 +01:00
Greg Kroah-Hartman
18961dc80e Merge 8d6b006e1f ("drm/virtio: implement context init: handle VIRTGPU_CONTEXT_PARAM_POLL_RINGS_MASK") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6c5fe1217f02b296cd2dea61e3cb01d81a0c9c4e
 2021-11-13 10:57:11 +01:00
Greg Kroah-Hartman
750baf9344 Merge 85c83ea915 ("drm/virtio: implement context init: allocate an array of fence contexts") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id009a39fa4dba2115b4d506a79d4736b30e9421d
 2021-11-13 10:56:59 +01:00
Greg Kroah-Hartman
883bdbc806 Merge bbf588d7d4 ("drm/virtio: implement context init: stop using drv->context when creating fence") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia14e99d24bd73a87e08d5a2fd4d02d1d47253632
 2021-11-13 10:56:46 +01:00
Greg Kroah-Hartman
81c3ff65d9 Merge e8b6e76f69 ("drm/virtio: implement context init: plumb {base_fence_ctx, ring_idx} to virtio_gpu_fence_alloc") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie2d64ec13e010ec299691c5cced57bc2c86ac6ce
 2021-11-13 10:55:27 +01:00
Greg Kroah-Hartman
2f202c511e Merge 7547675b84 ("drm/virtio: implement context init: track {ring_idx, emit_fence_info} in virtio_gpu_fence") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I83d7b644af5240abdc4ea64f36a6cb03d101f984
 2021-11-13 10:55:17 +01:00
Greg Kroah-Hartman
e44056eb93 Merge 4fb530e5ca ("drm/virtio: implement context init: support init ioctl") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I91136c78cd6b88888b1489fa535c270b6549d609
 2021-11-13 10:55:00 +01:00
Greg Kroah-Hartman
55dbdc9f5f Merge 6198770a1f ("drm/virtio: implement context init: probe for feature") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic2d581757dd8095f695e97f7a3deb782901edcdf
 2021-11-13 10:54:49 +01:00
Greg Kroah-Hartman
b6ceee1c4a Merge 1925d6a7e0 ("drm/virtio: implement context init: track valid capabilities in a mask") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4b353dde9c1cc95a301151252d28cebf56ad8d11
 2021-11-13 10:54:05 +01:00
Greg Kroah-Hartman
11e26f35d5 Merge b10790434c ("drm/virtgpu api: create context init feature") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id8b3e1de1676acf32efe195d6ef6abcee98eca30
 2021-11-13 10:53:54 +01:00
Greg Kroah-Hartman
a6a5f22f4e Merge 34268c9dde ("virtio-gpu api: multiple context types with explicit initialization") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I183528a32f487f12a67921a78cef714e73181f9f
 2021-11-13 10:53:43 +01:00
Greg Kroah-Hartman
3adfa875e7 Merge 93ee1a2c0f ("drm/panel: support for BOE and INX video mode panel") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6f6bb61e77650dd8f502561509677b5a8d6b7eb8
 2021-11-12 16:51:11 +01:00
Greg Kroah-Hartman
a64581c762 Merge 18c58153b8 ("drm/panel: boe-tv101wum-nl6: Support enabling a 3.3V rail") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6adfd8c512cd12c2d29def8e2d1259dd84c34dd8
 2021-11-12 16:50:45 +01:00
Greg Kroah-Hartman
f1332888c8 Merge 7d1be0a09f ("drm/edid: Fix EDID quirk compile error on older compilers") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3cfb91483c45a9e1283b8df340f2814912566398
 2021-11-12 16:35:26 +01:00
Greg Kroah-Hartman
f5d20c421a Merge dfbc6cb60b ("drm/gma500: Managed device release") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibb9f830a3b84c48b41837f4d20cf0eb70f45b62b
 2021-11-12 16:32:05 +01:00
Greg Kroah-Hartman
b576d70a93 Merge b1f8166640 ("Merge tag 'amd-drm-next-5.16-2021-10-08' of https://gitlab.freedesktop.org/agd5f/linux into drm-next") into android-mainline 
Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I95680ac70bd89c984688d1ff3fdf6412d3da7555
 2021-11-12 11:49:25 +01:00
Greg Kroah-Hartman
bb460c08a1 Merge 407baae3e6 ("Merge tag 'du-next-20211007' of git://linuxtv.org/pinchartl/media into drm-next") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1572877963a415ce8408de83d21305f21920982d
 2021-11-12 11:47:24 +01:00
Greg Kroah-Hartman
0446bed2ec Merge 1e3944578b ("Merge tag 'amd-drm-next-5.16-2021-09-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next") into android-mainline 
Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c
	drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic8a3f6d258cd8530850b5789290bf030924ed15e
 2021-11-12 11:46:40 +01:00
Greg Kroah-Hartman
c8096b12e4 Merge f602a96e02 ("Merge tag 'drm-misc-next-2021-09-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5e6504a75ecdc5b7d524fd6b1c95e74b43fc3a9e
 2021-11-12 11:18:50 +01:00
Greg Kroah-Hartman
e464be96e3 Merge 0dfc70818a ("Merge tag 'drm-misc-next-2021-09-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I272d0d7715f18a76620785eb5f2ec0591cd07a6c
 2021-11-12 11:18:26 +01:00
John Stultz
02dbd8a73f ANDROID: db845c_gki.fragment: Enable QCOM_SPMI_ADC5_TM5, QCOM_CPR and QCOM_SPM 
Enable a few config options that help performance with
5.16-rc kernels.

Bug: 146449535
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I1b83a8f69ab7f9760cd3fcd162be2e6b18f0db78
 2021-11-12 04:05:02 +00:00
Greg Kroah-Hartman
41fcee3a2b Merge d5dd580deb ("Merge drm/drm-next into drm-intel-gt-next") into android-mainline 
Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/gpu/drm/i915/gem/i915_gem_context.c
	drivers/gpu/drm/i915/gt/intel_rps.c
	drivers/gpu/drm/i915/i915_trace.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id4d5f1398e96f280d3455cc2e2af61786959bde5
 2021-11-11 15:26:33 +01:00
Greg Kroah-Hartman
b7b59711c2 Merge 2f76520561 ("Merge drm/drm-next into drm-misc-next") into android-mainline 
Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/gpu/drm/drm_panel_orientation_quirks.c
	drivers/gpu/drm/msm/msm_gem_submit.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c61ce473ae764ab79c2dd5923aab8886fbbcc0a
 2021-11-11 14:42:41 +01:00
Greg Kroah-Hartman
6904105a3f Merge 08994edbb8 ("Merge tag 'drm-misc-intel-oob-hotplug-v1' of git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux into drm-misc-next") into android-mainline 
Steps on the way to 5.16-rc1

Resolves conflicts in:
	drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
	drivers/gpu/drm/drm_panel_orientation_quirks.c
	drivers/gpu/drm/i915/gem/i915_gem_ttm.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iaae62240e81569925b6bb6c11f08c07abd2ecd52
 2021-11-11 14:24:24 +01:00
Greg Kroah-Hartman
b57a50c79d Merge d1b803f4ca ("Merge drm/drm-next into drm-intel-next") into android-mainline 
Steps on the way to 5.16-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I80ee3d85d9cc001253ea4a759885ed2299989f18
 2021-11-11 08:51:28 +01:00