未経験者がカーネルのマージに挑戦 -> HTC

Post a reply

Confirmation code
Enter the code exactly as it appears. All letters are case insensitive.
Smilies
:D :) ;) :( :o :shock: :? 8-) :lol: :x :P :oops: :cry: :evil: :twisted: :roll: :!: :?: :idea: :arrow: :| :mrgreen: :geek: :ugeek:

BBCode is ON
[img] is OFF
[flash] is OFF
[url] is ON
Smilies are ON

Topic review
   

Expand view Topic review: 未経験者がカーネルのマージに挑戦 -> HTC

car sun shade provide designer medela pump in style advanced online

by VogPhagoJobia » 2019年Nov月30日(Sat) 06:53

Except in special situations, reproductive endocrinologists are not to transfer more than two embryos at a time.It is also helpful to keep in mind that honey is still primarily comprised of sugar, so if you are watching your weight during pregnancy, have been advised by a doctor to avoid excess sugar, or have a condition such as gestational diabetes, you will want to limit your sugar sources as well. How to Examine Your Cervical Mucus and also Identify Ovulation While you may think of a normal body temperature as 98.6, the truth is that your body temperature varies slightly throughout the day and month.* Have?regular menstrual cycles, varying from 21 to 35 days in length The donor and intended parents may meet, and they may agree to get together occasionally after the baby is born.This phase begins after ovulation and continues until menstruation.

Re: 未経験者がカーネルのマージに挑戦 -> HTC

by htcsoku » 2014年Feb月24日(Mon) 02:07

173210 wrote:それはさすがに無茶がありますw
おそらくLinuxカーネルのバージョン差異(3.4.10->3.4.19)に多くの変化があるとは思うのですが、それだけでもすまないような…

これはキチガイじみてる…
返信ありがとうございます><
なるほどorz 了解です、もう少し考えてみます。

scoty755 wrote:>この時点でCONFLICTが発生していない場所はマージ完了していると言う認識で大丈夫なのでしょうか・・・?
はい。その認識で合っていると思います。
ただし。board-deluxe_j.c等の機種ごとに異なるファイルは上手くマージされずに新たにファイル(この場合はboard-deluxe_j)が追加されるだけです。それについてはコミットの差分を見て手動でやってください。

というよりgit mergeでいきなりやると面倒な事になりますのでgit cherry-pick "コミットid"で地道にやるほうががいいと思います。
解像度についてもINFOBARとbutterflyでは差異がございますのでパネル系に変更があるコミットには注意です。
https://github.com/tako0910/android_422 ... 5ade5959d7

またコンフリクト解決にはテキストエディタなどでいちいちやるよりもツールを使うのが楽です。(自分はmacでSourceTree使ってやってます)
そうですよね、board類は違いますし可笑しくなるのは当然ですよね()
地道に見て行きたいと思います。
ありがとうございます><

tako0910 wrote:173210氏も言ってるけど、少なくとも、まずはLinuxカーネルのバージョンが違うので
https://github.com/tako0910/android_422 ... mmits/dlxj

git revert 6ddb3963f5
git revert 5d6a1c3840
git revert 960579fdc1
git revert 9ee15a42b7
git revert de45fc1183
git revert 482b30e0d8
git revert dc85227a6b
git revert 8797e40667

して、カーネルのバージョンを3.4.1.9->3.4.1.0に戻すべきですね。
了解です、Twitterで言われた事についてもやってみます。
ありがとうございます><

Re: 未経験者がカーネルのマージに挑戦 -> HTC

by tako0910 » 2014年Feb月23日(Sun) 22:35

173210氏も言ってるけど、少なくとも、まずはLinuxカーネルのバージョンが違うので
https://github.com/tako0910/android_422 ... mmits/dlxj

git revert 6ddb3963f5
git revert 5d6a1c3840
git revert 960579fdc1
git revert 9ee15a42b7
git revert de45fc1183
git revert 482b30e0d8
git revert dc85227a6b
git revert 8797e40667

して、カーネルのバージョンを3.4.1.9->3.4.1.0に戻すべきですね。

Re: 未経験者がカーネルのマージに挑戦 -> HTC

by scoty755 » 2014年Feb月23日(Sun) 22:30

>この時点でCONFLICTが発生していない場所はマージ完了していると言う認識で大丈夫なのでしょうか・・・?
はい。その認識で合っていると思います。
ただし。board-deluxe_j.c等の機種ごとに異なるファイルは上手くマージされずに新たにファイル(この場合はboard-deluxe_j)が追加されるだけです。それについてはコミットの差分を見て手動でやってください。

というよりgit mergeでいきなりやると面倒な事になりますのでgit cherry-pick "コミットid"で地道にやるほうががいいと思います。
解像度についてもINFOBARとbutterflyでは差異がございますのでパネル系に変更があるコミットには注意です。
https://github.com/tako0910/android_422 ... 5ade5959d7

