Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13c79f65 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 01bf131a on remote branch 

Change-Id: I0adf528da07fa77c44cd392b4c81e21f5f876a23
parents 647114f9 01bf131a

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_AQFWD=y

CONFIG_SKY2=y

CONFIG_RMNET=y

CONFIG_SMSC911X=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_AQFWD=y

CONFIG_RMNET=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

arch/arm64/configs/vendor/lito-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ CONFIG_NET_ACT_MIRRED=y 
CONFIG_NET_ACT_SKBEDIT=y

CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_WAKEUP_MS=500

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y

CONFIG_BPF_JIT=y

arch/arm64/configs/vendor/lito_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ CONFIG_NET_ACT_MIRRED=y 
CONFIG_NET_ACT_SKBEDIT=y

CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_WAKEUP_MS=500

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y

CONFIG_BPF_JIT=y

block/blk-core.c

+6 −2
Original line number Diff line number Diff line
@@ -1741,9 +1741,13 @@ EXPORT_SYMBOL_GPL(part_round_stats); 
#ifdef CONFIG_PM

static void blk_pm_put_request(struct request *rq)

{

	if (rq->q->dev && !(rq->rq_flags & RQF_PM) && !--rq->q->nr_pending)

	if (rq->q->dev && !(rq->rq_flags & RQF_PM) &&

	    (rq->rq_flags & RQF_PM_ADDED)) {

		rq->rq_flags &= ~RQF_PM_ADDED;

		if (!--rq->q->nr_pending)

			pm_runtime_mark_last_busy(rq->q->dev);

	}

}

#else

static inline void blk_pm_put_request(struct request *rq) {}

#endif