From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 924E6C2D0E4 for ; Fri, 20 Nov 2020 19:12:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 398FA2240A for ; Fri, 20 Nov 2020 19:12:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="oBlTy90a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732236AbgKTTMX (ORCPT ); Fri, 20 Nov 2020 14:12:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:40180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728909AbgKTTMW (ORCPT ); Fri, 20 Nov 2020 14:12:22 -0500 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 499D22245F; Fri, 20 Nov 2020 19:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1605899541; bh=l0ufam+W3QAfMoqNJtpWVFBDfsLiis1R0pKqEwLx5u4=; h=Date:From:To:Subject:From; b=oBlTy90a3QMF38QSgJxAyP12HKljmMB+nTzLrUunI1kimy4yDIeP8fe4tU4OQg+JW ALFnA5wXpaXQCkZ9r3I6599Lo3g+/5BsrpnVbBcDAYE5uisiAM0GYs9A8wP5ZMrvSo uL7S/PcS5Yw8etQ3a7KKxmVj/jY+pCeMHB/zk4XI= Date: Fri, 20 Nov 2020 11:12:20 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org Subject: + linux-next-git-rejects.patch added to -mm tree Message-ID: <20201120191220.A2khlzHpJ%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-rejects.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/dma/idxd/device.c | 5 ----- drivers/dma/idxd/registers.h | 6 ------ drivers/dma/idxd/submit.c | 4 ---- sound/soc/intel/catpt/pcm.c | 7 ------- 4 files changed, 22 deletions(-) --- a/drivers/dma/idxd/device.c~linux-next-git-rejects +++ a/drivers/dma/idxd/device.c @@ -616,10 +616,6 @@ static int idxd_wq_config_write(struct i /* byte 8-11 */ wq->wqcfg->priv = !!(wq->type == IDXD_WQT_KERNEL); -<<<<<<< HEAD - wq->wqcfg->mode = 1; - wq->wqcfg->priority = wq->priority; -======= if (wq_dedicated(wq)) wq->wqcfg->mode = 1; @@ -634,7 +630,6 @@ static int idxd_wq_config_write(struct i if (idxd->hw.gen_cap.block_on_fault && test_bit(WQ_FLAG_BLOCK_ON_FAULT, &wq->flags)) wq->wqcfg->bof = 1; ->>>>>>> linux-next/akpm-base /* bytes 12-15 */ wq->wqcfg->max_xfer_shift = ilog2(wq->max_xfer_bytes); --- a/drivers/dma/idxd/registers.h~linux-next-git-rejects +++ a/drivers/dma/idxd/registers.h @@ -338,11 +338,8 @@ union wqcfg { u32 bits[8]; } __packed; -<<<<<<< HEAD -======= #define WQCFG_PASID_IDX 2 ->>>>>>> linux-next/akpm-base /* * This macro calculates the offset into the WQCFG register * idxd - struct idxd * @@ -361,8 +358,6 @@ union wqcfg { #define WQCFG_STRIDES(_idxd_dev) ((_idxd_dev)->wqcfg_size / sizeof(u32)) -<<<<<<< HEAD -======= #define GRPCFG_SIZE 64 #define GRPWQCFG_STRIDES 4 @@ -381,5 +376,4 @@ union wqcfg { #define GRPENGCFG_OFFSET(idxd_dev, n) ((idxd_dev)->grpcfg_offset + (n) * GRPCFG_SIZE + 32) #define GRPFLGCFG_OFFSET(idxd_dev, n) ((idxd_dev)->grpcfg_offset + (n) * GRPCFG_SIZE + 40) ->>>>>>> linux-next/akpm-base #endif --- a/drivers/dma/idxd/submit.c~linux-next-git-rejects +++ a/drivers/dma/idxd/submit.c @@ -86,12 +86,8 @@ int idxd_submit_desc(struct idxd_wq *wq, if (idxd->state != IDXD_DEV_ENABLED) return -EIO; -<<<<<<< HEAD - portal = wq->dportal; -======= portal = wq->portal; ->>>>>>> linux-next/akpm-base /* * The wmb() flushes writes to coherent DMA data before * possibly triggering a DMA read. The wmb() is necessary --- a/sound/soc/intel/catpt/pcm.c~linux-next-git-rejects +++ a/sound/soc/intel/catpt/pcm.c @@ -462,13 +462,6 @@ static int catpt_dai_prepare(struct snd_ if (ret) return CATPT_IPC_ERROR(ret); -<<<<<<< HEAD - ret = catpt_dai_apply_usettings(dai, stream); - if (ret) - return ret; - -======= ->>>>>>> linux-next/akpm-base stream->prepared = true; return 0; } _ Patches currently in -mm which might be from akpm@linux-foundation.org are kthread_worker-document-cpu-hotplug-handling-fix.patch mm.patch mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch lib-cmdline_kunit-add-a-new-test-suite-for-cmdline-api-fix.patch lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch resource-fix-kernel-doc-markups-checkpatch-fixes.patch linux-next-rejects.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch