| Message ID | 20221207092353.0d1df5f8@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3082336wrr;
Tue, 6 Dec 2022 14:32:27 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf7rffprVYjEPzAkWmdBS7mRfzAhM88WsfJ9y5JMfgEUXOFcOJ+6GipH6ogEgkf1P4BmE5vi
X-Received: by 2002:a17:906:c44e:b0:7c0:f213:edab with SMTP id
ck14-20020a170906c44e00b007c0f213edabmr9484565ejb.358.1670365946719;
Tue, 06 Dec 2022 14:32:26 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1670365946; cv=none;
d=google.com; s=arc-20160816;
b=CTG+jzjMJ5fm3VlRUU3Woq9/eH3qxwxQE7GiMF1PCPDEyHmA+ddQizZiNyXM6RqUXx
lLMWcOIezBssUIShrRC9eTrXDdGQ7jiGh06a0ZEdsfMqlrLFxZGmy2HtuXT0GM6FUyUQ
gdBc7jCUTqgyvsGet06waGBgdQbd5hNqgsk2l7MWMZrNiRF8ngv5SPqZ6fiFylfGvdyR
0ED6jp/MXXymIGw8ziWpKFsBwd6+rkUjWkXCfUIhkv5dQSmu2xH4JukErtFizHK1Nl+W
VYdoGr2y7KW1qYf7SlbNhn+uqAW0lEyUJxqgx9X/H7VCMiBH4DhMTwCsW5XQtdUAOlDI
6gkQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=lqNRfzgYaa3SPZu2eVsFmxAbCnMUF7h6TuLq00GT2eI=;
b=vrurLcV3wtwZ5upvZ/HCz5t3I4hB7NItuZrTcHBQ2eU1KcY6deEw9zXNPkpQ5F+QXo
miYj1yK6Zx4Mw2ms/bkbWI26NIVSSqiEF6sAWF0xolYlq6lQh+9Rf2w/iheUYH8Ibhu6
r4P65d9TSW7t+f8iAcxP4YGaTsX6EeULbZ7f1QFMgrGixcHQYuh4b0nq3cGhFoM9B+nl
kPMsTTbYtiCwstTliodOaP//j57/7vW1fBeVlf0H7FRoe7bpwWpY29z/VOh86FCQwmRT
hgzqsELmurugCyjXmwNWbjFoofakUMspx3OWRwSDci/MGDCQ3eRqfpx5Qv+GLV1YGr9S
2X9w==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=A95lawMY;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
e15-20020a17090658cf00b007c087110276si16275302ejs.151.2022.12.06.14.31.56;
Tue, 06 Dec 2022 14:32:26 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=A95lawMY;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229840AbiLFWYD (ORCPT <rfc822;b08248@gmail.com> + 99 others);
Tue, 6 Dec 2022 17:24:03 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59862 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229731AbiLFWYB (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 6 Dec 2022 17:24:01 -0500
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CAC531F94;
Tue, 6 Dec 2022 14:23:59 -0800 (PST)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4NRZhB3cb7z4xN4;
Wed, 7 Dec 2022 09:23:54 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1670365436;
bh=lqNRfzgYaa3SPZu2eVsFmxAbCnMUF7h6TuLq00GT2eI=;
h=Date:From:To:Cc:Subject:From;
b=A95lawMY9K4F8GNxvpovLh5r8yoqV9ki4zrLso/+SnDupp2ABlakDJqjJLOJW2RVp
GOIoiQ0prAUtJJZeoy/W0jglEmIMfv/ePjPjGx0TFbj0aPeXHA308Xb/nrbqAwY5+j
EL0EgrrAFPSza/eduwgXnV6x9vdW1PnvvjhtD+5xCyyV0AxfeWUlWSA6k7ZRFtDLbs
73KdWbU7lilFUStTA7SjXgzhMcH2NTLI1AHEMTVMVlk8G7gDvWdpsSprHX7Ynps26d
dOzpLQlvkOqBCrhONWAK+eaExnomn6ERyiFdEiybOtob0xQf+KD9LKvrWBY9181MKi
nQoOf+azYxOfg==
Date: Wed, 7 Dec 2022 09:23:53 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Hirokazu Honda <hiroh@chromium.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the v4l-dvb-next tree with Linus' tree
Message-ID: <20221207092353.0d1df5f8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ahfs.6cyzuPFBklWtgXRyxz";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1751505642604938481?=
X-GMAIL-MSGID: =?utf-8?q?1751505642604938481?=
|
| Series |
linux-next: manual merge of the v4l-dvb-next tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Dec. 6, 2022, 10:23 p.m. UTC
Hi all,
Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
drivers/media/common/videobuf2/frame_vector.c
between commit:
6647e76ab623 ("v4l2: don't fall back to follow_pfn() if pin_user_pages_fast() fails")
from Linus' tree and commit:
e2fc6edd37ba ("media: videobuf2: revert "get_userptr: buffers are always writable"")
from the v4l-dvb-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc drivers/media/common/videobuf2/frame_vector.c index 144027035892,aad72640f055..000000000000 --- a/drivers/media/common/videobuf2/frame_vector.c