Merging needed Motorola additions into MMI-U1SSMS34.31-64-4-4 kernel

gistfile1.txt

# clone kernel-msm
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm --single-branch

#############################
# codelinaro
git clone https://git.codelinaro.org/clo/la/kernel/msm-5.4.git --branch kernel.lnx.5.4.r3-rel --single-branch kernel-codelinaro-5.4-r3
# revert codelinaro commits to solve rebase conflicts with moto kernel
# moto has slightly different version of codelinaro commit
# https://github.com/MotorolaMobilityLLC/kernel-msm/commit/483961db6f0054b1c75bbc61fa052782826ef382
git revert acf2f0eb6a4aabcfae75f869af836cdc30f29419 --no-edit
# prevent conflict with moto commit
# https://github.com/MotorolaMobilityLLC/kernel-msm/commit/adef11527df8cdeed539fc370ba1ddb09a4c68bd
git revert e46fa2494859f4774f64d067816eedcf10d767d6 --no-edit
git fetch codelinaro
git rebase codelinaro/kernel.lnx.5.4.r3-rel
git remote remove codelinaro

#############################
# camera
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-camera.git
checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory techpack/camera/
#
git remote add -f techpack-camera_local ../kernel-msm-5.4-techpack-camera
git fetch techpack-camera_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-camera_local/MMI-U1SSMS34.31-64-4-4
git remote remove techpack-camera_local

#############################
# audio
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-audio.git
checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory techpack/audio/
#
git remote add -f techpack-audio_local ../kernel-msm-5.4-techpack-audio
git fetch techpack-audio_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-audio_local/MMI-U1SSMS34.31-64-4-4
git remote remove techpack-audio_local

#############################
# video
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-video.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory techpack/video/
#
git remote add -f techpack-video_local ../kernel-msm-5.4-techpack-video
git fetch techpack-video_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-video_local/MMI-U1SSMS34.31-64-4-4
git remote remove techpack-video_local

#############################
# display
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm-5.4-techpack-display.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory techpack/display/
#
git remote add -f techpack-display_local ../kernel-msm-5.4-techpack-display
git fetch techpack-display_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-display_local/MMI-U1SSMS34.31-64-4-4
git remote remove techpack-display_local

#############################
# dataipa
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-msm-techpack-dataipa.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory techpack/dataipa/
#
git remote add -f techpack-dataipa_local ../kernel-msm-techpack-dataipa
git fetch techpack-dataipa_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-dataipa_local/MMI-U1SSMS34.31-64-4-4
git remote remove techpack-dataipa_local

#############################
# datarmnet-ext
git clone --branch android-14-release-u3ux34.56-34-6 https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-datarmnet-ext.git
git checkout -b android-14-release-u3ux34.56-34-6
git filter-repo --force --to-subdirectory techpack/datarmnet-ext/
#
git remote add -f techpack-datarmnet-ext_local ../vendor-qcom-opensource-datarmnet-ext
git fetch techpack-datarmnet-ext_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-datarmnet-ext_local/android-14-release-u3ux34.56-34-6
git remote remove techpack-datarmnet-ext_local

#############################
# datarmnet
git clone --branch android-14-release-u3ux34.56-34-6 https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-datarmnet.git
git checkout -b android-14-release-u3ux34.56-34-6
git filter-repo --force --to-subdirectory techpack/datarmnet/
#
git remote add -f techpack-datarmnet_local ../vendor-qcom-opensource-datarmnet
git fetch techpack-datarmnet_local --no-tags
git merge --no-edit --allow-unrelated-histories techpack-datarmnet_local/android-14-release-u3ux34.56-34-6
git remote remove techpack-datarmnet_local

#############################
# kernel-devicetree
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-devicetree.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory arch/arm64/boot/dts/vendor/
#
git remote add -f kerneldevicetree_local ../kernel-devicetree
git fetch kerneldevicetree_local --no-tags
git merge --no-edit --allow-unrelated-histories kerneldevicetree_local/MMI-U1SSMS34.31-64-4-4
git remote remove kerneldevicetree_local

#############################
# kernel-camera-devicetree
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-camera-devicetree.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory arch/arm64/boot/dts/vendor/qcom/camera/
git remote add -f kernelcameradevicetree_local ../kernel-camera-devicetree
git fetch kernelcameradevicetree_local --no-tags
git merge --no-edit --allow-unrelated-histories kernelcameradevicetree_local/MMI-U1SSMS34.31-64-4-4
git remote remove kernelcameradevicetree_local

#############################
# kernel-display-devicetree
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/kernel-display-devicetree.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory arch/arm64/boot/dts/vendor/qcom/
git remote add -f kerneldisplaydevicetree_local ../kernel-display-devicetree
git fetch kerneldisplaydevicetree_local --no-tags
git merge --no-edit --allow-unrelated-histories kerneldisplaydevicetree_local/MMI-U1SSMS34.31-64-4-4
git remote remove kerneldisplaydevicetree_local

# motorola-kernel-modules
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/motorola-kernel-modules
git checkout -b MMI-U1SSMS34.31-64-4-4
#
git remote add motorola-kernel-modules ../motorola-kernel-modules/
git fetch motorola-kernel-modules --no-tags
git rm sound/soc/codecs/Makefile include/linux/input/synaptics_tcm.h fs/exfat/Makefile fs/exfat/Kconfig drivers/misc/Makefile drivers/leds/trigger/Makefile Documentation/devicetree/bindings
git commit -m "remove files to prevent merge errors with motorola-kernel-modules"
git merge --no-edit --allow-unrelated-histories motorola-kernel-modules/MMI-U1SSMS34.31-64-4-4
git remote remove motorola-kernel-modules

#############################
# wlan-qcacld-3.0
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-qcacld-3.0.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory drivers/staging/qcacld-3.0/
#
git remote add -f vendor-qcom-opensource-wlan-qcacld-3.0_local ../vendor-qcom-opensource-wlan-qcacld-3.0
git fetch vendor-qcom-opensource-wlan-qcacld-3.0_local --no-tags
git merge --no-edit --allow-unrelated-histories vendor-qcom-opensource-wlan-qcacld-3.0_local/MMI-U1SSMS34.31-64-4-4
git remote remove vendor-qcom-opensource-wlan-qcacld-3.0_local

#############################
# wlan-fw-api
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-fw-api.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory drivers/staging/fw-api/
#
git remote add -f vendor-qcom-opensource-wlan-fw-api_local ../vendor-qcom-opensource-wlan-fw-api
git fetch vendor-qcom-opensource-wlan-fw-api_local --no-tags
git merge --no-edit --allow-unrelated-histories vendor-qcom-opensource-wlan-fw-api_local/MMI-U1SSMS34.31-64-4-4
git remote remove vendor-qcom-opensource-wlan-fw-api_local

#############################
# wlan-qca-wifi-host-cmn
git clone --branch MMI-U1SSMS34.31-64-4-4 https://github.com/MotorolaMobilityLLC/vendor-qcom-opensource-wlan-qca-wifi-host-cmn.git
git checkout -b MMI-U1SSMS34.31-64-4-4
git filter-repo --force --to-subdirectory drivers/staging/qca-wifi-host-cmn/
#
git remote add -f vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local ../vendor-qcom-opensource-wlan-qca-wifi-host-cmn
git fetch vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local --no-tags
git merge --no-edit --allow-unrelated-histories vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local/MMI-U1SSMS34.31-64-4-4
git remote remove vendor-qcom-opensource-wlan-qca-wifi-host-cmn_local

# END