| <?xml version="1.0" encoding="utf-8"?><manifest revision="267a0935f202464987ffa427cb204381b6d1ef2c"> |
| <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="bce0483dd09f592d6f9f989f0e34fc930d206810" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="16c285d16813172eaacd12d3396df90a3894cbc5" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="4ba5a9a6b07148b0b812ed34f8cdfe3a738a4dd4" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/minijail" path="src/aosp/external/minijail" revision="7a569073b95af7532892dc726c2f33cd40edfb57" 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="b606f03ee5a4d7a5f5f78cc980a447f08d94f9df" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="38618ae30e6f5c19a7d6287a0de1210c4a0ffd33" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="90c4a0d3a66a84270aa8a8b4d46a97e6172074e9" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="6cbcd73e9315cc68605024003aaa8f347ddd6615" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="696faf4dffebca4d15959251cf3fb88b0727d801" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="b470b41a117a213f5b8cf2d7badcc208da001b72" upstream="refs/heads/master"/> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" revision="0680a2d0c4cec58f8163fe115de80cff8852fd8b" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/hwcplus" revision="e66a31e54e12906e86dc59f95b458889f025c505" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromium/tools/depot_tools" revision="9d20675998f69ae543c3ebed4bcc14f748f3797e"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/chromite" path="chromite" revision="b2f195323154639da7f2c51569c7113512505934" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/manifest" path="manifest" revision="49ef9671d35ef92f1e2f0eea163ef17a4e167f12" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="129b69149642e1e10dbec270c609913fd890d9a2" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="c692e7d66f09a008f8606c5f81ce90f7b49b22b6" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="161edc9f4dddd54a867ae6ce521a32971ba48f30" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="52fb749c6fb6c6ce43c84ada6182e371ef2896b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="5fc15dee29d1d967ccc46071a732d802d3b34655" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="547ee7b5c86235308527c0ddd5e43c1673e7fcf1" 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/bmpblk" path="src/platform/bmpblk" revision="563ac6b7db7e742045b02ed29cc5ecc81ff58531" 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="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="5d067bf2f813e81e2cf2b5f0db22c3307be37cea" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="05ce8d3c59a2d8e765b3beb2e1a69e7fcf59e5ba" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="0d4ff6c83c9f6ce674e49bf461f370ec77de6809" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="30823e919666a292942fa0c5145a8fc71566d073" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="35bc2fd214aac62418b89d447839484dc013d099" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="be84dd129fb5d6ec438278e74381eba5c002162d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="c4df284b32558f631862f79c75fc03af4f5ca68a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="fa0547a876bf0e1ac3740ea2a9cf8c7999acb87f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="7b98fdc0b896697f30e1b069791934fedb977de4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="8a0cb73e3332ab461bcca6eb0173487350f58e24" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="312f06df6f921915f15f976f936eea335c51b236" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="70f79da7a3bd18c942fa65a6b21fea589bbb5516" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="607e4dcf6dbc983272bee14f8e8c1300d6a1eecd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="9d27a36fdd3727d7fdebe96fd24013bc601a58df" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/glbench/images" path="src/platform2/glbench/images" revision="5fd5ce655833f65d46b1950bec4eedeb4e96959b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="67d5567177301d0c24303f26ad119ab7bd7fab40" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="d5eb65afd5f9da10a3fa86f65d357a817221717e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="1a710721263b8b93ab49af6a6f749a778483f3df" 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="5ee665e7c68856d3b6ce8bb0f610d43503e603af" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="61f882f395b9f39478d7164209e7134cccdcb72b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="3c7204287bbc8f4341f546857216389bdff58e51" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/microbenchmark" path="src/platform/microbenchmark" revision="d5ea30febe406c5b486325dfae926564f3a46efd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="f9e7c4c8e91fb354abf714c7a5c89b4990814ff3" 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="e84b8886c2eef22bce704d065d59f6b1267b56b2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="44148fe605b952132644f0d0e5ccea7cfcc6d6c8" 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="9efd0e1723cd45709bd0d34e8e7bbfd15967f0d5" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="5a230ee17756dc43ff732932dcb52899c06a4d09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="2cf87623ebe64dbff665490900713695ba7c5113" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="1973ced7b023bdb4d095dff3e779bb4afacfe4f4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="6b0aba12a385f4d3a7a47641a3a919018032f6f8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="3f379a2b8808a435dc14a333f3f7ad82e54e2511" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="75d8f1bfbbb3dfc870fcbc22f53cd16b66ac7f23" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="d2e7d94a834b54511ca57e6359839f9ca86d6d04" upstream="refs/heads/master"/> |
| <project 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/trunks" path="src/platform/trunks" revision="92dbe8c9e7fcf8acf67805fd5e25e85aa371f673" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot" path="src/platform/vboot" revision="2d30a2f5b1c81eb61de4bf82180a910d45f22e81" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="25589e5a1e07398238b514eb60a543ea8108e278" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="3e4cf4867fff44491b4f4c294eee9c77b92d4440" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/wireless_automation" path="src/platform/wireless_automation" revision="d7177dbd464f2952e10309bf1eef56bb31a7f8ad" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/workarounds" path="src/platform/workarounds" revision="30cab56de921f5be2d24c2e83bcd4ad5631b2d9b" 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="141199fa101370af0aed16a44f7122fea43f7c30" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="117f3e03fec35ee7ea6398aebed6cd6d9068b05f" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="fdbac8e95ef6153ab23370ea1586a86f462dbe5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="41c23100e0b5eb27d4495efa30b64a25a08f752e" 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="a7e530331d7cf4b58618f0715e61b5a872176f07"> |
| <annotation name="branch-mode" value="create"/> |
| </project> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="b91faa5611e549c6bbcc6797317361c72826ebec" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="58d9cf6e6ebbb1ce60e6da37943bb252b5c28557" upstream="refs/heads/chromeos-5.39"/> |
| <project 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 name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="60e229d93d7e219e261b851f654e459eb2cf4f41" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="5319e836704fcf2df75c7425addebb89bb973714" 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="3182aa85c087446e4358370549adc45db21ec124" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="f140c0aa430e1db1c0f31d23d3eb2397d47f209e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="aaaf66654dba797f152066df4d1dc4144b492c66" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="d75cd67ac2c9e04c3e7722bb4d28a888ac9fa911" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/gdata" path="chromite/third_party/gdata" revision="fe7e5c90a9827feb66ed446b2d297a1618b25272" 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="69702c400e274984a24d08fcaefe3952d5dcb36e" 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="f495d5d89d943b53b231c5b652d3a25b89debded" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="6fcb866534544ea8ce69c2134871cfcbdc1eb6d3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hwcplus-drm" path="src/third_party/hwcplus-drm" revision="7376a8da1c961115a61d7a3cb23bb13e4153583d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-chewing" path="src/third_party/ibus-chewing/files" revision="7a9514a0844eb5eb90ab96f62484a6af9e4a0d6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-xkb-layouts" path="src/third_party/ibus-xkb-layouts/files" revision="6af015110aa92dc2eed88a9f704634c3eff53b14" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="251b1ccdf4f494110e189fc9b339dd4b7ba7b69b" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="121a575f28e9e9da18b9f9c00c999bf7bba6fae9" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="a2509d6796f3a1a1b6594a7a598e681278815a62" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="032ab3f2af06b5787ee3385d5883a4752655ef06" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="56c0614d44a3184abffbf3ffac6165a40ada417d" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="dceee6ef99b968fd11d9c6058448202db835bc0f" 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="2c25afb719347a151657f8637ad62a5df42e247e" upstream="refs/heads/chromeos-2.4.66"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="c4e2949edeed01ca3b810729a7af0d265c49629b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="a436c551cf226af66cdb3dd74ee3971d0b1dae04" 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="61eb2eceaed6f66a36aa9fc3ed2bd55b8aa3eafe" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="13556f5f77128189571ecd2ffabd985ca837ff29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7fea30a4ad5b7b4e99865afcee8b6bfd19ec8b03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="db05d126a42a1540a503a2e5b49c3746c03df77d" 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="b2b27d09c1d7f694a37a80f7b04e4f79df557b1f" upstream="refs/heads/arc-11.3.0-pre1"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="6ef50efc1079e544d7fe912aba219e8907cb0cbd" 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/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="d759387adb6b4079241f7d1f2a145738acad929b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ply-image" path="src/third_party/ply-image" revision="6cf4e4cd968bb72ade54e423e2b97eb3a80c6de9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="5d7d7ff513315abd103d0c95e92ae646c1a7688c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project 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="0c4b13bf15b8e5773b79e6317121fba5e97a154f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="716a46a8f2e9516bd9ac64674a5811374f446792" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="416d30f74a9c1dc08b95b907d8b7e81edf6c9db0" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="bcf721d62d6a4c4c162c63714371fa4349df53bc" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/xf86-video-armsoc" path="src/third_party/xf86-video-armsoc" revision="30370e9dbf7ba0e457ee7de297d2ad6c269a00be" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="9292030109847793f7a6689adac1ddafb412fe14"/> |
| <project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="a82ee456bbb2fdcd77b782d52500650bd06d04e9" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="58632a3b7c85b2c0157d6f4d250ad397bd8fbe44" upstream="refs/heads/master"/> |
| <project name="platform/hardware/libhardware" path="src/platform/libhardware" remote="aosp" revision="99d2543a129b7054729bafeb17911a1349e9e8e3" upstream="refs/heads/master"/> |
| <project name="platform/system/bt" path="src/platform/bt" remote="aosp" revision="24ea892320ca85c7f6cdd77343da50818fe29002" upstream="refs/heads/master"/> |
| <project name="platform/system/core" path="src/platform/core" remote="aosp" revision="80beb506cf84410608a006cef70198919e0808b7" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="6422a80df992e4542dbd4fb70a04f316065674af" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="fe767fbb6d580458aeea609ac5c82b600acce63d"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.14" change_id="I9e3d96227cc7b7aa44f7b69a368771bba17ccd56" commit="ec747c9aac179dc0cc0e08c1e29bff8eab49211f" commit_message="ANDROID: ext4: insert 3.18 version of fs/ext4, fs/jbd2 and associated header files This will cause ext3 and gfs2 to not compile correctly, but allows us to get a modern version of ext4 into 3.10. This makes it easier to backport newer features such as ext4 encryption into a downrev kernel. It also fixes a number of xfstest failures that were fixed since 3.10. The subsequent commits will fix up the 3.18 ext4 codebase so it will compile against 3.10. [From https://android.googlesource.com/kernel/common, branch andro-3.10] Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit ffc663aeffaedb2f6cc51eaf7670e27c78773fcb) BUG=chromium:347322 CQ-DEPEND=CL:347647 TEST=load on samus and run basic xfstests. Change-Id: I9e3d96227cc7b7aa44f7b69a368771bba17ccd56 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347610 " fail_count="0" gerrit_number="347610" owner_email="gwendal@chromium.org" 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/10/347610/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Iea7a9d8b87442764bb2fd16306996b494e6ed1b3" commit="bfb0b75a8ed69c9886f84e87ec324683669b2445" commit_message="ANDROID: fs: add {lock,unlock}_two_nondirectories for 3.18 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit b226d199c38e353cf59240000704a4cfdd40a954) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Iea7a9d8b87442764bb2fd16306996b494e6ed1b3 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347611 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347611" owner_email="gwendal@chromium.org" 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/11/347611/6" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I1bf562a302cae211c0b28fb3872f8ee15660c182" commit="a69fbb91cdfe627cffc78b7324e843e856c1bca1" commit_message="ANDROID: mm: add find_get_page_flags() for 3.18 ext4 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 8bf263fdd07f7d0c61d723669bc2975defc278e2) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I1bf562a302cae211c0b28fb3872f8ee15660c182 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347612 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347612" owner_email="gwendal@chromium.org" 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/12/347612/6" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Id2ca3694d1b75bc4f0ff3406dee4316275160a7d" commit="32caa193dea8eeef5c9e5f6862c6fee4ec0072e5" commit_message="ANDROID: percpu: add raw_cpu_ptr() for 3.18 ext4 backport Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 2b87a64859e90ef2c56cd745b9b8c8a5e4b44c6b) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Id2ca3694d1b75bc4f0ff3406dee4316275160a7d Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347613 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347613" owner_email="gwendal@chromium.org" 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/13/347613/6" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Id609c6a064eb445a6d2a71d0636ce0e784cc65c1" commit="f1dc669a5fcedb0deed8828c9c7964d9a179925e" commit_message="ANDROID: buffer_head.h: add sb_bread_unmovable() for 3.18 ext4 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 32630bba186e8c595b1283ff340273f9eb831366) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Id609c6a064eb445a6d2a71d0636ce0e784cc65c1 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347622 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347622" owner_email="gwendal@chromium.org" 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/22/347622/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Ida8499b70e0885d77044884f4129e18043e02a7b" commit="15f94b3172eec4e10dca0f5fa6d10a41737ddee3" commit_message="ANDROID: bitops.h: add smp_mb__after_atomic() for 3.18 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 51d7a7a0b5e77de668a489aacdd4f550d9809b51) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Ida8499b70e0885d77044884f4129e18043e02a7b Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347615 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347615" owner_email="gwendal@chromium.org" 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/15/347615/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I5c6ad0938d58635ef71abf513012562605a1684f" commit="263f9bca75c2862129a4055e17bd493dbc68a452" commit_message="ANDROID: mm.h: add truncate_inode_pages_final() for 3.18 ext4 backport Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 547b6fe75c6f25eddbd4136fabd43010ade0f97d) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I5c6ad0938d58635ef71abf513012562605a1684f Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347616 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347616" owner_email="gwendal@chromium.org" 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/16/347616/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I15640225884c49ad66bf54b9b3c23892497f78de" commit="095499d09d2ca948dff87e2393bf8715d6d2b873" commit_message="ANDROID: uapi: add new system call ABI codepoints for ext4 3.18 backport note: this doesn't guarantee that functionality provided by FALLOC_FL_COLLAPSE_RANGE, FALLOC_FL_ZERO_RANGE, and FIEMAP_FLAG_CACHE to necessarily _work_; it only allows ext4 from 3.18 to *compile*. Fortunately, these are exotic bits of functionality that most people never use. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit a50331ba52b351587d1dcce33eff46cbe06af2be) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I15640225884c49ad66bf54b9b3c23892497f78de Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347617 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347617" owner_email="gwendal@chromium.org" 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/17/347617/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Icdd6d192b41a14ad8d41dd10de1a47ccb917b281" commit="e4c916a1344b3ea89bf7ba63032e2ce43a730f04" commit_message="ANDROID: ext4: disable ext4 acl handling for 3.18 backport The ACL code changes too much between 3.18 and 3.10; so disable acl handling so we don't have make things actually work. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 58f0daee9ba2569744192a88ac012bbc6c648892) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Icdd6d192b41a14ad8d41dd10de1a47ccb917b281 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347618 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347618" owner_email="gwendal@chromium.org" 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/18/347618/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I16e8d1376c3e2902bf24e95cc2cb7c98eff7b341" commit="ddc23a70d0778fa525cece1601787598ce34d496" commit_message="ANDROID: ext4: use old percpu_counter_init() function signature Older kernels don't pass in a gfp_flags argument. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 6f066d9a48fce051dce7d96361fc993e827bb4d7) BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I16e8d1376c3e2902bf24e95cc2cb7c98eff7b341 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347619 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347619" owner_email="gwendal@chromium.org" 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/19/347619/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I14d09741af22f50b7c50aff0f2f165a4ff8ea76d" commit="5c41bbe8835d7300d58002fb61351b200990e0b9" commit_message="ANDROID: ext4: backport mm portion of: fix data integrity sync in ordered mode Commit 1c8349a17137: "ext4: fix data integrity sync in ordered mode" included changes to include/linux/page-flags.h and mm/page-writeback.c. Apply them as part of the 3.18 ext4 backport. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 273a193ac43ba53f3404ef48784c32940960635c) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I14d09741af22f50b7c50aff0f2f165a4ff8ea76d Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347621 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347621" owner_email="gwendal@chromium.org" 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/21/347621/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I3e0a5ebf18224a43f057e5482c57d5c3aed804a5" commit="521e2e291fd978ec14332c88de1a0dc8bf36c24b" commit_message="ANDROID: buffer_head.h: add getblk_unmovable() for 3.18 ext4 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 1161e728ef30016b096abbcc4654ddaf2726b833) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I3e0a5ebf18224a43f057e5482c57d5c3aed804a5 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347614 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347614" owner_email="gwendal@chromium.org" 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/14/347614/7" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I56153d55a9af9f2911ed6ffb15d36ad89d45cd55" commit="7e493133b7dc75c90945288734644b35d249a7f8" commit_message="ANDROID: sched: add bit_wait_io for 3.18 ext4 backport Excerpted from commit 743162013: "sched: Remove proliferation of wait_on_bit() action functions" Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 34563bc808d3c2d6f8b1d464418612300a90f132) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I56153d55a9af9f2911ed6ffb15d36ad89d45cd55 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347623 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347623" owner_email="gwendal@chromium.org" 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/23/347623/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Iaaf969d5f5665a16b1fa89037820e4603a54a5af" commit="312d90867e72b3e55c4e576817971ff9508fcefa" commit_message="ANDROID: fs: add inode_set_flags() for ext4 3.18 backport Excerpted from commit 5f16f3225b062 Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 5684cb12b3899a4fd89c7f28c93ed6ec5e0ade9a) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Iaaf969d5f5665a16b1fa89037820e4603a54a5af Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347624 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347624" owner_email="gwendal@chromium.org" 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/24/347624/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I8babe11450eeceb771df191a37c583261c7def1f" commit="dabe891a789565e234213843c45548a06c9e4ba2" commit_message="ANDROID: ext4: remove tmpfile, rename2, set_acl operations for 3.18 backport Also switch to the rename operation. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit fdc088829024cfc91e4539812bea9d6cd218e5de) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I8babe11450eeceb771df191a37c583261c7def1f Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347625 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347625" owner_email="gwendal@chromium.org" 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/25/347625/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I3413ff64ee86817a7e591c1e4e6c55283729dc38" commit="1fe63e9f547de5cc907cc6496c4e0c9e1499516b" commit_message="ANDROID: ext4: revert to old read/write/aio interface for 3.18 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 466e7c4807e80874c3b986e513920254fc165eca) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I3413ff64ee86817a7e591c1e4e6c55283729dc38 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347626 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347626" owner_email="gwendal@chromium.org" 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/26/347626/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I154aafc1d6771ba01be39d17be45450b7b3299df" commit="6b594381c6ce08cea4123f39222911eb7b1a71bb" commit_message="ANDROID: ext4: use old legacy direct I/O interface for 3.18 backport Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 14231a2aa9a0c8834f6ab69fe7015465973f20d8) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I154aafc1d6771ba01be39d17be45450b7b3299df Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347627 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347627" owner_email="gwendal@chromium.org" 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/27/347627/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I9bec7f1b6453e22d0dde3fad9aee55a6f2aa2c7e" commit="d65ad771942c68e697d659d088ceb79325726ce0" commit_message="ANDROID: vfs: fix data corruption when blocksize < pagesize for mmaped data commit 90a8020278c1598fafd071736a0846b38510309c upstream. ->page_mkwrite() is used by filesystems to allocate blocks under a page which is becoming writeably mmapped in some process' address space. This allows a filesystem to return a page fault if there is not enough space available, user exceeds quota or similar problem happens, rather than silently discarding data later when writepage is called. However VFS fails to call ->page_mkwrite() in all the cases where filesystems need it when blocksize < pagesize. For example when blocksize = 1024, pagesize = 4096 the following is problematic: ftruncate(fd, 0); pwrite(fd, buf, 1024, 0); map = mmap(NULL, 1024, PROT_WRITE, MAP_SHARED, fd, 0); map[0] = 'a'; ----> page_mkwrite() for index 0 is called ftruncate(fd, 10000); /* or even pwrite(fd, buf, 1, 10000) */ mremap(map, 1024, 10000, 0); map[4095] = 'a'; ----> no page_mkwrite() called At the moment ->page_mkwrite() is called, filesystem can allocate only one block for the page because i_size == 1024. Otherwise it would create blocks beyond i_size which is generally undesirable. But later at ->writepage() time, we also need to store data at offset 4095 but we don't have block allocated for it. This patch introduces a helper function filesystems can use to have ->page_mkwrite() called at all the necessary moments. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit 8b9695f16057e86c4a015ecfd39d8fe6ab857a51) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: I9bec7f1b6453e22d0dde3fad9aee55a6f2aa2c7e Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347628 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347628" owner_email="gwendal@chromium.org" 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/28/347628/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Ib4254abadaeaf234f8539834f481c24dc93233eb" commit="5bec0e8cea66d5e410092568ff390dd544be7ba7" commit_message="ANDROID: Add missing definitions for PTR_ERR_OR_ZERO() and NEED_KEY_SEARCH These definitions are needed for the ext4 encryption patches Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Theodore Ts'o <tytso@google.com> (cherry picked from commit c690e44fe44912b97a6cca4335b14d2305a99ebf) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Change-Id: Ib4254abadaeaf234f8539834f481c24dc93233eb Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347629 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347629" owner_email="gwendal@chromium.org" 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/29/347629/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I4675a9321cab021c617947957ab2d1d960503a1c" commit="ebf3bfe1bf5fe8680ec8f3e9304d623bf0d12106" commit_message="ANDROID: random: add and use memzero_explicit() for clearing data zatimend has reported that in his environment (3.16/gcc4.8.3/corei7) memset() calls which clear out sensitive data in extract_{buf,entropy, entropy_user}() in random driver are being optimized away by gcc. Add a helper memzero_explicit() (similarly as explicit_bzero() variants) that can be used in such cases where a variable with sensitive data is being cleared out in the end. Other use cases might also be in crypto code. [ I have put this into lib/string.c though, as it's always built-in and doesn't need any dependencies then. ] Fixes kernel bugzilla: 82041 Reported-by: zatimend@hotmail.co.uk Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Cc: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org (cherry picked from commit d4c5efdb97773f59a2b711754ca0953f24516739) [From https://android.googlesource.com/kernel/common, branch andro-3.10] BUG=chromium:347322 TEST=load on samus and run basic xfstests. Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Change-Id: I4675a9321cab021c617947957ab2d1d960503a1c Reviewed-on: https://chromium-review.googlesource.com/347980 Commit-Ready: Gwendal Grignou <gwendal@chromium.org> Tested-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347980" owner_email="gwendal@chromium.org" 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/80/347980/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I67c6d9bcbf5e0d9d4d5909bf4ab297d1fa68c114" commit="a20e6cb097fc11b8bd46589b823ce6a88fb2b62e" commit_message="UPSTREAM: tytso: ext4: reserve codepoints used by the ext4 encryption feature Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 3edc18d84540b94c0eba9226d01a8cbe4c162b55) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Previous-Reviewed-on: https://chromium-review.googlesource.com/321473 (cherry picked from commit cd14df4f64a2a07b68f9dae36d7c267bde83b0c1) Reviewed-on: https://chromium-review.googlesource.com/334194 (cherry picked from commit 5843ed971eb685fdb533e14056a3c178398bf108) Change-Id: I67c6d9bcbf5e0d9d4d5909bf4ab297d1fa68c114 Reviewed-on: https://chromium-review.googlesource.com/347630 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347630" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/30/347630/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I9c43bab0d5cf1cf11ffa9bbd6c435991c8342465" commit="7095a6569ed7e056371fabbb4315609a06ad0c37" commit_message="UPSTREAM: tytso: ext4 crypto: add ext4_mpage_readpages() This takes code from fs/mpage.c and optimizes it for ext4. Its primary reason is to allow us to more easily add encryption to ext4's read path in an efficient manner. Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit f64e02fe9bc6a359cab95632b33900094d225ae1) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Previous-Reviewed-on: https://chromium-review.googlesource.com/321474 (cherry picked from commit 242608963f36b9fa82c4288947c52fec357351bc) Reviewed-on: https://chromium-review.googlesource.com/334210 (cherry picked from commit 8f4886f5a7414e97895660467b85b0c099a839b4) Change-Id: I9c43bab0d5cf1cf11ffa9bbd6c435991c8342465 Reviewed-on: https://chromium-review.googlesource.com/347631 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347631" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/31/347631/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If501b29f4bba93d02685aa5f9d95e117363e9da8" commit="0cf7154c0f08ba8ca7a0c5a94aa45580bbed2e2f" commit_message="UPSTREAM: tytso: ext4 crypto: reserve codepoints used by the ext4 encryption feature Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit f542fbe8d5e842ed4e9ad6ccc6c2913407451c51) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Previous-Reviewed-on: https://chromium-review.googlesource.com/321475 (cherry picked from commit 48b6db1b0aaa618eaa8cefa169a8c2263f0f4918) Reviewed-on: https://chromium-review.googlesource.com/334220 (cherry picked from commit 63610e32d21c4d94bcddd2eae388074365ba470c) Change-Id: If501b29f4bba93d02685aa5f9d95e117363e9da8 Reviewed-on: https://chromium-review.googlesource.com/347632 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347632" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/32/347632/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ic24302e7e38849878b73c55b9b0b1abebb19e9bf" commit="a33ff31ff742b308144ca08278f235b38e8f1f00" commit_message="UPSTREAM: tytso: ext4 crypto: add ext4 encryption Kconfig Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit b17655fb7f4a1d27c1e50dcc28268612da944a54) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321476 (cherry picked from commit cbefe5d1d6829b2f6c63fcb2f9d37b2c978e4f45) Reviewed-on: https://chromium-review.googlesource.com/333994 (cherry picked from commit 73823470daa02188ef9c39bdbebd875024d90e5d) Change-Id: Ic24302e7e38849878b73c55b9b0b1abebb19e9bf Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347633 " fail_count="0" gerrit_number="347633" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/33/347633/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I52470d9ce47ec2afc8eb7e19ac397342147708cf" commit="8f39e30a850ad8a45584096ed6a7c3a993a596ae" commit_message="UPSTREAM: tytso: ext4 crypto: export ext4_empty_dir() Required for future encryption xattr changes. Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit e875a2ddba06ff8e84d4ce1c2bf69b67e4bf3678) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321477 (cherry picked from commit e4dd69dcd7c8032f3b7f80d816e2cc85175051eb) Reviewed-on: https://chromium-review.googlesource.com/334201 (cherry picked from commit 4601a0dc7939036186cce406a676b0452e4d2349) Change-Id: I52470d9ce47ec2afc8eb7e19ac397342147708cf Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347634 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347634" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/34/347634/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I8c83cdc87a9a9a24132ed54ad4e932b400c52a85" commit="d31b0370e92e194873dd90fbfe4268bc3557e41d" commit_message="UPSTREAM: tytso: ext4 crypto: add encryption xattr support Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 887e2c452255fbfdc8bdb891ff2066fb26908466) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321478 (cherry picked from commit c0c1fb763055c949fb3522b30a181ca49f9c08db) Reviewed-on: https://chromium-review.googlesource.com/334045 (cherry picked from commit 2c135b2a9f11972639e4f4cd4296f2aaefe7d1e9) Change-Id: I8c83cdc87a9a9a24132ed54ad4e932b400c52a85 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347635 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347635" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/347635/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ia75fd0f063c01367f672e3dc4f6ea1eda57a756c" commit="a2dbef5c62750fbebe501beafdc2c224b0f465d9" commit_message="UPSTREAM: tytso: ext4 crypto: add encryption policy and password salt support Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Ildar Muslukhov <muslukhovi@gmail.com> (cherry picked from commit 9bd8212f981ea6375911fe055382ad7529be5b28) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321479 (cherry picked from commit f2a5ae7b7a2ba18e38da76f14cb51df99d844148) Reviewed-on: https://chromium-review.googlesource.com/333995 (cherry picked from commit 5b8debe37d7043c23b695545fc42df57dadc4833) Change-Id: Ia75fd0f063c01367f672e3dc4f6ea1eda57a756c Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347636 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347636" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/347636/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I8d784936ecc2d69056d9b69778e52f7f8285953c" commit="1c26c874899b2bb836314d774fe3f60d94ba78bb" commit_message="UPSTREAM: tytso: ext4 crypto: add ext4 encryption facilities On encrypt, we will re-assign the buffer_heads to point to a bounce page rather than the control_page (which is the original page to write that contains the plaintext). The block I/O occurs against the bounce page. On write completion, we re-assign the buffer_heads to the original plaintext page. On decrypt, we will attach a read completion callback to the bio struct. This read completion will decrypt the read contents in-place prior to setting the page up-to-date. The current encryption mode, AES-256-XTS, lacks cryptographic integrity. AES-256-GCM is in-plan, but we will need to devise a mechanism for handling the integrity data. Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit b30ab0e03407d2aa2d9316cba199c757e4bfc8ad) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321670 (cherry picked from commit d4b10da26dc4f516247a32bacd9f938bde51b914) Reviewed-on: https://chromium-review.googlesource.com/334163 (cherry picked from commit 671d1b29d7f4c2da69037385af753dbf699303fa) Change-Id: I8d784936ecc2d69056d9b69778e52f7f8285953c Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347637 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347637" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/37/347637/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I87d15b9887b4b0f2b82f150266c9cfb64d0d6ebf" commit="ac02e96ccb8ff544fc8c9117b9d9beda43e41a07" commit_message="UPSTREAM: tytso: ext4 crypto: add encryption key management facilities Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Ildar Muslukhov <muslukhovi@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 88bd6ccdcdd638faa11e9746affc21d5f2fe2acf) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321671 (cherry picked from commit 4f8f8190a0995f660412ec4145be30633e23ba45) Reviewed-on: https://chromium-review.googlesource.com/334046 (cherry picked from commit 961a5d994269853e4b4eb60a290ac9f62649eeed) Change-Id: I87d15b9887b4b0f2b82f150266c9cfb64d0d6ebf Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347638 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347638" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/38/347638/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If136f32d3225abb318ffbdc97623397ba41a2085" commit="c1ea34b6d9bb934dfee66cc775c48cff4d296b7b" commit_message="UPSTREAM: tytso: ext4 crypto: enforce context consistency Enforce the following inheritance policy: 1) An unencrypted directory may contain encrypted or unencrypted files or directories. 2) All files or directories in a directory must be protected using the same key as their containing directory. As a result, assuming the following setup: mke2fs -t ext4 -Fq -O encrypt /dev/vdc mount -t ext4 /dev/vdc /vdc mkdir /vdc/a /vdc/b /vdc/c echo foo | e4crypt add_key /vdc/a echo bar | e4crypt add_key /vdc/b for i in a b c ; do cp /etc/motd /vdc/$i/motd-$i ; done Then we will see the following results: cd /vdc mv a b # will fail; /vdc/a and /vdc/b have different keys mv b/motd-b a # will fail, see above ln a/motd-a b # will fail, see above mv c a # will fail; all inodes in an encrypted directory # must be encrypted ln c/motd-c b # will fail, see above mv a/motd-a c # will succeed mv c/motd-a a # will succeed Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit d9cdc903318171571f1cd1e5737fd0cab94186be) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321672 (cherry picked from commit 7537808484c004911203ac4c1eab0da92865f335) Reviewed-on: https://chromium-review.googlesource.com/334134 (cherry picked from commit 333361b57a144900f2a2eedea1b7c9905089904e) Change-Id: If136f32d3225abb318ffbdc97623397ba41a2085 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347639 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347639" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/347639/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Iea07daac1a3ee0fd9ca587b85b30850c2d53858b" commit="9ad1554ca8cda7a209cc9728c9d71ef95182749c" commit_message="UPSTREAM: tytso: ext4 crypto: inherit encryption policies on inode and directory create Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit dde680cefc842e58524772099a3b8219e5abf551) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321673 (cherry picked from commit 781595ba93d610bf20c887913b75cede35e157c8) Reviewed-on: https://chromium-review.googlesource.com/334195 (cherry picked from commit 389666becfb247416bfeed1ad1bac1ae9bdd98d0) Change-Id: Iea07daac1a3ee0fd9ca587b85b30850c2d53858b Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347640 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347640" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/347640/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If8602e32c9c0b94a312f3402deac4d48d7e18197" commit="48173f0a911df6968fef5a9240d2293173f4e8f9" commit_message="BACKPORT: tytso: ext4 crypto: implement the ext4 encryption write path Pulls block_write_begin() into fs/ext4/inode.c because it might need to do a low-level read of the existing data, in which case we need to decrypt it. Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 2058f83a728adffbe00bded4f804b37a5ee58cbe) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321674 (cherry picked from commit 1c29decf4cdb3dbc1f4125476885ea97c9bfbd54) Reviewed-on: https://chromium-review.googlesource.com/334015 (cherry picked from commit 6fc49151593f9303efc0d41274c7b6046b5624d4) Change-Id: If8602e32c9c0b94a312f3402deac4d48d7e18197 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347641 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347641" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/41/347641/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I03f00845d86bf9b2ee1e087b18624b9bc3469e48" commit="7256a4fedee9be8f0ba015f7a951c4c3ec1c7430" commit_message="UPSTREAM: tytso: ext4 crypto: implement the ext4 decryption read path Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit c9c7429c2e486f375bddd0c338cc3ad366123717) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321675 (cherry picked from commit 64ecc07e1b988793df5a23f53eebde76b2b4c15f) Reviewed-on: https://chromium-review.googlesource.com/334025 (cherry picked from commit f54811739983038fa308e9d47fa790ca12d78f9a) Change-Id: I03f00845d86bf9b2ee1e087b18624b9bc3469e48 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347642 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347642" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/347642/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ic455ef2f36b7c00d1132d96bb9f3e063d56de784" commit="ba8bc0282be6788b7339318d7f10c36e4f2cb40e" commit_message="UPSTREAM: tytso: ext4 crypto: filename encryption facilities Signed-off-by: Uday Savagaonkar <savagaon@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit d5d0e8c7203a41c01ba05f4e053e16a94ce3c2e1) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321676 (cherry picked from commit 5938ca687d77f96abe2f8b2d74e77ac3ea422330) Reviewed-on: https://chromium-review.googlesource.com/334164 (cherry picked from commit a8956f46fb8633b1c6a970374e91c674a9818929) Change-Id: Ic455ef2f36b7c00d1132d96bb9f3e063d56de784 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347643 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347643" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/347643/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I2f20c81540d1b21e68ca561c87d2c837dde56e90" commit="a7178ec0aedf6b8f06516c8ad4215f1356dd9f11" commit_message="UPSTREAM: tytso: ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames For encrypted directories, we need to pass in a separate parameter for the decrypted filename, since the directory entry contains the encrypted filename. Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 2f61830ae33e2944ad66bb8bb40916f534b2e494) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321677 (cherry picked from commit 30b19d70ddff5d5a8c69ba3cabb1c859e5e245e1) Reviewed-on: https://chromium-review.googlesource.com/334211 (cherry picked from commit 86ee4a7f66667c2c408f50ef7a82f9ccc448d7e9) Change-Id: I2f20c81540d1b21e68ca561c87d2c837dde56e90 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347644 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347644" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/347644/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If117b24642c67a49d7df98ef7ae857d63d3459e5" commit="99d270c113dfdbb4d339cfdb0bd69241f809bf18" commit_message="UPSTREAM: tytso: ext4 crypto: insert encrypted filenames into a leaf directory block Signed-off-by: Uday Savagaonkar <savagaon@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 4bdfc873ba34e425d6532581b4127b960274272a) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321678 (cherry picked from commit cad1b169463b81c7fa77e0d2e624c8ac3791552b) Reviewed-on: https://chromium-review.googlesource.com/334202 (cherry picked from commit 825cc9cf11ae9f7264dfc7c8193ee496f46436f9) Change-Id: If117b24642c67a49d7df98ef7ae857d63d3459e5 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347645 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347645" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/347645/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I5b81eadea7c58d75e250492bb08ddc3a26360bdd" commit="a65a2da81416228c085d44f5ef2274208ac78d5f" commit_message="UPSTREAM: tytso: ext4 crypto: partial update to namei.c for fname crypto Modifies dx_show_leaf and dx_probe to support fname encryption. Filename encryption not yet enabled. Signed-off-by: Uday Savagaonkar <savagaon@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit b30984864406ad01b72eee486add103e9cb3526f) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321679 (cherry picked from commit cb039d8838c7234aa2bf9d602a2e07ac0f26d826) Reviewed-on: https://chromium-review.googlesource.com/334016 (cherry picked from commit dd43e476234da951ff7a9d2d9db786b0ad896f83) Change-Id: I5b81eadea7c58d75e250492bb08ddc3a26360bdd Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347646 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347646" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/347646/11" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If3ab0fe0c3aa1839f0e5e9c548b24566e2cf51b9" commit="dafc61d4b9bfe0c65fcd6f5782dca0476313675d" commit_message="UPSTREAM: tytso: ext4 crypto: filename encryption modifications Modifies htree_dirblock_to_tree, dx_make_map, ext4_match search_dir, and ext4_find_dest_de to support fname crypto. Filename encryption feature is not yet enabled at this patch. Signed-off-by: Uday Savagaonkar <savagaon@google.com> Signed-off-by: Ildar Muslukhov <ildarm@google.com> Signed-off-by: Michael Halcrow <mhalcrow@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 1f3862b5575b138e83080232706e37ee24b8093e) BUG=chromium:347322 TEST=Compiled, Installed on samus TEST=Test with e2fsprogs 1.43-WIP Previous-Reviewed-on: https://chromium-review.googlesource.com/321680 (cherry picked from commit 8fbe7182ad7c48b17ca4705d52337a261339bf62) Reviewed-on: https://chromium-review.googlesource.com/333996 (cherry picked from commit 0e0e04dd5788c733fc4c388fabeba382b80d0617) Change-Id: If3ab0fe0c3aa1839f0e5e9c548b24566e2cf51b9 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347647 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="0" gerrit_number="347647" owner_email="gwendal@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/347647/11" remote="cros" total_fail_count="3"/><lkgm version="8537.0.0-rc3"/></manifest> |
