mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
3773b3a557
* refs/heads/tmp-e709f59: Revert "ANDROID: sched/fair: prevent possible infinite loop in sched_group_energy" Revert "UPSTREAM: zram: set BDI_CAP_STABLE_WRITES once" Revert "FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl." Revert "ANDROID: sched: Add support for frequency/power energy model" ANDROID: restrict store of prefer_idle as boolean FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl. ANDROID: squashfs: resolve merge conflict with 4.14.68 UPSTREAM: xfrm: fix ptr_ret.cocci warnings UPSTREAM: xfrm: Return detailed errors from xfrmi_newlink UPSTREAM: xfrm: Allow xfrmi if_id to be updated by UPDSA UPSTREAM: xfrm: Remove xfrmi interface ID from flowi UPSTREAM: xfrm: Allow Set Mark to be Updated Using UPDSA UPSTREAM: xfrm: Add virtual xfrm interfaces UPSTREAM: xfrm: Add a new lookup key to match xfrm interfaces. UPSTREAM: flow: Extend flow informations with xfrm interface id. UPSTREAM: xfrm: Extend the output_mark to support input direction and masking. UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry BACKPORT: zram: drop max_zpage_size and use zs_huge_class_size() UPSTREAM: zsmalloc: introduce zs_huge_class_size() ANDROID: x86_64_cuttlefish_defconfig: Enable lz4 compression for zram UPSTREAM: drivers/block/zram/zram_drv.c: fix bug storing backing_dev UPSTREAM: zram: introduce zram memory tracking UPSTREAM: zram: record accessed second BACKPORT: zram: mark incompressible page as ZRAM_HUGE UPSTREAM: zram: correct flag name of ZRAM_ACCESS UPSTREAM: zram: Delete gendisk before cleaning up the request queue UPSTREAM: drivers/block/zram/zram_drv.c: make zram_page_end_io() static UPSTREAM: zram: set BDI_CAP_STABLE_WRITES once ANDROID: x86_64_cuttlefish_defconfig: Enable zram and zstd UPSTREAM: crypto: zstd - Add zstd support UPSTREAM: zram: add zstd to the supported algorithms list ANDROID: FIXUP: sched/fair: Fix hang during suspend in compute_energy ANDROID: sched/fair: prevent possible infinite loop in sched_group_energy ANDROID: sched: Add support for frequency/power energy model ANDROID: AVB error handler to invalidate vbmeta partition. ANDROID: remove android config fragments ANDROID: ftrace: fix function type mismatches Conflicts: Documentation/blockdev/zram.txt drivers/block/zram/zram_drv.c kernel/configs/android-base.config kernel/configs/android-recommended.config Change-Id: I2b4d018d19d4e2bddfdf5a7a58110d823bf1b274 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
The android-*.config files in this directory are meant to be used as a base
for an Android kernel config. All devices should have the options in
android-base.config enabled. While not mandatory, the options in
android-recommended.config enable advanced Android features.
Assuming you already have a minimalist defconfig for your device, a possible
way to enable these options would be:
ARCH=<arch> scripts/kconfig/merge_config.sh <path_to>/<device>_defconfig kernel/configs/android-base.config kernel/configs/android-recommended.config
This will generate a .config that can then be used to save a new defconfig or
compile a new kernel with Android features enabled.
Because there is no tool to consistently generate these config fragments,
lets keep them alphabetically sorted instead of random.