またコンフリクト解決にはテキストエディタなどでいちいちやるよりもツールを使うのが楽です。(自分はmacでSourceTree使ってやってます)

Re: 未経験者がカーネルのマージに挑戦 -> HTC

by 173210 » 2014年Feb月23日(Sun) 22:09

それはさすがに無茶がありますw
おそらくLinuxカーネルのバージョン差異(3.4.10->3.4.19)に多くの変化があるとは思うのですが、それだけでもすまないような…

これはキチガイじみてる…

未経験者がカーネルのマージに挑戦 -> HTC

by htcsoku » 2014年Feb月23日(Sun) 21:50

INFOBAR A02のソースコードへのマージに挑戦しています。
https://github.com/fnoji/android_kernel_htc_impj

参考にしている物は以下となります。
http://android.slateblue.tk/viewtopic.php?f=19&t=40
http://www.scottish-vinegar.com/2014/02 ... %e3%81%9f/

最終的に完成させたいものはHTC Sense 5.0 Android 4.2.2向けカーネルです。

tako0910さんが完成させてくれているAndroid 4.2.2向けHTC J butterflyカーネルをベースにマージするのが一番近道・・?と感じましたので以下を利用します。
https://github.com/tako0910/android_422 ... -htc-jb_42

自分でpushしたA02の完全純正カーネルをgit cloneし、ローカルに配置した後

Code: Select all

git fetch https://github.com/tako0910/android_422_kernel_htc_dlxj.git cleaned-htc-jb_42:test_branch
git merge test_branch
にてマージをしましたが、多数CONFILICTが発生しました(当たり前ですが・・・。)
以下がCONFLICTが発生しているもの

Code: Select all

grep -lr 'test_branch * >conflict.txt
security/security.c
security/capability.c
mm/mmap.c
mm/shmem.c
mm/readahead.c
mm/page-writeback.c
mm/process_vm_access.c
mm/vmscan.c
mm/kmemleak.c
mm/page_alloc.c
mm/compaction.c
mm/rmap.c
mm/memory.c
mm/util.c
mm/maccess.c
mm/filemap.c
mm/truncate.c
fs/ramfs/inode.c
fs/ramfs/file-mmu.c
fs/nls/nls_utf8.c
fs/seq_file.c
fs/jbd2/commit.c
fs/jbd2/revoke.c
fs/jbd2/transaction.c
fs/jbd2/checkpoint.c
fs/jbd2/journal.c
fs/exec.c
fs/direct-io.c
fs/binfmt_elf.c
fs/buffer.c
fs/libfs.c
fs/open.c
fs/debugfs/file.c
fs/locks.c
fs/fat/file.c
fs/fat/inode.c
fs/fat/cache.c
fs/fat/namei_vfat.c
fs/fat/misc.c
fs/fat/dir.c
fs/proc/base.c
fs/super.c
fs/fifo.c
fs/internal.h
fs/ext4/move_extent.c
fs/ext4/page-io.c
fs/ext4/mballoc.h
fs/ext4/file.c
fs/ext4/fsync.c
fs/ext4/namei.c
fs/ext4/inode.c
fs/ext4/extents.c
fs/ext4/ext4.h
fs/ext4/mmp.c
fs/ext4/resize.c
fs/ext4/indirect.c
fs/ext4/dir.c
fs/ext4/mballoc.c
fs/fuse/file.c
fs/fuse/inode.c
fs/eventfd.c
fs/block_dev.c
fs/Makefile
fs/sync.c
fs/select.c
fs/mpage.c
fs/Kconfig
fs/fs-writeback.c
fs/ioctl.c
fs/namespace.c
fs/bio.c
lib/idr.c
lib/zlib_deflate/deftree.c
lib/zlib_deflate/deflate.c
lib/bitmap.c
lib/vsprintf.c
lib/zlib_inflate/inflate.c
lib/proportions.c
arch/powerpc/lib/code-patching.c
arch/arm/mm/flush.c
arch/arm/mm/mmu.c
arch/arm/mm/fault-armv.c
arch/arm/mm/alignment.c
arch/arm/mm/fault.c
arch/arm/common/gic.c
arch/arm/boot/compressed/Makefile
arch/arm/vfp/vfpsingle.c
arch/arm/vfp/Makefile
arch/arm/vfp/vfpdouble.c
arch/arm/mach-msm/dma.c
arch/arm/mach-msm/cache_erp.c
arch/arm/mach-msm/clock.h
arch/arm/mach-msm/htc_monitor.c
arch/arm/mach-msm/mdm2.c
arch/arm/mach-msm/htc_headset_mgr.c
arch/arm/mach-msm/cpufreq.c
arch/arm/mach-msm/msm_bus/msm_bus_rpm.c
arch/arm/mach-msm/msm_rtb.c
arch/arm/mach-msm/msm_watchdog.c
arch/arm/mach-msm/htc_acoustic_8960.c
arch/arm/mach-msm/modem-8960.c
arch/arm/mach-msm/htc_battery_core.c
arch/arm/mach-msm/clock-8960.c
arch/arm/mach-msm/htc_headset_one_wire.c
arch/arm/mach-msm/rpm_resources.h
arch/arm/mach-msm/pil-riva.c
arch/arm/mach-msm/htc_sdservice.c
arch/arm/mach-msm/pm-data.c
arch/arm/mach-msm/mdm_common.c
arch/arm/mach-msm/pm-8x60.c
arch/arm/mach-msm/rpm.c
arch/arm/mach-msm/htc_battery_8960.c
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
arch/arm/mach-msm/include/mach/htc_util.h
arch/arm/mach-msm/include/mach/socinfo.h
arch/arm/mach-msm/include/mach/camera.h
arch/arm/mach-msm/include/mach/msm_iomap-8930.h
arch/arm/mach-msm/include/mach/msm_smd.h
arch/arm/mach-msm/include/mach/htc_headset_mgr.h
arch/arm/mach-msm/include/mach/board_htc.h
arch/arm/mach-msm/include/mach/mdm2.h
arch/arm/mach-msm/include/mach/restart.h
arch/arm/mach-msm/include/mach/subsystem_restart.h
arch/arm/mach-msm/include/mach/board.h
arch/arm/mach-msm/include/mach/htc_battery_core.h
arch/arm/mach-msm/include/mach/panel_id.h
arch/arm/mach-msm/include/mach/htc_usb.h
arch/arm/mach-msm/include/mach/dma.h
arch/arm/mach-msm/include/mach/iommu.h
arch/arm/mach-msm/include/mach/htc_gauge.h
arch/arm/mach-msm/include/mach/scm.h
arch/arm/mach-msm/include/mach/gpio.h
arch/arm/mach-msm/include/mach/gpiomux.h
arch/arm/mach-msm/include/mach/usbdiag.h
arch/arm/mach-msm/include/mach/msm_iomap.h
arch/arm/mach-msm/include/mach/irqs-8064.h
arch/arm/mach-msm/include/mach/sdio_cmux.h
arch/arm/mach-msm/include/mach/msm_watchdog.h
arch/arm/mach-msm/include/mach/htc_charger.h
arch/arm/mach-msm/include/mach/htc_acoustic_8960.h
arch/arm/mach-msm/include/mach/sps.h
arch/arm/mach-msm/include/mach/msm_serial_hs.h
arch/arm/mach-msm/include/mach/mhl.h
arch/arm/mach-msm/include/mach/htc_restart_handler.h
arch/arm/mach-msm/include/mach/cable_detect.h
arch/arm/mach-msm/qdsp6v2/rtac.c
arch/arm/mach-msm/pm.h
arch/arm/mach-msm/display/Makefile
arch/arm/mach-msm/restart-apq8064.c
arch/arm/mach-msm/headsmp.S
arch/arm/mach-msm/htc_awb_cal.c
arch/arm/mach-msm/sysmon.h
arch/arm/mach-msm/Makefile
arch/arm/mach-msm/rpm_log.c
arch/arm/mach-msm/msm_rq_stats.c
arch/arm/mach-msm/smd_tty.c
arch/arm/mach-msm/htc_util.c
arch/arm/mach-msm/idle-v7.S
arch/arm/mach-msm/htc_debug.c
arch/arm/mach-msm/devices-8064.c
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/Makefile.boot
arch/arm/mach-msm/mdm_private.h
arch/arm/mach-msm/socinfo.c
arch/arm/mach-msm/devices_htc.c
arch/arm/mach-msm/perflock.c
arch/arm/mach-msm/htc_restart_handler.c
arch/arm/mach-msm/hsic_sysmon.c
arch/arm/mach-msm/scm.c
arch/arm/mach-msm/sysmon.c
arch/arm/mach-msm/devices.h
arch/arm/mach-msm/htc_drm.c
arch/arm/mach-msm/emmc_partitions.c
arch/arm/mach-msm/devices-8960.c
arch/arm/mach-msm/subsystem_restart.c
arch/arm/mach-msm/platsmp.c
arch/arm/include/asm/fiq.h
arch/arm/include/asm/user.h
arch/arm/include/asm/mach/mmc.h
arch/arm/include/asm/dma-mapping.h
arch/arm/include/asm/dma.h
arch/arm/include/asm/stackprotector.h
arch/arm/include/asm/setup.h
arch/arm/include/asm/tlbflush.h
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/module.h
arch/arm/kernel/return_address.c
arch/arm/kernel/module.c
arch/arm/kernel/perf_event_v6.c
arch/arm/kernel/signal.c
arch/arm/kernel/ftrace.c
arch/arm/kernel/insn.h
arch/arm/tools/mach-types
include/linux/mmc/sdio_func.h
include/linux/mmc/host.h
include/linux/mmc/card.h
include/linux/mmc/mmc.h
include/linux/mm.h
include/linux/netfilter_ipv6/ip6t_ipv6header.h
include/linux/slimbus/slimbus.h
include/linux/u64_stats_sync.h
include/linux/htc_flashlight.h
include/linux/mtd/nand.h
include/linux/mtd/bbm.h
include/linux/mtd/mtd.h
include/linux/jbd_common.h
include/linux/bsg.h
include/linux/fsnotify.h
include/linux/blkdev.h
include/linux/netdevice.h
include/linux/skbuff.h
include/linux/cm3629.h
include/linux/perf_event.h
include/linux/blk_types.h
include/linux/msm_tsens.h
include/linux/vt.h
include/linux/ion.h
include/linux/netfilter/x_tables.h
include/linux/resource.h
include/linux/highuid.h
include/linux/taskstats.h
include/linux/task_io_accounting.h
include/linux/cgroup.h
include/linux/ring_buffer.h
include/linux/i2c.h
include/linux/diagchar.h
include/linux/kmemcheck.h
include/linux/if_ether.h
include/linux/jbd2.h
include/linux/seq_file.h
include/linux/backing-dev.h
include/linux/fdtable.h
include/linux/elevator.h
include/linux/sched.h
include/linux/leds-pm8xxx.h
include/linux/mfd/pm8xxx/pm8921-bms.h
include/linux/mfd/pm8xxx/regulator.h
include/linux/mfd/pm8xxx/pm8921-charger.h
include/linux/mfd/pm8xxx/vibrator.h
include/linux/mfd/pm8xxx/pm8921.h
include/linux/mfd/wcd9xxx/wcd9xxx-slimslave.h
include/linux/sysctl.h
include/linux/slab.h
include/linux/msm_vidc_enc.h
include/linux/gfp.h
include/linux/pm.h
include/linux/usb/gadget.h
include/linux/usb/hcd.h
include/linux/usb/ehci_def.h
include/linux/usb/f_mtp.h
include/linux/usb/ch9.h
include/linux/msm_mdp.h
include/linux/rmi.h
include/linux/compiler.h
include/linux/pm_runtime.h
include/linux/leds-pm8038.h
include/linux/ieee80211.h
include/linux/leds-pm8921.h
include/linux/mpu.h
include/linux/videodev2.h
include/linux/relay.h
include/linux/keychord.h
include/linux/i2c/smb349.h
include/linux/dmaengine.h
include/linux/mtio.h
include/linux/msm_charm.h
include/linux/gpio_event.h
include/linux/tty_driver.h
include/linux/regset.h
include/linux/cdrom.h
include/linux/synaptics_i2c_rmi.h
include/linux/ptrace.h
include/linux/moduleparam.h
include/linux/writeback.h
include/linux/spi/spi.h
include/linux/ethtool.h
include/linux/zlib.h
include/linux/rmap.h
include/linux/uaccess.h
include/linux/fs.h
include/linux/wireless.h
include/linux/acct.h
include/linux/rwsem.h
include/linux/htc_mode_server.h
include/linux/page-flags.h
include/linux/fb.h
include/linux/nl80211.h
include/linux/smux.h
include/linux/buffer_head.h
include/linux/usb.h
include/linux/mmzone.h
include/linux/list.h
include/linux/module.h
include/linux/regmap.h
include/linux/msm_kgsl.h
include/scsi/scsi_cmnd.h
include/scsi/sg.h
include/media/videobuf2-msm-mem.h
include/media/msm/vcd_property.h
include/media/videobuf2-core.h
include/media/tuner-types.h
include/media/msm_isp.h
include/media/msm_camera.h
include/asm-generic/mman-common.h
include/asm-generic/siginfo.h
include/sound/pcm.h
include/sound/q6adm.h
include/sound/compress_driver.h
include/sound/q6asm.h
include/sound/apr_audio.h
include/trace/events/mmcio.h
include/net/dst.h
include/net/inet_hashtables.h
include/net/xfrm.h
include/net/dsfield.h
include/net/bluetooth/hci_core.h
include/net/cfg80211.h
scripts/setlocalversion
scripts/basic/fixdep.c
scripts/dtc/libfdt/libfdt.h
Makefile
kernel/workqueue.c
kernel/resource.c
kernel/printk.c
kernel/sched/sched.h
kernel/sched/core.c
kernel/sched/rt.c
kernel/sched/fair.c
kernel/sys.c
kernel/cgroup.c
kernel/exit.c
kernel/panic.c
kernel/fork.c
kernel/posix-timers.c
kernel/futex.c
kernel/smp.c
kernel/signal.c
kernel/power/earlysuspend.c
kernel/power/main.c
kernel/power/Kconfig
kernel/power/suspend.c
kernel/power/htc_pnpmgr.c
kernel/rwsem.c
kernel/time/ntp.c
kernel/sysctl.c
kernel/events/core.c
kernel/trace/trace_functions.c
kernel/trace/ring_buffer.c
kernel/trace/trace.c
kernel/trace/trace_selftest_dynamic.c
kernel/trace/ftrace.c
kernel/trace/trace_functions_graph.c
kernel/Kconfig.locks
sound/soc/msm/msm-pcm-afe.c
sound/soc/msm/msm-pcm-lpa.c
sound/soc/msm/msm-compr-q6.h
sound/soc/msm/msm-dai-stub.c
sound/soc/msm/msm-compr-q6.c
sound/soc/msm/msm-dai-fe.c
sound/soc/msm/qdsp6/q6adm.c
sound/soc/msm/qdsp6/q6voice.h
sound/soc/msm/qdsp6/q6afe.c
sound/soc/msm/qdsp6/q6asm.c
sound/soc/msm/qdsp6/q6voice.c
sound/soc/msm/msm-pcm-q6.c
sound/soc/msm/msm-pcm-voip.c
sound/soc/msm/Makefile
sound/soc/msm/msm-pcm-voice.h
sound/soc/msm/msm-pcm-routing.c
sound/soc/msm/msm-dai-q6.c
sound/soc/msm/msm-multi-ch-pcm-q6.c
sound/soc/msm/Kconfig
sound/soc/msm/msm-pcm-voice.c
sound/soc/msm/msm-pcm-routing.h
sound/soc/msm/msm-dai-q6-hdmi.c
sound/soc/soc-pcm.c
sound/soc/soc-io.c
sound/soc/codecs/wcd9304.c
sound/soc/codecs/wcd9310.c
sound/soc/codecs/cs8427.c
sound/usb/endpoint.c
sound/core/pcm_native.c
block/Kconfig.iosched
block/blk-settings.c
block/elevator.c
block/Makefile
block/blk-core.c
block/cfq-iosched.c
net/unix/af_unix.c
net/ipv4/ip_sockglue.c
net/ipv4/netfilter/ip_tables.c
net/ipv4/tcp_output.c
net/ipv4/inet_connection_sock.c
net/ipv4/fib_trie.c
net/ipv4/tcp.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_core.c
net/netfilter/xt_socket.c
net/ipv6/netfilter/ip6_tables.c
net/ipv6/netfilter/ip6t_ipv6header.c
net/ipv6/af_inet6.c
net/ipv6/datagram.c
net/wireless/core.h
net/wireless/nl80211.c
net/wireless/util.c
net/socket.c
net/bluetooth/hci_event.c
net/bluetooth/mgmt.c
net/bluetooth/hidp/core.c
net/bluetooth/hci_conn.c
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/hidbrcm/bthid.c
net/bluetooth/af_bluetooth.c
net/core/skbuff.c
net/core/filter.c
net/core/neighbour.c
net/core/link_watch.c
net/core/dst.c
drivers/mmc/host/msm_sdcc.c
drivers/mmc/host/msm_sdcc_dml.c
drivers/mmc/host/msm_sdcc.h
drivers/mmc/card/block.c
drivers/mmc/core/host.c
drivers/mmc/core/sdio_io.c
drivers/mmc/core/mmc.c
drivers/mmc/core/bus.c
drivers/mmc/core/core.c
drivers/mmc/core/sdio.c
drivers/mmc/core/sd_ops.c
drivers/mmc/core/sd.c
drivers/mmc/core/Kconfig
drivers/iommu/Kconfig
drivers/iommu/msm_iommu.c
drivers/slimbus/slimbus.c
drivers/slimbus/slim-msm-ctrl.c
drivers/tty/tty_ioctl.c
drivers/tty/tty_io.c
drivers/tty/sysrq.c
drivers/tty/Makefile
drivers/tty/Kconfig
drivers/tty/serial/msm_serial_hs_brcm.c
drivers/tty/serial/serial_core.c
drivers/tty/serial/Kconfig
drivers/tty/serial/msm_serial_hs_lite.c
drivers/tty/serial/msm_serial_hs.c
drivers/misc/pmem.c
drivers/misc/mpu3050/slaveirq.h
drivers/misc/mpu3050/slaveirq.c
drivers/misc/mpu3050/accel/bma250.c
drivers/misc/mpu3050/mpu-dev.c
drivers/misc/mpu3050/mldl_cfg.c
drivers/misc/pm8xxx-vibrator.c
drivers/misc/cable_detect_8xxx.c
drivers/gpu/msm/adreno_a2xx_snapshot.c
drivers/gpu/msm/kgsl_sharedmem.c
drivers/gpu/msm/kgsl_pwrctrl.h
drivers/gpu/msm/z180.h
drivers/gpu/msm/adreno_a2xx_trace.h
drivers/gpu/msm/adreno_a2xx.c
drivers/gpu/msm/adreno.c
drivers/gpu/msm/kgsl_log.h
drivers/gpu/msm/adreno_ringbuffer.c
drivers/gpu/msm/z180.c
drivers/gpu/msm/adreno_a3xx_trace.c
drivers/gpu/msm/kgsl.c
drivers/gpu/msm/kgsl.h
drivers/gpu/msm/adreno_postmortem.c
drivers/gpu/msm/kgsl_pwrscale.c
drivers/gpu/msm/adreno_ringbuffer.h
drivers/gpu/msm/kgsl_mmu.c
drivers/gpu/msm/kgsl_pwrscale_trustzone.c
drivers/gpu/msm/kgsl_iommu.c
drivers/gpu/msm/kgsl_mmu.h
drivers/gpu/msm/kgsl_gpummu.c
drivers/gpu/msm/kgsl_iommu.h
drivers/gpu/msm/kgsl_gpummu.h
drivers/gpu/msm/Makefile
drivers/gpu/msm/adreno_a3xx_trace.h
drivers/gpu/msm/kgsl_snapshot.h
drivers/gpu/msm/adreno_debugfs.c
drivers/gpu/msm/z180_reg.h
drivers/gpu/msm/adreno_a3xx.c
drivers/gpu/msm/Kconfig
drivers/gpu/msm/a2xx_reg.h
drivers/gpu/msm/z180_trace.c
drivers/gpu/msm/kgsl_pwrctrl.c
drivers/gpu/msm/adreno_pm4types.h
drivers/gpu/msm/kgsl_debugfs.h
drivers/gpu/msm/adreno_snapshot.c
drivers/gpu/msm/adreno_a2xx_trace.c
drivers/gpu/msm/kgsl_trace.h
drivers/gpu/msm/adreno_drawctxt.h
drivers/gpu/msm/kgsl_cffdump.h
drivers/gpu/msm/kgsl_trace.c
drivers/gpu/msm/kgsl_pwrscale.h
drivers/gpu/msm/kgsl_debugfs.c
drivers/gpu/msm/adreno_drawctxt.c
drivers/gpu/msm/a3xx_reg.h
drivers/gpu/msm/kgsl_device.h
drivers/gpu/msm/z180_trace.h
drivers/gpu/msm/kgsl_sharedmem.h
drivers/gpu/msm/adreno_a3xx_snapshot.c
drivers/gpu/msm/adreno.h
drivers/gpu/msm/kgsl_snapshot.c
drivers/gpu/ion/msm/msm_ion.c
drivers/gpu/ion/ion.c
drivers/gpu/Makefile
drivers/scsi/sd.c
drivers/scsi/constants.c
drivers/scsi/scsi_error.c
drivers/mfd/pm8921-core.c
drivers/mfd/pm8038-core.c
drivers/mfd/wcd9xxx-slimslave.c
drivers/mfd/wcd9xxx-core.c
drivers/mfd/pm8xxx-debug.c
drivers/media/common/tuners/xc4000.h
drivers/media/common/tuners/tda18271-common.c
drivers/media/rc/lirc_dev.c
drivers/media/rc/keymaps/rc-encore-enltv2.c
drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c
drivers/media/video/msm/msm_vfe32.h
drivers/media/video/msm/msm.c
drivers/media/video/msm/msm_mem.c
drivers/media/video/msm/io/msm_io_util.c
drivers/media/video/msm/io/msm_camera_i2c.c
drivers/media/video/msm/io/msm_camera_i2c.h
drivers/media/video/msm/msm.h
drivers/media/video/msm/sensors/ov2722_v4l2.c
drivers/media/video/msm/sensors/s5k3h2yx_v4l2.c
drivers/media/video/msm/sensors/msm_sensor.c
drivers/media/video/msm/sensors/Makefile
drivers/media/video/msm/sensors/imx175_v4l2.c
drivers/media/video/msm/sensors/imx091_v4l2.c
drivers/media/video/msm/sensors/ar0260_v4l2.c
drivers/media/video/msm/sensors/msm_sensor.h
drivers/media/video/msm/wfd/enc-subdev.c
drivers/media/video/msm/wfd/enc-subdev.h
drivers/media/video/msm/wfd/wfd-ioctl.c
drivers/media/video/msm/flash.c
drivers/media/video/msm/Makefile
drivers/media/video/msm/msm_mctl.c
drivers/media/video/msm/actuators/ad5816_act.c
drivers/media/video/msm/actuators/msm_actuator.c
drivers/media/video/msm/actuators/ad5823_act.c
drivers/media/video/msm/actuators/s5k3h2yx_act.c
drivers/media/video/msm/actuators/Makefile
drivers/media/video/msm/actuators/msm_actuator.h
drivers/media/video/msm/actuators/ti201_act.c
drivers/media/video/msm/rawchip/rawchip_spi.c
drivers/media/video/msm/rawchip/Yushan_API.h
drivers/media/video/msm/rawchip/Yushan_Platform_Specific.c
drivers/media/video/msm/rawchip/rawchip.c
drivers/media/video/msm/rawchip/Makefile
drivers/media/video/msm/rawchip/Yushan_HTC_Functions.h
drivers/media/video/msm/rawchip/rawchip.h
drivers/media/video/msm/rawchip/Yushan_API.c
drivers/media/video/msm/rawchip/Yushan_HTC_Functions.c
drivers/media/video/msm/rawchip/Yushan_Platform_Specific.h
drivers/media/video/msm/Kconfig
drivers/media/video/msm/msm_vfe32.c
drivers/media/video/msm/msm_mctl_buf.c
drivers/media/video/msm/msm_isp.c
drivers/media/video/msm/msm_vpe.c
drivers/media/video/msm/csi/msm_csid.c
drivers/media/video/msm/csi/msm_csid.h
drivers/media/video/msm/csi/msm_csiphy.c
drivers/media/video/videobuf2-core.c
drivers/media/video/Makefile
drivers/media/video/videobuf2-msm-mem.c
drivers/char/msm_rotator.c
drivers/char/diag/diagmem.h
drivers/char/diag/diagfwd_smux.h
drivers/char/diag/diagmem.c
drivers/char/diag/diag_dci.h
drivers/char/diag/diagchar.h
drivers/char/diag/diagfwd_hsic.c
drivers/char/diag/diag_dci.c
drivers/char/diag/diagfwd_smux.c
drivers/char/diag/Makefile
drivers/char/diag/diagchar_core.c
drivers/char/diag/diagfwd.c
drivers/char/diag/diagfwd_cntl.c
drivers/char/diag/diagfwd_hsic.h
drivers/char/diag/Kconfig
drivers/char/diag/diagfwd_cntl.h
drivers/char/diag/diagfwd.h
drivers/char/hw_random/msm_rng.c
drivers/rtc/alarm.c
drivers/rtc/rtc-pm8xxx.c
drivers/usb/misc/diag_bridge.c
drivers/usb/misc/mdm_data_bridge.c
drivers/usb/gadget/android.c
drivers/usb/gadget/f_mtp.c
drivers/usb/gadget/u_xpst.c
drivers/usb/gadget/ci13xxx_udc.h
drivers/usb/gadget/u_ctrl_hsuart.c
drivers/usb/gadget/u_data_hsic.c
drivers/usb/gadget/u_ether.h
drivers/usb/gadget/htc_attr.c
drivers/usb/gadget/u_ether.c
drivers/usb/gadget/f_diag.c
drivers/usb/gadget/composite.c
drivers/usb/gadget/u_data_hsuart.c
drivers/usb/gadget/ci13xxx_udc.c
drivers/usb/gadget/u_serial.c
drivers/usb/gadget/f_serial.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/f_mass_storage.c
drivers/usb/gadget/f_ncm.c
drivers/usb/gadget/f_projector.c
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-msm-hsic.c
drivers/usb/host/ehci-mem.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/core/message.c
drivers/usb/core/driver.c
drivers/usb/otg/msm_otg.c
drivers/usb/storage/transport.c
drivers/usb/storage/unusual_devs.h
drivers/usb/storage/alauda.c
drivers/usb/storage/sddr09.c
drivers/usb/storage/shuttle_usbat.c
drivers/usb/serial/usb_wwan.c
drivers/usb/serial/qcserial.c
drivers/usb/serial/generic.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/cpufreq/cpufreq_userspace.c
drivers/platform/msm/sps/bam.c
drivers/platform/msm/sps/sps_bam.h
drivers/platform/msm/sps/sps_dma.c
drivers/platform/msm/sps/bam.h
drivers/thermal/msm8960_tsens.c
drivers/power/pm8921-bms-htc.c
drivers/power/pm8921-charger-htc.c
drivers/input/misc/gpio_input.c
drivers/input/misc/gpio_event.c
drivers/input/misc/Kconfig
drivers/input/keyboard/atkbd.c
drivers/input/touchscreen/synaptics_3200.c
drivers/input/touchscreen/rmi_dev.c
drivers/gpio/gpio-msm-common.c
drivers/gpio/gpiolib.c
drivers/i2c/i2c-core.c
drivers/i2c/chips/r3gd20.c
drivers/i2c/chips/pn544.c
drivers/i2c/chips/cm3629.c
drivers/i2c/chips/tfa9887.c
drivers/i2c/chips/Makefile
drivers/i2c/chips/rt5501.c
drivers/i2c/chips/bma250_bosch.c
drivers/i2c/chips/Kconfig
drivers/i2c/chips/akm8963.c
drivers/i2c/i2c-dev.c
drivers/i2c/busses/i2c-qup.c
drivers/staging/android/binder.c
drivers/staging/android/lowmemorykiller.c
drivers/staging/android/ram_console_htc.c
drivers/staging/android/Kconfig
drivers/staging/android/logger.c
drivers/staging/qcache/qcache-main.c
drivers/staging/qcache/fmem.c
drivers/staging/qcache/tmem.c
drivers/hwmon/pm8xxx-adc.c
drivers/video/msm/mdp4_overlay_dsi_cmd.c
drivers/video/msm/msm_fb_panel.h
drivers/video/msm/mipi_dsi.h
drivers/video/msm/msm_fb.c
drivers/video/msm/mddihost.h
drivers/video/msm/msm_dss_io_8960.c
drivers/video/msm/mdp4_overlay_dsi_video.c
drivers/video/msm/mdp4.h
drivers/video/msm/mdp_dma_s.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp4_wfd_writeback_panel.c
drivers/video/msm/Makefile
drivers/video/msm/mdp4_wfd_writeback_util.h
drivers/video/msm/mipi_dsi.c
drivers/video/msm/mdp.h
drivers/video/msm/mdp4_overlay_lcdc.c
drivers/video/msm/msm_fb.h
drivers/video/msm/mipi_novatek.c
drivers/video/msm/mdp_dma.c
drivers/video/msm/vidc/common/enc/venc.c
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
drivers/video/msm/vidc/1080p/ddl/vidc.h
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
drivers/video/msm/vidc/1080p/ddl/vidc.c
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
drivers/video/msm/Kconfig
drivers/video/msm/mipi_dsi_host.c
drivers/video/msm/mddihosti.h
drivers/video/msm/lvds_chimei_wxga.c
drivers/video/msm/sii9234/sii9234.c
drivers/video/msm/sii9234/mhltx_rcptable.c
drivers/video/msm/sii9234/TPI.c
drivers/video/msm/sii9234/mhl_defs.h
drivers/video/msm/hdmi_msm.c
drivers/video/msm/mdp4_overlay_writeback.c
drivers/video/msm/mipi_tc358764_dsi2lvds.c
drivers/video/msm/mdp4_dtv.c
drivers/video/msm/mipi_orise.c
drivers/video/msm/mdp4_overlay.c
drivers/video/msm/mdp4_overlay_dtv.c
drivers/video/msm/external_common.c
drivers/video/msm/mdp4_util.c
drivers/video/fbmem.c
drivers/video/Kconfig
drivers/regulator/pm8xxx-regulator.c
drivers/leds/Kconfig
drivers/leds/tps61310_flashlight.c
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c
drivers/base/firmware_class.c
drivers/base/power/sysfs.c
drivers/base/power/runtime.c
drivers/block/brd.c
drivers/spi/spi_qsd.c
drivers/spi/spi.c
drivers/net/dummy.c
drivers/net/phy/phy.c
drivers/net/slip/slip.c
drivers/net/wireless/bcmdhd_4335/Makefile
drivers/net/wireless/Kconfig
drivers/net/wireless/bcmdhd_4330/Makefile
drivers/net/wireless/bcmdhd_4334/dhd_custom_gpio.c
drivers/net/wireless/bcmdhd_4334/wldev_common.h
drivers/net/wireless/bcmdhd_4334/dhd_sdio.c
drivers/net/wireless/bcmdhd_4334/include/hndrte_cons.h
drivers/net/wireless/bcmdhd_4334/include/wlioctl.h
drivers/net/wireless/bcmdhd_4334/include/dhdioctl.h
drivers/net/wireless/bcmdhd_4334/include/bcm_mpool_pub.h
drivers/net/wireless/bcmdhd_4334/wldev_common.c
drivers/net/wireless/bcmdhd_4334/wl_cfgp2p.c
drivers/net/wireless/bcmdhd_4334/bcmsdh_sdmmc.c
drivers/net/wireless/bcmdhd_4334/Makefile
drivers/net/wireless/bcmdhd_4334/wl_android.c
drivers/net/wireless/bcmdhd_4334/wl_cfg80211.c
drivers/net/wireless/bcmdhd_4334/dhd_linux.c
drivers/net/wireless/bcmdhd_4334/wl_iw.c
drivers/net/wireless/bcmdhd_4334/dhd_common.c
drivers/net/usb/rmnet_usb_data.c
drivers/net/usb/rmnet_usb_ctrl.c
drivers/net/usb/cdc_subset.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/usbnet.c
drivers/net/ethernet/msm/msm_rmnet_bam.c
drivers/net/ethernet/smsc/smc91x.c
drivers/net/ppp/ppp_mppe.c
drivers/net/wimax/Kconfig
init/main.c
init/version.c
.git/logs/refs/heads/test_branch
.git/MERGE_MSG
この時点でCONFLICTが発生していない場所はマージ完了していると言う認識で大丈夫なのでしょうか・・・?
Android 4.2.2システムでは動作しませんでしたが、一応このままビルドを試した結果、エラーなしでビルド完了しました。

後はhomuhomuさんのトピック通りに上のCONFLICTが発生している部分を一つ一つ当たって行けば完了って認識で大丈夫なんでしょうか><
宜しくお願いします。

Top