blob: 0d45362d4b70e89c3749612ca9995f0a4bd95e3b [file] [log] [blame]
<?xml version="1.0" encoding="utf-8"?><manifest revision="e3ca07118b0748064ef87e78fff28dd6863a7fc8">
<notice>Your sources have been sync'd successfully.</notice>
<remote fetch="https://android.googlesource.com" name="aosp" review="https://android-review.googlesource.com"/>
<remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/>
<remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/>
<default remote="cros" revision="refs/heads/master" sync-j="8"/>
<project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="7574c671c7c64aab957dc507fffff3c8c38dc7cb" upstream="refs/heads/master"/>
<project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="62b7538a31c4c5a88dcd2ef4d8a60a783ec6b6f7" upstream="refs/heads/master"/>
<project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="8263a04a1e4e6e40ed479f62ac529874eb7675ef" upstream="refs/heads/master"/>
<project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/>
<project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="5f43fb626cf8bba55580bc8781beb6234444366c" upstream="refs/heads/master"/>
<project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="88dc9bec810eb7b88c17d8f56910b1f2ae3ce32a" upstream="refs/heads/master"/>
<project name="aosp/platform/system/core/libsync" path="src/aosp/system/libsync" revision="f4f4387b6bf2387efbcfd1453af4892e8982faf6" upstream="refs/heads/master"/>
<project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/>
<project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="38a7897b6f80bc4eee68ddfba499fec95218e217" upstream="refs/heads/master"/>
<project groups="devserver" name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="efa62d959cf8f225477ab85d8ff42d5150007cf8" upstream="refs/heads/master"/>
<project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="62ca9ee8ca421cb565fd4a05390f455c5fcefd17" upstream="refs/heads/master"/>
<project name="apps/libapps" path="src/third_party/libapps" revision="b73450642cdac98a0125825020c26a14a8a5cd3c" upstream="refs/heads/master">
<annotation name="branch-mode" value="pin"/>
</project>
<project groups="minilayout,buildtools,labtools" name="chromium/buildtools" path="chromium/src/buildtools" remote="chromium" revision="505de88083136eefd056e5ee4ca0f01fe9b33de8" upstream="refs/heads/master"/>
<project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="a9c7333ec45588e0e6c2a26d21a8a474df1f53b6" upstream="refs/heads/master"/>
<project groups="minilayout,buildtools,labtools" name="chromium/llvm-project/cfe/tools/clang-format" path="chromium/src/buildtools/clang_format/script" remote="chromium" revision="35c8ff09ec3f3b08fe3d0a8e057682291bf527d7" upstream="refs/heads/master"/>
<project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/>
<project name="chromium/src/tools/md_browser" remote="chromium" revision="e9462696241f3ca832890473173e03e7bcfe6adc" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="bfc4082f431375a49de0a5a18fd0e6685715426f"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="fcc696f77fd113b5ba0f7fee99c9ac14bd4ae2f8" upstream="refs/heads/master">
<copyfile dest="AUTHORS" src="AUTHORS"/>
<copyfile dest="LICENSE" src="LICENSE"/>
</project>
<project name="chromiumos/docs" path="docs" revision="deee88d6c4abac0e871a542a1f2a595ab7c131cc" upstream="refs/heads/master"/>
<project name="chromiumos/graphyte" path="src/platform/graphyte" revision="cab8671dc9437e8e6c79914c7c454d59bee21b76" upstream="refs/heads/master"/>
<project name="chromiumos/infra/bad_cl_detector" path="infra/bad_cl_detector" revision="ca87674837a3fbda5f9620f070def6403cf6dfc4" upstream="refs/heads/master"/>
<project groups="chromeos-admin" name="chromiumos/infra/ci_results_archiver" path="infra/ci_results_archiver" revision="dd5cfd07e7802fcac79c20afd66ddb3d0d9316d0" upstream="refs/heads/master"/>
<project name="chromiumos/infra/cl_exonerator" path="infra/cl_exonerator" revision="7cff97f8ee5d6474eec78803d4245b4e9f24b7c4" upstream="refs/heads/master"/>
<project name="chromiumos/infra/cl_status_viewer" path="infra/cl_status_viewer" revision="58d78a900e6e1b69a76d996ce1fd4e8312edee70" upstream="refs/heads/master"/>
<project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="2d1aa33972b2028d19a288baaacee9b2cd8644f7" upstream="refs/heads/master"/>
<project name="chromiumos/infra/dummies/general-sandbox" path="infra/dummies/general-sandbox" revision="e996a748f373f1941209c29126f541f1fe1adddd" upstream="refs/heads/master"/>
<project name="chromiumos/infra/dummies/merge-sandbox" path="infra/dummies/merge-sandbox" revision="bdf1aa83e4b1a3555016b80b1416ed1e467b79af" upstream="refs/heads/master"/>
<project name="chromiumos/infra/lucifer" path="infra/lucifer" revision="e2f0e880ec83b82272aab92de2abb723e58467a4" upstream="refs/heads/master"/>
<project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="69a5e7843070a9b32ee496ba96fe3a7455026b0d" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="59c985f74effd99f7dac76742b074ac9da076641" upstream="refs/heads/master"/>
<project name="chromiumos/manifest" path="manifest" revision="91987ae9740dda9ea5c3b4b24b425fa165f14caa" upstream="refs/heads/master"/>
<project groups="minilayout,firmware" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="b02e0aee20b45911b2a78bb5c90cb3ec080f54b5" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="0d05db15637a5ce23526c745907b51b62507f24a" sync-c="true" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="7d909c89b4178ca17bf091ed3dd738f2207cf626" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="5b5d232abecf56a8dea4dff9f9c093931200abed" upstream="refs/heads/master"/>
<project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="aa330f295b4c58ea7510bc0af9c2f8ceea88fbc9" upstream="refs/heads/master"/>
<project name="chromiumos/platform/assets" path="src/platform/assets" revision="be1fbb45ad4d2b62665a0980637ea9730dd64b75" upstream="refs/heads/master"/>
<project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="2587466256247b091d032e56b7ccff72fe1b9b2e" upstream="refs/heads/master"/>
<project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="32463c6de8e8c98d4b1711937bc7678afc121a85" upstream="refs/heads/master"/>
<project name="chromiumos/platform/bisect-kit" path="src/platform/bisect-kit" revision="ab694e685f55753b8dc7a9a9431c0fe77567ded7" upstream="refs/heads/master"/>
<project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="baa18f2e374d003d0d6ce9a0dfa129ae0bf746df" upstream="refs/heads/master"/>
<project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/>
<project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="300354e5d74418c8e03737ca9029c64d9297a28d" upstream="refs/heads/master"/>
<project name="chromiumos/platform/cfm-device-monitor" path="src/platform/cfm-device-monitor" revision="1b8aaa412109299d178536411989d7226e940e8e" upstream="refs/heads/master"/>
<project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="577907b08b3e9fd8f576b246a13376051c21448c" upstream="refs/heads/master"/>
<project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="c72f1bc16319ebd970ad277e76ef10d0b4663461" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="eea4fed5c97f487b57204d33c12dba2b1a5cf42f" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="0197a13d2edfb660fa5cbe6fcafad3096698f8b5" upstream="refs/heads/master"/>
<project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="fedb675ed52b8e54f78d80b9938c98746e888b37" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="e1c2f63cad8403d1f6e252c89ec4af95e778867d" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="fe15babfdffbadc19d66ea0c3294b8ce8df5afc0" upstream="refs/heads/master"/>
<project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="0a59878032d4bda0c4a7c13b2086c59283df63f1" upstream="refs/heads/master"/>
<project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="4268fcac40e0504a9188b345b4e768282b48804e" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/ec" path="src/platform/ec" revision="f326fb05b564b0975a9870b2831f9372539202db" upstream="refs/heads/master"/>
<project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="0c9b56092424c370eff748b25d49caceb9a18dab" upstream="refs/heads/master"/>
<project name="chromiumos/platform/factory" path="src/platform/factory" revision="d5b78e9ac54892d3364a22dcf04f06cd32454dab" upstream="refs/heads/master"/>
<project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="944089c95c3e0340efeb77c9c1b06e543478a4bc" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/firmware" path="src/platform/firmware" revision="437624395f6c91562201b41958615f6afdf016cc" upstream="refs/heads/master"/>
<project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="bb60557e05f4da64363bddb43db68b50793bdc58" upstream="refs/heads/master"/>
<project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5b0e635711c7409b2413a3d702afe7e83abb8a36" upstream="refs/heads/master"/>
<project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="613458c0e3c589e52e7f093288ef1d2ba57a9ff7" upstream="refs/heads/master"/>
<project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="70914b2d380d893364ad0110b8af18ba1ed5aaa3" upstream="refs/heads/master"/>
<project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="1c3fbed9123c081c73b1bc97f755ccf7a753b74d" upstream="refs/heads/master"/>
<project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="679bd52ef414fdcd1b9a01081498a66eb1388c81" upstream="refs/heads/master"/>
<project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/>
<project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/>
<project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/>
<project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="ca2938a5c681e42a344f7237430726aa17ff1126" upstream="refs/heads/master"/>
<project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="dca599879cab0dba8ed32ef3a5d1b82e26524732" upstream="refs/heads/master"/>
<project name="chromiumos/platform/monitor_reconfig" path="src/platform/monitor_reconfig" revision="f022d19d84f232290b596beeb26347f62442e7eb" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="2da4d03a7fcfa398a5278d2f5260ebbfbd1223a1" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="ec50966c1cdb7cc2114f08217c541ea6f1405720" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mtplot" path="src/platform/mtplot" revision="5e4f631e633384751f582bd9db5f4d6eb2112494" upstream="refs/heads/master"/>
<project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="97d6b3b0c32595b75b053047f02f7789ea8cfe03" upstream="refs/heads/master"/>
<project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="cac3fc97a21939021a9f0bad63ec896c891fc842" upstream="refs/heads/master"/>
<project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="91e526c65025e5d4a1bb3261def554c32d4a309a" upstream="refs/heads/master"/>
<project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="c050715684a5dde3a4fc818f3de816a407fdb2de" upstream="refs/heads/master"/>
<project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="e46ef54fea48ba00948f829e1335d28e3a5c9fda" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tast" path="src/platform/tast" revision="847704e41648fe500f1c874c99c7401d001fffe1" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tast-tests" path="src/platform/tast-tests" revision="d7953e107cda521b77285906d2b14496f7d9dc9f" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="f2ee184d8e1db088d88527830804164450171f6f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="11f37dbb25ae9e7383d5737130c75a07af92241f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="9546ffbb37d5fef191ad1607eeb0b76a6f3a9872" upstream="refs/heads/master"/>
<project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="bc2c1d69e9d2649633548856ed2c0fe75d8c015e" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/>
<project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/>
<project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/>
<project groups="firmware,buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="085759742ead585a4be3e13119d954e08babe889" upstream="refs/heads/master"/>
<project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="437a6375c95a60f85725d4e11b6fd385001418f5" upstream="refs/heads/master"/>
<project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/>
<project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/>
<project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="f17f5863b6a5b2b2d58251174ab05d1938a8a609" upstream="refs/heads/master"/>
<project name="chromiumos/platform2" path="src/platform2" revision="36ca89db0bcb33229aa71e530612bf43f949c6e1" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="cd134513b44b0fa21fd4d3cdbf8fe6cac82f0b0c" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="0eaa493e9646da465482e3a3d62d7f23c36d5984" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/android_mtdutils" path="src/third_party/android_mtdutils" revision="9bcfc3ee238f16925e9aaa4573129784ebb397e7" upstream="chromeos"/>
<project name="chromiumos/third_party/arm-trusted-firmware" path="src/third_party/arm-trusted-firmware" revision="f18f5f9867551d0d21da79e25371a298933aaff1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="d38fdfa9aa0dfec43eab9165069d7c10cbd8c24f" upstream="refs/heads/master"/>
<project groups="buildtools,labtools,devserver,wmatrix" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="4750f0dc956001cc2e181256583d57146b5aa22e" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="043fc0d8065dd8ed8e66364ed6c3ddd261887b7f" upstream="refs/heads/chromeos-5.44"/>
<project groups="firmware" name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="9ba019061f3fb0a54c30334e2c7c9c3c96dc7880" upstream="refs/heads/chromeos-2016.05"/>
<project groups="firmware" name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="a3576d16e98a2e0760eb97771062ae5e931e748e" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="96d9e30fdfb7ab8b0cdc44228359dd0c08d59946" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="ccb37a514aa1d0ea1604dbc9ad290491a1e65832" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160">
<annotation name="branch-mode" value="pin"/>
</project>
<project groups="firmware" name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="ab586ccd21556108662fbd80ab5a429143eac264" upstream="refs/heads/chromeos-2017.08"/>
<project groups="firmware" name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="9108393752ffd93b133037add1f7b484de09bdbc" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="c75cea9401a365fab0660dde36be5b789870011b" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/>
<project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="324dd26ea0bab2d25b623ea64b60e1d140d25cbf" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="d874ae9a32c62a0eedfd28a59c79f99cf0a4429a" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant-2.6" revision="bcae50b5da9a5bb77546cb76c6af1d334ab102f1" upstream="refs/heads/wpa_supplicant-2.6"/>
<project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="b61756522807af0acd68e924949d12189e372d99" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="bf4ac7070b4ae6409b6bd80c8ea4cb8943fd33c2" upstream="refs/heads/chromeos-3.8"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="9a55dc6e6d3a8bda2172efc93adfb6554f04f5cf" upstream="refs/heads/chromeos-3.10"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="05358e35cffa3e9117e692f1f4bd8f1c7654ff6a" upstream="refs/heads/chromeos-3.14"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="623b2e9f0fa2677dad61f7f33abef5d1e9a3a82b" upstream="refs/heads/chromeos-3.18"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="9af7a2d45a08d7ff8f87ff6cc5ad6bb000adb031" upstream="refs/heads/chromeos-4.4"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.12" revision="31f62751c3c255f832f3b7917d853b2e51b47151" upstream="refs/heads/chromeos-4.12"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.14" revision="d6805485c59bd78968d79189939386e60f6dc4ad" upstream="refs/heads/chromeos-4.14"/>
<project name="chromiumos/third_party/kernel" path="src/third_party/kernel/experimental" revision="1377d546a22b42c07a25445cceee4b8eab284359" upstream="refs/heads/next/chromeos-experimental"/>
<project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="1b159b990afd33c0c2e3b47ebda6dd5cc793dd92" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="697fb9624fb569fd6126a571d9bd3ab5d87737c1" upstream="refs/heads/chromeos-2.4.87"/>
<project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="fef68978614b58681625799ceac6f4cd19cd3728" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="475ac2811c0f2e5e6bf139fe71ebb44c39cbac5f" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libresample" path="src/third_party/libresample" revision="cc9f20f439396b7d45e94b8301edd95d33f26a46" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="b45c53f9418a6eff2c8ed98703a55f96029304b1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="199fe31115c76231746f5953271795d58679561c" upstream="refs/heads/chromeos"/>
<project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="c9edfa218e5a5972531b6f4a3ece8d33a44ae1b5" upstream="refs/heads/chromeos"/>
<project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="3279c2825684c7009775b731d0a9e37815778282" upstream="refs/heads/chromeos"/>
<project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="cfb9e18bc09d70e46ea8be34510729c005ec6906" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="bfbb3cc329f3f8d38a8365891fb3ca04047d698d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/logitech-updater" path="src/third_party/logitech-updater" revision="905d590f327e44723e8ce47c62b6d7ae0db5955a" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/>
<project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="86257c9ca722720a68e6db7bb483c408e60fa6d2" upstream="refs/heads/arc-17.2.0-pre1"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="34838c221260f961140040416b1a84b490448ac1" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/>
<project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="5510cc6d670760d4815a45517705adc81ca672c5" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="744acb7c4d82ed5fba6f0416c7ac5588217f4113" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="165395bf01548d8a0135357ca4c222b9c0c0acaa" upstream="refs/heads/V2.3-stable"/>
<project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="a9fc54d636fc3e5b5f0918769a2e5343c5f0d823" upstream="refs/heads/V1.3.3-cros"/>
<project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="dd8ad7251ab85091ebcac11b721eb82e21d82256" upstream="refs/heads/chromeos-2.2.12"/>
<project groups="minilayout,firmware,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/>
<project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="fc570685c1ca4acb871c706a66d0493b5e92c7c9" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/>
<project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="64388ca12cbec5ad5c0c6c6fec7a670dfdaedf82" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="411bfbd54e5eea784596ef6622010d37483d8058" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="2e0ad05834bfc3ce47e97af06f36d0e6a1fb7957" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/>
<project groups="firmware" name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="0f114d2d7eb1950faab02fe479864da5e5d50414" upstream="refs/heads/master"/>
<project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="55ee15ea1d06c90d8ab5dc1f0fd3884999e229aa" upstream="refs/heads/master-0.3.13"/>
<project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="1e26ac220258662e911d2471a090c9219566fffe" upstream="refs/heads/chromeos-v2017.05"/>
<project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="23d97f8348d640504a58ddf40e9c0ef211be6f1b" upstream="refs/heads/chromeos-v2015.07-rc1"/>
<project groups="wmatrix" name="chromiumos/third_party/whining" path="src/third_party/whining" revision="ce6b2ba21ec94dc98c6bcedca733fbfae4358d47" upstream="refs/heads/master"/>
<project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="80ec2dd71cebbfea069678f97b9c34e3286e9fb1" upstream="refs/heads/master"/>
<project groups="minilayout,firmware,buildtools,chromeos-admin" name="external/swarming.client" path="chromite/third_party/swarming.client" remote="chromium" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/>
<project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="e6527b0cd469e3ff5764785dadcb39bf7d787154"/>
<project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="e22128bb9349635f47c7407a67c2bb566100473c" upstream="refs/heads/master"/>
<project name="platform/external/libcxx" path="src/aosp/external/libcxx" remote="aosp" revision="ba19c01cab035056f9a27459d908d73f9992f985" upstream="refs/heads/master"/>
<project name="platform/external/libcxxabi" path="src/aosp/external/libcxxabi" remote="aosp" revision="aa42493d878601250c3bfe1cb69875fc0b6cb7e3" upstream="refs/heads/master"/>
<project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="9ece443079fc9a39061f733a021133f527856ceb" upstream="refs/heads/master"/>
<project name="platform/external/libunwind_llvm" path="src/aosp/external/libunwind_llvm" remote="aosp" revision="98b55b853bbb34882b915366afe1012091b614a8" upstream="refs/heads/master"/>
<project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="960b56b84bc74cf5f9bc64cd97dce92453ea1a5a" upstream="refs/heads/master"/>
<project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="53dd00a1a34ebf5251f6210d778768b4157c5e11"/>
<project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="0c5a656a1322e137fa4a251f2ccc6c4022918c0a"/>
<project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/>
<repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/>
<pending_commit branch="chromeos-4.4" change_id="Ic6ba055907a51f45333e2a396e8222122032630d" commit="39dd6bf1287928fd550baf83a1c469cc0ccdb70a" commit_message="BACKPORT: drm: bridge: Link encoder and bridge in core code Instead of linking encoders and bridges in every driver (and getting it wrong half of the time, as many drivers forget to set the drm_bridge encoder pointer), do so in core code. The drm_bridge_attach() function needs the encoder and optional previous bridge to perform that task, update all the callers. Signed-off-by: Laurent Pinchart &lt;laurent.pinchart+renesas@ideasonboard.com&gt; Acked-by: Stefan Agner &lt;stefan@agner.ch&gt; # For DCU Acked-by: Boris Brezillon &lt;boris.brezillon@free-electrons.com&gt; # For atmel-hlcdc Acked-by: Vincent Abriou &lt;vincent.abriou@st.com&gt; # For STI Acked-by: Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt; # For sun4i Acked-by: Xinliang Liu &lt;z.liuxinliang@hisilicon.com&gt; # For hisilicon Acked-by: Jyri Sarha &lt;jsarha@ti.com&gt; # For tilcdc Reviewed-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: http://patchwork.freedesktop.org/patch/msgid/1481709550-29226-4-git-send-email-laurent.pinchart+renesas@ideasonboard.com (cherry picked from commit 3bb80f249525c059572d4bc89ac77ac2e511bcbe) [Conflicts: Missing files from post-4.4: drivers/gpu/drm/arc/arcpgu_hdmi.c drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c drivers/gpu/drm/imx/imx-ldb.c drivers/gpu/drm/imx/parallel-display.c drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c drivers/gpu/drm/sun4i/sun4i_rgb.c drivers/gpu/drm/tilcdc/tilcdc_external.c No drm_bridge_attach() in drivers/gpu/drm/drm_simple_kms_helper.c (missing commit 315486c66533 (&quot;drm: simple_kms_helper: add support for bridges&quot;)) ] BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: Ic6ba055907a51f45333e2a396e8222122032630d Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannnorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/760447 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="5" gerrit_number="760447" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/760447/4" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I8ee4e8209fe18a0fa02d9d60ff7ebb6a17a4182f" commit="a3f36d9c43687a7b7086475d7a6af444ecb39fa8" commit_message="BACKPORT: drm: drop extern from function decls It's the default storage class for functions, entirely redundant. And a lot of these headers are a bit inconsistent due to organically grown. Reviewed-by: Gabriel Krisman Bertazi &lt;krisman@collabora.co.uk&gt; Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Link: http://patchwork.freedesktop.org/patch/msgid/20170322083617.13361-2-daniel.vetter@ffwll.ch Conflicts: include/drm/drm_crtc_helper.h [haven't removed drm_helper_probe_single_connector_modes_nomerge() or drm_kms_helper_poll_enable_locked() yet, so dropped 'extern' from them too] include/drm/drm_drv.h (missing in 4.4) include/drm/drm_of.h [4.4 doesn't have drm_of_component_match_add()] include/drm/drm_pci.h (missing in 4.4) include/drm/drm_plane.h [drm_universal_plane_init() __printf args moved upstream] include/drm/drm_prime.h (missing in 4.4) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I8ee4e8209fe18a0fa02d9d60ff7ebb6a17a4182f Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/760448 " fail_count="8" gerrit_number="760448" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/760448/5" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Iacffeb63e7210c988147bb4b330fef789da6c969" commit="0702efe106d7bb9f59e5485542cac519fc1f22c6" commit_message="BACKPORT/FIXUP: of: introduce of_graph_get_remote_node The OF graph API leaves too much of the graph walking to clients when in many cases the driver doesn't care about accessing the port or endpoint nodes. The drivers typically just want the device connected via a particular graph connection. of_graph_get_remote_node provides this functionality. Signed-off-by: Rob Herring &lt;robh@kernel.org&gt; Acked-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt; (cherry picked from commit b85ad494098bf881c3713218fbd74193e5d5c488) Conflicts: drivers/of/base.c of_graph_get_remote_node() are moved into driver/of/property.c [http://crosreview.com/693675 added most of the code from this CL accidentally when porting to property.c] BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: Iacffeb63e7210c988147bb4b330fef789da6c969 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/760449 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="760449" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/760449/7" remote="cros" total_fail_count="11"/><pending_commit branch="chromeos-4.4" change_id="Idd8ea3d281dfb32f6ca50fc2403c7b8e61f9188f" commit="8faae18abd9e68d8d29d302340c5229fc2e18778" commit_message="UPSTREAM: drm: of: introduce drm_of_find_panel_or_bridge Many drivers have a common pattern of searching the OF graph for either an attached panel or bridge and then finding the DRM struct for the panel or bridge. Also, most drivers need to handle deferred probing when the DRM device is not yet instantiated. Create a common function, drm_of_find_panel_or_bridge, to find the connected node and the associated DRM panel or bridge device. Signed-off-by: Rob Herring &lt;robh@kernel.org&gt; Acked-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt; [seanpaul dropped extern from drm_of.h] Signed-off-by: Sean Paul &lt;seanpaul@chromium.org&gt; (cherry picked from commit 1f2db3034c9f16ed918e34809167546f21d0fcb4) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: Idd8ea3d281dfb32f6ca50fc2403c7b8e61f9188f Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/760450 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; Reviewed-by: Matthias Kaehlcke &lt;mka@chromium.org&gt; " fail_count="8" gerrit_number="760450" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/760450/6" remote="cros" total_fail_count="11"/><pending_commit branch="chromeos-4.4" change_id="Ib3850778ee8ee43b065e0aec152cc29ed14c1af1" commit="ca2e6a0a76b32a2d85fb9d770bf456664fb7edec" commit_message="UPSTREAM: drm/doc: Add KMS overview graphs Oh, the shiny and pretties! v2: Review from Laurent. Cc: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Acked-by: Eric Anholt &lt;eric@anholt.net&gt; Reviewed-by: Gabriel Krisman Bertazi &lt;krisman@collabora.co.uk&gt; Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Signed-off-by: Daniel Vetter &lt;daniel.vetter@intel.com&gt; Link: http://patchwork.freedesktop.org/patch/msgid/20170302151638.1882-3-daniel.vetter@ffwll.ch (cherry picked from commit 2564d0b043cbe9d762f97104029281102cfe4be2) BUG=b:65001779 TEST=none Change-Id: Ib3850778ee8ee43b065e0aec152cc29ed14c1af1 Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/786392 " fail_count="8" gerrit_number="786392" owner_email="briannorris@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/92/786392/2" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I28a12b7a31926a8016f5a4fc1409bad7ef12254d" commit="342d5d6ec99c6423509fbaed195742e0914860b3" commit_message="BACKPORT: drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge. Many DRM drivers have common code to make a stub connector implementation that wraps a drm_panel. By wrapping the panel in a DRM bridge, all of the connector code (including calls during encoder enable/disable) goes away. v2: Fix build with CONFIG_DRM=m, drop &quot;dev&quot; argument that should just be the panel's dev, move kerneldoc up a level and document _remove(). v3: Fix another breakage with CONFIG_DRM=m, fix breakage with CONFIG_OF=n, move protos under CONFIG_DRM_PANEL_BRIDGE, wrap a line. Signed-off-by: Eric Anholt &lt;eric@anholt.net&gt; Acked-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; (v1) Reviewed-by: Boris Brezillon &lt;boris.brezillon@free-electrons.com&gt; (v2) Acked-by: Archit Taneja &lt;architt@codeaurora.org&gt; (v2) Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: http://patchwork.freedesktop.org/patch/msgid/20170602202514.11900-1-eric@anholt.net (cherry picked from commit 13dfc0540a575b47b2d640b093ac16e9e09474f6) Conflicts: drivers/gpu/drm/bridge/Kconfig drivers/gpu/drm/bridge/lvds-encoder.c [Missing lvds-encoder driver in 4.4; so we're just extracting the helper from upstream, for use in other drivers] BUG=b:65001779 TEST=build Change-Id: I28a12b7a31926a8016f5a4fc1409bad7ef12254d Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768359 Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; " fail_count="8" gerrit_number="768359" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/768359/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I742db23db097f7c08c4bf3a5a33c8790acc1d5c2" commit="25382d0cdb5d2bb179b2a17b6079f023c3015628" commit_message="UPSTREAM: bridge: Fix panel-bridge error return on !panel. ERR_PTR() needs a negative errno argument. Signed-off-by: Eric Anholt &lt;eric@anholt.net&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: http://patchwork.freedesktop.org/patch/msgid/20170615175423.17954-1-eric@anholt.net (cherry picked from commit e6f0acb2f0da89625aefc84b448f457b9161436b) BUG=b:65001779 TEST=build Change-Id: I742db23db097f7c08c4bf3a5a33c8790acc1d5c2 Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/786393 " fail_count="8" gerrit_number="786393" owner_email="briannorris@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/93/786393/2" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I3370245c9ab80880073760a653a4de9e2ba07eb8" commit="3467c5dc77c77c57ccd9bfbe85dbdc9282a7e45a" commit_message="BACKPORT: drm: Add crtc/encoder/bridge-&gt;mode_valid() callbacks This adds a new callback to crtc, encoder and bridge helper functions called mode_valid(). This callback shall be implemented if the corresponding component has some sort of restriction in the modes that can be displayed. A NULL callback implicates that the component can display all the modes. We also change the documentation so that the new and old callbacks are correctly documented. Only the callbacks were implemented to simplify review process, following patches will make use of them. Changes in v2 from Daniel: - Update the warning about how modes aren't filtered in atomic_check - the heleprs help out a lot more now. - Consistenly roll out that warning, crtc/encoder's atomic_check missed it. - Sprinkle more links all over the place, so it's easier to see where this stuff is used and how the differen hooks are related. - Note that -&gt;mode_valid is optional everywhere. - Explain why the connector's mode_valid is special and does _not_ get called in atomic_check. v3: Document what can and cannot be checked in mode_valid a bit better (Andrjez). Answer: Only allowed to look at the mode, nothing else. Cc: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Cc: Jose Abreu &lt;joabreu@synopsys.com&gt; Cc: Carlos Palminha &lt;palminha@synopsys.com&gt; Cc: Alexey Brodkin &lt;abrodkin@synopsys.com&gt; Cc: Ville Syrjl &lt;ville.syrjala@linux.intel.com&gt; Cc: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Cc: Dave Airlie &lt;airlied@linux.ie&gt; Cc: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Archit Taneja &lt;architt@codeaurora.org&gt; Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; (v2) Reviewed-by: Jose Abreu &lt;joabreu@synopsys.com&gt; (v2) Reviewed-by: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Link: http://patchwork.freedesktop.org/patch/msgid/20170515093347.31098-1-daniel.vetter@ffwll.ch (cherry picked from commit 3eb220a5319169fb44dcfe1944c731424c2bee5f) Conflict: include/drm/drm_modeset_helper_vtables.h [Missing some kerneldoc for some of the callbacks, so we didn't bother backporting the fixups to that kerneldoc] BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I3370245c9ab80880073760a653a4de9e2ba07eb8 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannnorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768360 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="768360" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/768360/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I0b8d28252cfda3cd23d310c4ca51dda200f44225" commit="eff675a2bc805943b74e8bb99deadab4d8bfa3d7" commit_message="UPSTREAM: drm: Add drm_{crtc/encoder/connector}_mode_valid() Add a new helper to call crtc-&gt;mode_valid, connector-&gt;mode_valid and encoder-&gt;mode_valid callbacks. Suggested-by: Ville Syrjl &lt;ville.syrjala@linux.intel.com&gt; Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Reviewed-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Reviewed-by: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Carlos Palminha &lt;palminha@synopsys.com&gt; Cc: Dave Airlie &lt;airlied@linux.ie&gt; Changes v2-&gt;v3: - Move helpers to drm_probe_helper.c (Daniel) - Squeeze patches that introduce helpers into a single one (Daniel) Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; [danvet: Make it compile when CONFIG_DRM_DP_AUX_CHARDEV is selected.] Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Link: http://patchwork.freedesktop.org/patch/msgid/b55c8bd029da219ff04e39086025c115731a49b1.1495720737.git.joabreu@synopsys.com (cherry picked from commit da251bf8f93513519a3c18b2b2290557ea5ba860) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I0b8d28252cfda3cd23d310c4ca51dda200f44225 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768361 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="8" gerrit_number="768361" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/768361/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I9593bc6427fc070dd8862ffe3c80276e9f5765c4" commit="1c9c805c52f26c28f1f3668d4072fb942b10e00b" commit_message="UPSTREAM: drm: Introduce drm_bridge_mode_valid() Introduce a new helper function which calls mode_valid() callback for all bridges in an encoder chain. Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Reviewed-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Cc: Carlos Palminha &lt;palminha@synopsys.com&gt; Cc: Ville Syrjl &lt;ville.syrjala@linux.intel.com&gt; Cc: Dave Airlie &lt;airlied@linux.ie&gt; Cc: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Archit Taneja &lt;architt@codeaurora.org&gt; Cc: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Reviewed-by: Archit Taneja &lt;architt@codeaurora.org&gt; Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Link: http://patchwork.freedesktop.org/patch/msgid/36bd5e054496ad3c9c71f1ffe204f28533f55f1e.1495720737.git.joabreu@synopsys.com (cherry picked from commit b1240f81a1865670e44d25593e47c2023a20ab62) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I9593bc6427fc070dd8862ffe3c80276e9f5765c4 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768362 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="8" gerrit_number="768362" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/768362/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I57b0124cb254f3f1ad500464f3b92b10df90669a" commit="fc94c0764f9ab5d3a772a9d2a6bae5aebaed4a75" commit_message="BACKPORT: drm: Use new mode_valid() helpers in connector probe helper This changes the connector probe helper function to use the new encoder-&gt;mode_valid(), bridge-&gt;mode_valid() and crtc-&gt;mode_valid() helper callbacks to validate the modes. The new callbacks are optional so the behaviour remains the same if they are not implemented. If they are, then the code loops through all the connector's encodersXbridgesXcrtcs and calls the callback. If at least a valid encoderXbridgeXcrtc combination is found which accepts the mode then the function returns MODE_OK. Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Reviewed-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Cc: Carlos Palminha &lt;palminha@synopsys.com&gt; Cc: Dave Airlie &lt;airlied@linux.ie&gt; Cc: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Changes v3-&gt;v4: - Change function name (Laurent) Changes v2-&gt;v3: - Call also bridge-&gt;mode_valid (Daniel) Changes v1-&gt;v2: - Use new helpers suggested by Ville - Change documentation (Daniel) Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Link: http://patchwork.freedesktop.org/patch/msgid/d4e3ba87d822fa92f1b8773e441b9a02af3bde71.1495720737.git.joabreu@synopsys.com (cherry picked from commit 97f973d652602425f4dc31a13e8605d5841afe25) Conflicts: drivers/gpu/drm/drm_probe_helper.c [Missing some kerneldoc from a few upstream commits, e.g.: 5dec293b2434 drm: Expand the drm_helper_probe_single_connector_modes() docs So dropped some kerneldoc fixups from this commit] BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I57b0124cb254f3f1ad500464f3b92b10df90669a Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannnorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768363 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="768363" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/768363/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I51567983d06bf311d86400efd58db7e1e838f1d2" commit="755656d772c94ad40db93ef59840cc673adf751d" commit_message="BACKPORT: drm: Use mode_valid() in atomic modeset This patches makes use of the new mode_valid() callbacks introduced previously to validate the full video pipeline when modesetting. This calls the connector-&gt;mode_valid(), encoder-&gt;mode_valid(), bridge-&gt;mode_valid() and crtc-&gt;mode_valid() so that we can make sure that the mode will be accepted in every components. Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Reviewed-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Reviewed-by: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Carlos Palminha &lt;palminha@synopsys.com&gt; Cc: Ville Syrjl &lt;ville.syrjala@linux.intel.com&gt; Cc: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Cc: Dave Airlie &lt;airlied@linux.ie&gt; Cc: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Cc: Archit Taneja &lt;architt@codeaurora.org&gt; Cc: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Changes v1-&gt;v2: - Removed call to connector-&gt;mode_valid (Ville, Daniel) - Changed function name (Ville) - Use for_each_new_connector_in_state (Ville) - Do not validate if connector and mode didn't change (Ville) - Use new helpers to call mode_valid Signed-off-by: Jose Abreu &lt;joabreu@synopsys.com&gt; Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt; Link: http://patchwork.freedesktop.org/patch/msgid/a457d6a69ad07b3936304653c919068c430c0857.1495720737.git.joabreu@synopsys.com (cherry picked from commit faf94a0883cedce892ef10a258c9388929462525) Conflicts: drivers/gpu/drm/drm_atomic_helper.c [We don't have the &quot;new vs. old&quot; state helpers from commit 581e49fe6b41 (&quot;drm/atomic: Add new iterators over all state, v3.&quot;), so just using the existing helpers (e.g., for_each_connector_in_state). Also missing some kerneldoc on drm_atomic_helper_check_modeset() which we're not porting. And finally, drm_atomic_helper_check_modeset() has a little different validation before mode_fixup(); shouldn't affect our additional validation much] BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I51567983d06bf311d86400efd58db7e1e838f1d2 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannnorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768364 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="768364" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/64/768364/6" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I867c41a4191c3e548e3d2e9c03d7ffbd56a987d7" commit="eb3fd05a7da6e4485808cde94c30033485ba7823" commit_message="BACKPORT: drm: Make the connector .detect() callback optional Many drivers (21 to be exact) create connectors that are always connected (for instance to an LVDS or DSI panel). Instead of forcing them to implement a dummy .detect() handler, make the callback optional and consider the connector as always connected in that case. Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt; Acked-by: Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt; Acked-by: Jyri Sarha &lt;jsarha@ti.com&gt; Acked-by: Jani Nikula &lt;jani.nikula@intel.com&gt; Acked-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt; Acked-by: Vincent Abriou &lt;vincent.abriou@st.com&gt; Acked-by: Alexey Brodkin &lt;abrodkin@synopsys.com&gt; Signed-off-by: Laurent Pinchart &lt;laurent.pinchart+renesas@ideasonboard.com&gt; [seanpaul fixed small conflict in rcar-du/rcar_du_lvdscon.c] Signed-off-by: Sean Paul &lt;seanpaul@chromium.org&gt; (cherry picked from commit 949f08862d662f17b9d2929c6afb2d4e8f5d50cb) Conflicts - missing drivers: drivers/gpu/drm/amd/amdgpu/dce_virtual.c drivers/gpu/drm/bridge/tc358767.c drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c drivers/gpu/drm/sun4i/sun4i_rgb.c BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I867c41a4191c3e548e3d2e9c03d7ffbd56a987d7 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768365 " fail_count="8" gerrit_number="768365" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/768365/8" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I041cc014fee609a2276114a807fcb0f6e1d56567" commit="898c09851c8886822da1970bf83e2150bdff0496" commit_message="UPSTREAM: drm/drm_of: add drm_of_panel_bridge_remove function This function is the pendant of drm_of_find_panel_or_bridge() to remove a previously allocated panel_bridge. Given a specific port and endpoint it remove the panel bridge. Since drm_panel_bridge_remove() will check that bridge parameter is not NULL and is a real drm_panel_bridge and no a simple bridge it is safe to call it directly. Signed-off-by: Benjamin Gaignard &lt;benjamin.gaignard@linaro.org&gt; Reviewed-by: Philippe Cornu &lt;philippe.cornu@st.com&gt; Tested-by: Philippe Cornu &lt;philippe.cornu@st.com&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1506936888-23844-3-git-send-email-benjamin.gaignard@linaro.org (cherry picked from commit c70087e8f16f1dfe703d223aadd95ede1cde8e30) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I041cc014fee609a2276114a807fcb0f6e1d56567 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768366 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="8" gerrit_number="768366" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/768366/8" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="I409cda86f79b38f5057cc19fc13aba7145a7d87d" commit="009ee4b2d7e36630bee9583ce508bd47436a1aa4" commit_message="UPSTREAM: dt-bindings: display: Add Synopsys DW MIPI DSI host controller This patch adds documentation of device tree bindings for the Synopsys DesignWare MIPI DSI host controller. Signed-off-by: Philippe CORNU &lt;philippe.cornu@st.com&gt; Acked-by: Rob Herring &lt;robh@kernel.org&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1500277223-29553-4-git-send-email-philippe.cornu@st.com (cherry picked from commit 88dd1e6f9ad8ff74785fd1a20dc8336f1c45ccf0) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I409cda86f79b38f5057cc19fc13aba7145a7d87d Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768767 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="768767" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/768767/8" remote="cros" total_fail_count="9"/><pending_commit branch="chromeos-4.4" change_id="If510576fe50b2ae12e6da37d529c8820ee4e82d0" commit="662b021287738663d74c7266e9009d9ed53585a0" commit_message="BACKPORT: drm/bridge/synopsys: Add MIPI DSI host controller bridge Add a Synopsys Designware MIPI DSI host DRM bridge driver, based on the Rockchip version from rockchip/dw-mipi-dsi.c with phy &amp; bridge APIs. Signed-off-by: Philippe CORNU &lt;philippe.cornu@st.com&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1500277223-29553-5-git-send-email-philippe.cornu@st.com (cherry picked from commit 46fc51546d44061ff15235a399f86c8e62dfb9d4) Conflicts: drivers/gpu/drm/bridge/Makefile drivers/gpu/drm/bridge/Kconfig synopsys/ be created by 35dc8aabc8783d6322a59d774af2858e5955d2ab drm: bridge: dw-hdmi: Move the driver to a separate directory. BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: If510576fe50b2ae12e6da37d529c8820ee4e82d0 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768768 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Matthias Kaehlcke &lt;mka@chromium.org&gt; Reviewed-by: Sean Paul &lt;seanpaul@google.com&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="8" gerrit_number="768768" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/768768/8" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.4" change_id="I8b3bd4e1c4d8b18f72ba0dfd4b5f1fb9b832c2cc" commit="a1400091a82a4cfda97d4f2ed7beb0fb0ee15215" commit_message="BACKPORT: drm/bridge: make drm_bridge_funcs const Make these structures const as they are only stored in the funcs field of drm_bridge structure, which is of type const. Done using Coccinelle. Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Signed-off-by: Bhumika Goyal &lt;bhumirks@gmail.com&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1502207650-20029-1-git-send-email-bhumirks@gmail.com (cherry picked from commit f4c35e30881a00c582cf2b50862392232c30eb66) Conflicts: drivers/gpu/drm/bridge/adv7511/adv7511_drv.c (missing in 4.4) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I8b3bd4e1c4d8b18f72ba0dfd4b5f1fb9b832c2cc Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Signed-off-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-on: https://chromium-review.googlesource.com/768769 " fail_count="5" gerrit_number="768769" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="9" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/768769/9" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I4a36f1e64df17385457b3ef57f5d827aea7459b6" commit="393bd586b2d840a5ad9d306f0b99426b6e009efe" commit_message="UPSTREAM: drm/bridge/synopsys: dsi: Register list clean up This patch cleans up the Synopsys mipi dsi register list: - rename registers according to the Synopsys documentation (1.30 &amp; 1.31) - fix typos - re-order registers for a better coherency Signed-off-by: Philippe CORNU &lt;philippe.cornu@st.com&gt; Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt; Reviewed-by: Andrzej Hajda &lt;a.hajda@samsung.com&gt; Signed-off-by: Archit Taneja &lt;architt@codeaurora.org&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1501593788-21036-3-git-send-email-philippe.cornu@st.com (cherry picked from commit 1df82a61afaf79d3a42bd23bf1ec8cf95fe59adb) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I4a36f1e64df17385457b3ef57f5d827aea7459b6 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768770 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="5" gerrit_number="768770" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="9" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/768770/9" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="I793496d39d2c29462cb77d5a025ac107879339e0" commit="3433e0ae173d93d56a5771c093ba0fc1b4ca91cf" commit_message="UPSTREAM: drm/bridge/synopsys: dsi :remove is_panel_bridge When using drm_of_panel_bridge_remove() we can simplify the code and remove is_panel_bridge from dw_mipi_dsi structure. Signed-off-by: Benjamin Gaignard &lt;benjamin.gaignard@linaro.org&gt; Reviewed-by: Philippe Cornu &lt;philippe.cornu@st.com&gt; Tested-by: Philippe Cornu &lt;philippe.cornu@st.com&gt; Link: https://patchwork.freedesktop.org/patch/msgid/1506936888-23844-6-git-send-email-benjamin.gaignard@linaro.org (cherry picked from commit d5532f65e0465af2361c8beefe6ed396025316a3) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: I793496d39d2c29462cb77d5a025ac107879339e0 Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; Reviewed-on: https://chromium-review.googlesource.com/768771 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Stéphane Marchesin &lt;marcheu@chromium.org&gt; " fail_count="5" gerrit_number="768771" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="9" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/768771/9" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ifbc0d38d3645fb42eb5821187785e37b32192f3e" commit="f2a75f91dc824fdd33baab4442c868b3c47b72ea" commit_message="UPSTREAM: arm64: dts: rockchip: Correct MIPI DPHY PLL clock on rk3399 There is a further gate in between the mipidphy reference clock and the actual ref-clock input to the dsi host, making the clock hirarchy look like clk_24m --&gt; Gate11[14] --&gt; clk_mipidphy_ref --&gt; Gate21[0] --&gt; clk_dphy_pll Fix the clock reference so that the whole clock subtree gets enabled when the dsi host needs it. Signed-off-by: Nickey Yang &lt;nickey.yang@rock-chips.com&gt; [amended commit message] Signed-off-by: Heiko Stuebner &lt;heiko@sntech.de&gt; (cherry picked from bb4e6ff01ac356f82327d980e45fee8a65491328) BUG=b:65001779 TEST=build and boot scarlet rev0, display still works Change-Id: Ifbc0d38d3645fb42eb5821187785e37b32192f3e Reviewed-on: https://chromium-review.googlesource.com/780121 Commit-Ready: Brian Norris &lt;briannorris@chromium.org&gt; Tested-by: Brian Norris &lt;briannorris@chromium.org&gt; Reviewed-by: Brian Norris &lt;briannorris@chromium.org&gt; " fail_count="5" gerrit_number="780121" owner_email="nickey.yang@rock-chips.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/780121/8" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="Ia6a5163abcdef32b3921f961e04878b60bbaa39c" commit="15ef58ebe67111cc83385f891a20898abb3d9ad2" commit_message="sys-apps/mosys: Remove environment hacks These were here due to a bug in mosys Makefile which is now fixed in dependent CL. BUG=chromium:788213 TEST=FEATURES=test USE=static emerge-reef mosys CQ-DEPEND=CL:788233 Change-Id: Ia6a5163abcdef32b3921f961e04878b60bbaa39c Reviewed-on: https://chromium-review.googlesource.com/788178 Commit-Ready: Jason Clinton &lt;jclinton@chromium.org&gt; Tested-by: Jason Clinton &lt;jclinton@chromium.org&gt; Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt; " fail_count="2" gerrit_number="788178" owner_email="jclinton@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/78/788178/2" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Idcc23d11487850cbee76d6d2d6bd209614dc0d19" commit="16cf580e7de238568e265b7027f53ec31c58fb0d" commit_message="Makefile: Begin to remove a decade of cruft This deletes: * The not-compiling, 'hello world'-type mosys_test.c. * Removes all references to cmockery * Removes all references to Subversion * Begins to remove some of the kernel 2.6 (!!) macros * Removes System.map generation * Removes depmod generation * Updates fmap to the modern symbol name and removes some indirection * Updates clean to remove .o files, not kernel .ko files (!!) TEST=FEATURES=test emerge-reef mosys BUG=chromium:788213 BRANCH=none Change-Id: Idcc23d11487850cbee76d6d2d6bd209614dc0d19 Reviewed-on: https://chromium-review.googlesource.com/788232 Commit-Ready: Jason Clinton &lt;jclinton@chromium.org&gt; Tested-by: Jason Clinton &lt;jclinton@chromium.org&gt; Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt; " fail_count="2" gerrit_number="788232" owner_email="jclinton@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/mosys" project_url="https://chromium-review.googlesource.com/chromiumos/platform/mosys" ref="refs/changes/32/788232/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ic6559c25681a5f5d37cfb79684f93573c68738a1" commit="729303ad14c798c00672df2e9e427bc7b8a252c5" commit_message="Makefile: Handle empty string environment variables I spent hours looking at this to close an ancient bug https://github.com/dhendrix/mosys/issues/3 opened in 2012. The reason that this has fought being resolved for so long is that we are mixing Makefile and Kbuild systems and somewhere something is setting variables like CC to empty string. This caused Makefiles ?= syntax to skip sane fallbacks logic. This updates this to test for empty string and performs assignment if the emtpy string is there. BUG=chromium:788213 TEST=FEATURES=test emerge-reef mosys FEATURES=test USE=static emerge-reef mosys BRANCH=none Change-Id: Ic6559c25681a5f5d37cfb79684f93573c68738a1 Reviewed-on: https://chromium-review.googlesource.com/788233 Commit-Ready: Jason Clinton &lt;jclinton@chromium.org&gt; Tested-by: Jason Clinton &lt;jclinton@chromium.org&gt; Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt; " fail_count="2" gerrit_number="788233" owner_email="jclinton@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/mosys" project_url="https://chromium-review.googlesource.com/chromiumos/platform/mosys" ref="refs/changes/33/788233/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ie56b3f3273e2576c001f76c6cd4c1a0766540a8c" commit="9b7b02e08117643cace1e06c95c069662ae3cce5" commit_message="sys-apps/mosys: Only install mosys_s if requested mosys Makefile always compiles the static version of mosys as mosys_s. Because of the way this ebuild was writen, it assumed that this target wasn't built until LDFLAGS was modified to have -static; this is false. Instead, the nonfatal dobin was causing the static mosys_s to be installed alongside mosys on every board costing us 1.3MB of space on the rootfs. If folks want to use the static version, mosys_s, they should copy that after doing USE=static. BUG=chromium:788213 TEST=FEATURES=test USE=static emerge-reef mosys Change-Id: Ie56b3f3273e2576c001f76c6cd4c1a0766540a8c Reviewed-on: https://chromium-review.googlesource.com/788179 Commit-Ready: Jason Clinton &lt;jclinton@chromium.org&gt; Tested-by: Jason Clinton &lt;jclinton@chromium.org&gt; Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt; " fail_count="2" gerrit_number="788179" owner_email="jclinton@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/79/788179/2" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I4789e8b1624c84e38d1b6a73ae63596236365ddb" commit="3770749ac30ec113dede0d24daa0370fe7261ab6" commit_message="Makefile: Add a static library that can be imported by another FFI Adding this library will allow us to iteratively call mosys C functions from another language built in the same directory without rewriting all of mosys. BUG=chromium:788213 TEST=make defconfig; make; confirm mosys.a generated BRANCH=none Change-Id: I4789e8b1624c84e38d1b6a73ae63596236365ddb Reviewed-on: https://chromium-review.googlesource.com/788234 Commit-Ready: Jason Clinton &lt;jclinton@chromium.org&gt; Tested-by: Jason Clinton &lt;jclinton@chromium.org&gt; Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt; " fail_count="2" gerrit_number="788234" owner_email="jclinton@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/mosys" project_url="https://chromium-review.googlesource.com/chromiumos/platform/mosys" ref="refs/changes/34/788234/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="If68d1e943a82a00b23075f8fa5a15f90a3364e86" commit="a4642a1549df553d3091a6251b4cf1c9424d75ae" commit_message="power: Treat tablet mode events as user activity. Make powerd's StateController class treat tablet mode events as user activity so that they'll turn the screen on if it was previously turned off due to inactivity. BUG=chromium:787768 TEST=added unit tests Change-Id: If68d1e943a82a00b23075f8fa5a15f90a3364e86 Reviewed-on: https://chromium-review.googlesource.com/786356 Commit-Ready: Dan Erat &lt;derat@chromium.org&gt; Tested-by: Dan Erat &lt;derat@chromium.org&gt; Reviewed-by: Nicolas Boichat &lt;drinkcat@chromium.org&gt; " fail_count="2" gerrit_number="786356" owner_email="derat@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/56/786356/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I0e5078751292f3b753209daa0699886c95856130" commit="dcaef2eaf0771fe361ae83eded90383466501386" commit_message="kernel_MemoryRamoop: move to /sys/fs/pstore We're moving the mount point to under /sys/fs. BUG=chromium:781536 TEST=precq passes Change-Id: I0e5078751292f3b753209daa0699886c95856130 Reviewed-on: https://chromium-review.googlesource.com/775980 Commit-Ready: Mike Frysinger &lt;vapier@chromium.org&gt; Tested-by: Mike Frysinger &lt;vapier@chromium.org&gt; Reviewed-by: Mike Frysinger &lt;vapier@chromium.org&gt; " fail_count="0" gerrit_number="775980" owner_email="vapier@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/80/775980/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I12f725135d2c10877e5768a34b72c450572e030e" commit="8d176d396857ab37f78dbb7f8e55b7e3b2600439" commit_message="authpolicy: Use domain controller name for smbclient Uses the domain controller name from net ads lookup as hostname for smbclient instead of a combination of the first part of LDAP server name and the logon realm. This fixes policy fetch for cases when the two don't match, e.g. the correct one might be 'DCNAME.EXAMPLE.COM' and the wrong one could be 'DCNAME.SUBDOMAIN.EXAMPLE.COM'. Modifies existing tests so they catch this case. BUG=chromium:778788 TEST=cros_run_unit_tests --board=amd64-generic --packages authpolicy TEST=Tested on device Change-Id: I12f725135d2c10877e5768a34b72c450572e030e Reviewed-on: https://chromium-review.googlesource.com/788151 Commit-Ready: Lutz Justen &lt;ljusten@chromium.org&gt; Tested-by: Lutz Justen &lt;ljusten@chromium.org&gt; Reviewed-by: Roman Sorokin &lt;rsorokin@chromium.org&gt; " fail_count="0" gerrit_number="788151" owner_email="ljusten@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/51/788151/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ie4f3642350f01cd57bd6b56cabd53ec775da17fa" commit="8e95bfa8324e99e650d68cf6e65abea2d0f25d7f" commit_message="power: Check for lockfiles in /run/lock/power_override. Introduce a new system::LockfileChecker class within powerd that checks for the existence of lockfiles that should prevent powerd from suspending or shutting down the system. This moves some more code out of the Daemon class and also adds support for a new /run/lock/power_override directory that can be used to add additional lockfiles in the future without needing to update a list within powerd. BUG=chromium:784651,b:35550315 TEST=added tests; also manually tested by writing powerd's PID to a file under /run/lock/power_override and verifying that powerd holds off on suspending until the lockfile is removed Change-Id: Ie4f3642350f01cd57bd6b56cabd53ec775da17fa Reviewed-on: https://chromium-review.googlesource.com/768311 Commit-Ready: Dan Erat &lt;derat@chromium.org&gt; Tested-by: Dan Erat &lt;derat@chromium.org&gt; Reviewed-by: Mike Frysinger &lt;vapier@chromium.org&gt; " fail_count="0" gerrit_number="768311" owner_email="derat@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/11/768311/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I25f87d2c66f5300b641735640840d82059c7b843" commit="04e759889b257ec0a52f0543f3230d328cd1df68" commit_message="ec-devutils: add installation of servo firmware binaries This adds servo firmware binaries pulled from gs into /usr/share/servo_updater/firmware/ allowing easy updating to the released firmware version. Note that these firmwares are initial placeholders and haven't yet gone through any qual. BUG=b:69016431 TEST=ls /usr/share/servo_updater/firmware/ Change-Id: I25f87d2c66f5300b641735640840d82059c7b843 Reviewed-on: https://chromium-review.googlesource.com/777991 Commit-Ready: Nick Sanders &lt;nsanders@chromium.org&gt; Tested-by: Nick Sanders &lt;nsanders@chromium.org&gt; Reviewed-by: Nick Sanders &lt;nsanders@chromium.org&gt; " fail_count="3" gerrit_number="777991" owner_email="nsanders@chromium.org" pass_count="0" patch_number="8" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/91/777991/8" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I35855edc781ad373007a8ef07e55f1e9f02f9016" commit="50d58848e4ac22a9cfd7aa76f27d28ec349c85a8" commit_message="system_api: Add new value and protos for authpolicy. Adds ERROR_CACHE_DEVICE_POLICY: needed to report to Chrome that device policy cached on authpolicy side. Adds protos for D-Bus function inputs. Needed to switch D-Bus calls to protobufs inputs. BUG=chromium:684679,chromium:782695 TEST=none Change-Id: I35855edc781ad373007a8ef07e55f1e9f02f9016 Reviewed-on: https://chromium-review.googlesource.com/771630 Commit-Ready: Roman Sorokin &lt;rsorokin@chromium.org&gt; Tested-by: Roman Sorokin &lt;rsorokin@chromium.org&gt; Reviewed-by: Lutz Justen &lt;ljusten@chromium.org&gt; Reviewed-by: Roman Sorokin &lt;rsorokin@chromium.org&gt; " fail_count="1" gerrit_number="771630" owner_email="rsorokin@chromium.org" pass_count="0" patch_number="7" project="chromiumos/platform/system_api" project_url="https://chromium-review.googlesource.com/chromiumos/platform/system_api" ref="refs/changes/30/771630/7" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I3599e663a1b88a511ef7127880e3582457bb0a2b" commit="7ff99e576ad8fd2e3eb600f9412c16414d15b748" commit_message="power: Add AiAiAi C60 Cable to autosuspend whitelist AiAiAi C60 Cable is available: https://aiaiai.dk/headphones/tma-2/parts/cables/c60 The cable may be attached to Chromebooks. We want to exercise the low power mode of this device, so let's whitelist it for USB autosuspend. Signed-off-by: Benson Leung &lt;bleung@chromium.org&gt; BUG=b:64950327 TEST=Attach AiAiAi C60 Calbe to Electro/Reef. Check in /sys/bus/usb/devices that the device in question's power/runtime_status settles on &quot;Suspended&quot; and power consumption is ~2.5mA as measured by an inline meter. Change-Id: I3599e663a1b88a511ef7127880e3582457bb0a2b Reviewed-on: https://chromium-review.googlesource.com/786347 Commit-Ready: Benson Leung &lt;bleung@chromium.org&gt; Tested-by: Benson Leung &lt;bleung@chromium.org&gt; Reviewed-by: Matthias Kaehlcke &lt;mka@chromium.org&gt; " fail_count="3" gerrit_number="786347" owner_email="bleung@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/47/786347/2" remote="cros" total_fail_count="3"/><lkgm version="10158.0.0-rc1"/></manifest>