Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp377060imm; Thu, 26 Jul 2018 21:37:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcxsrgBLEepvyZxNvA1f76TjE04raNbGQY5KIq4vdMIM2NibeA9GnYKNzXoFJhuFMDyjFWn X-Received: by 2002:a63:175b:: with SMTP id 27-v6mr4506974pgx.31.1532666277785; Thu, 26 Jul 2018 21:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532666277; cv=none; d=google.com; s=arc-20160816; b=vr6TxTATo6SYONVDajCNyWcvJ9gc8OaYqcu63YIdrzDlH+A5ImfAIFKauIa8YBUWKV GKbL7RaQjvDgNH1sZey0gqUT/XVmD8Dra+J3ff0X9WHO2Xkqvd7uqIIJlmVOrGwTupzq RW8S0SZG6fIgXebz4GysGNlcXgE6XKgdR+U2775Qxp9F/BUmHdiEEUKlZswlsOE7XSzi 1fE1c5cqGHnKZ4/6Tir9PUhh3gEUbcxOArZbpzUOT98TcYjiHsbZD15mkNPo+LY4jpXV yOg1huIcLx/6t6IYZiusHl1iOyMMT+eZ8N3wmZfhf7VWnFcYsDdrHSfwvYnkDEItf62V 5V3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:subject:cc:to :from:date:dkim-signature:arc-authentication-results; bh=EFZKjUvRQNb7XZtxcDaJoQKBPrHfPZaOpxqwjEVa+ao=; b=KgymhYgsW0yZoJ1/9Vd/4dEWtgnC+orEF3RczHzlb8VbwNqNDONVgiujTS3GYR+4el xwBk3B2pxEEeTnkWA863P1choNmjACKs4NHDAkuxEsmSxDUzpOePKhyFf2fZUaP77oBk J2tQwQsY7Ff3P0UwSxObSyy/Wf13lMVMHvjqGLo0zWE/R8+3APLlRe/zz8nVF7plZ3cV 02/AHVPuOAqsk2XsE4/5DoXecGgXaDkxzvMsYPk+dGTPL2R9jbly71LKgE2rmaaz+4dX eXZqY8t7IuufsnFqg4RJZFJ3vIUHVgo7S15OERM/M8F8p5tdhPTEmnPpHLf6fJLUK7Vw P3ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=SxlZ+wJg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g202-v6si3090481pfb.336.2018.07.26.21.37.40; Thu, 26 Jul 2018 21:37:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=SxlZ+wJg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726225AbeG0F4q (ORCPT + 99 others); Fri, 27 Jul 2018 01:56:46 -0400 Received: from ozlabs.org ([203.11.71.1]:36383 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbeG0F4q (ORCPT ); Fri, 27 Jul 2018 01:56:46 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 41cGQ33Zq5z9rxx; Fri, 27 Jul 2018 14:36:41 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1532666204; bh=WUfUuTC0USVZXJwq9TfFzxW4EkQTIt4zNAQOHf/+sXk=; h=Date:From:To:Cc:Subject:From; b=SxlZ+wJgxb5EDwlENY2LStwoKL5Y7x4ksjRlZKwR8WltrJHmjtYMJcvRbd3WUZxa6 Q7s+1+NgXlawYPMiNzxobR0j3rlVppTg0IJqJKA3kOSG1UqWo1KjFQtR6VAKAqF7oV yfB5sJ1Dkj7svvAyxMDAKXjGOxxCsdcVpdW01FZH23t//B/FX/ONpTy0H4URQahZIW IBVYuZg3SEvTlB4uDHIHD24CqI75a2p+D12JVSclG8prbpF2dRZyQWJvI0xL5Xk47x 688qaF84aF4KLUputv2YL7nUF+TKfAFzalmSR6480TOn58Idq+gxK/fPEEagCYlm1s S8KwaLfQytVMw== Date: Fri, 27 Jul 2018 14:36:40 +1000 From: Stephen Rothwell To: Dave Airlie , DRI , Mauro Carvalho Chehab Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Philipp Zabel , Steve Longerbeam Subject: linux-next: manual merge of the drm tree with the v4l-dvb tree Message-ID: <20180727143640.4dc3fa54@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/tJtDrI3UakkURF+g5o+Re61"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/tJtDrI3UakkURF+g5o+Re61 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/ipu-v3/ipu-cpmem.c between commit: 343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced = scanning") from the v4l-dvb tree and commit: 4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets for interlaced scannin= g") from the drm tree. I fixed it up (I just used the drm tree version) 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. --=20 Cheers, Stephen Rothwell --Sig_/tJtDrI3UakkURF+g5o+Re61 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltaoVgACgkQAVBC80lX 0Gw6PAf/WB4sfm81A8xuj62y9T8Kw1mNJDO7++f3WjYdlepP5s/EchZeun1kr9od qdlRuSeUFrUvk99jLYCUrbNowkULSMypUJF/vCnCvhuc6ozrc9yUjJSchnPmRiZp RVVWoHMw49pbzVlxvnd7BQkyXZhNuqyL8jpPdq/46TAXsMK+uyYmgpHebaTVBLYj tNVIc3De2BejcKrZJj0cn0AU3aRNTEGUNQ6ZFxyTal8+JarXl9ynJIiWH0ooLJTw qMlXcKRvpotzZsItP/N65RW6PJAD0AQMcImqu1bzSTCsrwKkN4zorSL8ihLG5WG9 rdGsp6MmZxtQllOHeyWkOvgRRU3WnA== =vROx -----END PGP SIGNATURE----- --Sig_/tJtDrI3UakkURF+g5o+Re61--