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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CD09C433F5 for ; Mon, 28 Mar 2022 19:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344025AbiC1Tvo (ORCPT ); Mon, 28 Mar 2022 15:51:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344149AbiC1TsP (ORCPT ); Mon, 28 Mar 2022 15:48:15 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DC2B6A04E for ; Mon, 28 Mar 2022 12:44:03 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id b43so16136757ljr.10 for ; Mon, 28 Mar 2022 12:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yY5uf81qt+1I3vTlghdpq4T8dk4DpEDuV1Evhs9S7xk=; b=akIoitYH+autCWTeAaNEldmByYC482HSaca0P9IxLJj7fsaVSfNd42H+iwcxh4GRWL aypsLEJK3ATuIaNodb8n3qOF77dMiQykxpohirj3o8IItWcLV8RMBRa48/Hr6cAlS70z hLIa9bUOCy/VZS0n8MBlAqf1WrfAC7HgAd44A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yY5uf81qt+1I3vTlghdpq4T8dk4DpEDuV1Evhs9S7xk=; b=a7WMqg+E5KL9vmCedAybXfex5P7neNQSlCRs9qotx7yA8wTn/vujbNaUVywW8rrsqD MM4C25K3YnkZfcytQiN1sW5kGC8q4TSzVJYm01n4KZ04mOo9uLwMj99k+wSQ0V8BheRe queI5NxMts8Yo0uE/0XFw8cI5sDVafoINjCFjrJJH4TSkijw3U4XRnRmcPK6Ka7CwB9d wx3nCVjw/s6wJJlZPuE/mTEZOZ+1ljwucAves9OLyNthqTvlsim9Afke9+XtaNT9cdSF Ce2fidB5qslP3Wf/kmpFixzrQ0BUYKBmUqG6bqh6iM2vPbV9BSoD/me58AIqGn2nre5c nxPg== X-Gm-Message-State: AOAM532ML5POOOiM4rKnphIgz0f6C9Uc6v3E24cCNNWx+bOQ931dDqaJ otBBOgOVabIn0s9Z9oc9DHhgwzOfdtp/YTYr5cM= X-Google-Smtp-Source: ABdhPJwt+zDgU9qgFlb5woH5sVBdWNq/SD/iLhcJ+OPBVpMDM7CWMA4f0F+ef3gxNUhZl46ZL2Wzcw== X-Received: by 2002:a2e:808d:0:b0:23e:f35:506b with SMTP id i13-20020a2e808d000000b0023e0f35506bmr22000998ljg.285.1648496636653; Mon, 28 Mar 2022 12:43:56 -0700 (PDT) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com. [209.85.208.181]) by smtp.gmail.com with ESMTPSA id k12-20020a0565123d8c00b0044a3528a3cdsm1720151lfv.208.2022.03.28.12.43.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Mar 2022 12:43:56 -0700 (PDT) Received: by mail-lj1-f181.google.com with SMTP id v12so7944496ljd.3 for ; Mon, 28 Mar 2022 12:43:56 -0700 (PDT) X-Received: by 2002:a05:651c:1213:b0:247:e2d9:cdda with SMTP id i19-20020a05651c121300b00247e2d9cddamr22434723lja.443.1648496635677; Mon, 28 Mar 2022 12:43:55 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Mon, 28 Mar 2022 12:43:39 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] Driver core changes for 5.18-rc1 To: Greg KH Cc: Andrew Morton , Linux Kernel Mailing List , Stephen Rothwell , Saravana Kannan Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 28, 2022 at 6:39 AM Greg KH wrote: > > There will be a merge conflict in drivers/power/supply/ab8500_chargalg.c > with your tree, the merge conflict should be easy (take all the > changes). And by "take all the changes", I'm sure you mean "take none of them, since the code was removed upstream in the meantime". Easy typo to make. Linus