Received: by 10.223.176.5 with SMTP id f5csp1188938wra;
        Tue, 6 Feb 2018 14:27:16 -0800 (PST)
X-Google-Smtp-Source: AH8x224HNtSJt/bosFQgxe/KN/nqB3vMZI4IP0+gJkXo4Ba+H8WVzT7c96wjoe3YfH/tot0FwYPm
X-Received: by 10.99.122.13 with SMTP id v13mr3209681pgc.128.1517956036541;
        Tue, 06 Feb 2018 14:27:16 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1517956036; cv=none;
        d=google.com; s=arc-20160816;
        b=FJbqDEKahVMNqKHnKmcLTExHbeEEghGV5WJDXtkpM3OdamrDmveEVqUX3u753FB8jR
         YL7+EksLLheJ9Exh/H0nEwH6BTMX9qg5+XbNioZJibQq6PXHaKEUSiHtOKb19Dfq/jL0
         b3DlrNKcjJ69fG6FUzHyyvpkPMEdoJqMqqQ2fmb50cSMtSDEzOYcZkDgI5z7FD2JT/zj
         use0/VfI7jx4+duzetkpdRW6G+V9fTq1bDW0CPK4egdCnxTIFMPRzXGrKUzyxjBsS0Fk
         fxJK8yQjuNugcmOO1IZBehO4TicjFpn/W1fGlXFFYJgmHD3KmxbtMIqtexVXk3TKbX9R
         DNug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:cc:to:subject:message-id:date:from
         :references:in-reply-to:mime-version:dkim-signature
         :arc-authentication-results;
        bh=hwCtgnsxCtHfjGNcy9I+ge7t7GP5g6crdni3zNjh52w=;
        b=0xOR40RkXo0Cqi+dkLW3PwZC6NPokA2znFib8g2bePNY2gkyFK/hEwuP4qBZRG0mJ9
         ZRfBFtp/yqqIc65ZzLHwgNItx214AyQePyi6rHA49CbhNN/ZSa3tMn2PbOmFtfNAS/8s
         gzUd9wBtepbRA9C4A8tDuAusRqMq/UdePBz32zw41LRYYbNfAoGnCT3cn7/zB3U2Ht82
         vVc8KWUlrVF0Oiw7yHyjzYptVJ56sr0WPly0fBAqZcDnx1CfCktC9Xy82k4rUP7NzXxH
         93dc0RJR/EBFxXxJRrepN12CQ/jz4T1uO9yJwHDrzgfvws8fjmvb63fHDZXAFt6Dap+j
         o2gQ==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=fail header.i=@gmail.com header.s=20161025 header.b=ruHLqU8b;
       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: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id m25si13565pge.363.2018.02.06.14.27.02;
        Tue, 06 Feb 2018 14:27:16 -0800 (PST)
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=fail header.i=@gmail.com header.s=20161025 header.b=ruHLqU8b;
       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 S1753618AbeBFWYo (ORCPT <rfc822;linux.htchiang@gmail.com>
        + 99 others); Tue, 6 Feb 2018 17:24:44 -0500
Received: from mail-io0-f171.google.com ([209.85.223.171]:42685 "EHLO
        mail-io0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753388AbeBFWYm (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 6 Feb 2018 17:24:42 -0500
Received: by mail-io0-f171.google.com with SMTP id 25so4196504ioj.9;
        Tue, 06 Feb 2018 14:24:42 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=mime-version:sender:in-reply-to:references:from:date:message-id
         :subject:to:cc;
        bh=hwCtgnsxCtHfjGNcy9I+ge7t7GP5g6crdni3zNjh52w=;
        b=ruHLqU8b10xd40fszoByH2/dQMR3s3nUGTPIo5wczjjJU3oywiURfzrLJ5ENCkwuzY
         yMXmMKiBUogQF2+x4z1Yrly1Dt2xr0kcZZ0Voloop8lTHL8/LIk+gN5N8OJuvL0ub0le
         99ApXDXPmz4tKnGACR6JlMOomJJCKEHJ/+T9b+917wCBdkSgIP4UwlFigsusDe05KrRF
         6YzwwQdAf3v4VeZMIPy8oI3MTfY0CGalFNB/JWhT0Y3HVXudtbpT62PASJqrfNQFnzuc
         JfcjgA9IgtdxcMZzH6bem1+o2PAIacu5fsNT09v2qXs3TcE1/1ZhI/ti6i72LTErlZyq
         rAww==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
         :date:message-id:subject:to:cc;
        bh=hwCtgnsxCtHfjGNcy9I+ge7t7GP5g6crdni3zNjh52w=;
        b=G3J4Z/7r7g1VFpJrVjWouk1KopPYNFvqoC9j/9wR36V4uLC5ztMWxCkebOEgiu/jqE
         kzN3p8xhbQ2PplDAvpGN0I5m+OnZjRRm/XXy//nOa8PEcRK2IoDDuIi1fdoS85jFuq2Q
         vA4g2E4v23ZWMlKkQvj1OLsAHX7A4H4v3YWotLWTtwqkjkhKqANZ9gqZcjXke+yLga2W
         wqy7UUj6idDtWirv7zT5o7W4Su2pYbtpc3L0yYQjKLQJB+nRy6iOJwEAUucUe8oex7cW
         7M8PxldCecqoeZEXSobzvg50obhQi+4G0V9H3WT+J4jJMx7mX4MMDEOVyAnOM4xgfBvr
         acbQ==
X-Gm-Message-State: APf1xPCacldH0FobKzmj9QV3a75oyGhP58+rQ10LhNU2lCeTZ1H1CCLU
        csIjxK0LLaJjuUZs4w1zSGjQADJdypB6BPzswyL3jQ==
X-Received: by 10.107.78.5 with SMTP id c5mr5174224iob.120.1517955881973; Tue,
 06 Feb 2018 14:24:41 -0800 (PST)
MIME-Version: 1.0
Received: by 10.107.59.196 with HTTP; Tue, 6 Feb 2018 14:24:41 -0800 (PST)
In-Reply-To: <20180207091643.6b71df0a@canb.auug.org.au>
References: <20180206091130.75c0f1ae@vento.lan> <20180207091643.6b71df0a@canb.auug.org.au>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue, 6 Feb 2018 14:24:41 -0800
X-Google-Sender-Auth: TE2OrhLOJH8yc3tL8hOxrEpIawk
Message-ID: <CA+55aFwUGSP+GpiPf=PSftpmQ4gnrbgvQG-h0jj6HKoiQ=cJTA@mail.gmail.com>
Subject: Re: [GIT PULL for v4.16-rc1] media updates
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Mauro Carvalho Chehab <mchehab@s-opensource.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Media Mailing List <linux-media@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Feb 6, 2018 at 2:16 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>      See: https://lkml.org/lkml/2018/1/1/547
>
> Looks like you missed this when doing the merge :-(

Gaah. I noticed the actual conflicts, and then didn't actually notice
that there had been some other __poll_t noise too.

Will apply your patch.

           Linus