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=-8.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 4D8D1C433ED for ; Tue, 27 Apr 2021 06:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26189610A5 for ; Tue, 27 Apr 2021 06:37:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229977AbhD0Gig (ORCPT ); Tue, 27 Apr 2021 02:38:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:44652 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231835AbhD0Gid (ORCPT ); Tue, 27 Apr 2021 02:38:33 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 81BD2AF88; Tue, 27 Apr 2021 06:37:49 +0000 (UTC) Date: Tue, 27 Apr 2021 08:37:48 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: Philipp Zabel , Takashi Iwai , Dmitry Osipenko , Linux Kernel Mailing List , Linux Next Mailing List , Mark Brown Subject: Re: linux-next: manual merge of the reset tree with the sound-current tree In-Reply-To: <20210427093357.6518bef6@canb.auug.org.au> References: <20210427093357.6518bef6@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 27 Apr 2021 01:33:57 +0200, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the reset tree got a conflict in: > > drivers/reset/core.c > > between commit: > > 48d71395896d ("reset: Add reset_control_bulk API") > > from the sound-current tree and commit: > > 463bdeed6760 ("reset: whitespace fixes") > > from the reset 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. Thanks! Takashi > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/reset/core.c > index 71c1c8264b2d,123b0c53a857..000000000000 > --- a/drivers/reset/core.c > +++ b/drivers/reset/core.c > @@@ -724,29 -610,9 +724,29 @@@ void reset_control_release(struct reset > } > EXPORT_SYMBOL_GPL(reset_control_release); > > +/** > + * reset_control_bulk_release() - releases exclusive access to reset controls > + * @num_rstcs: number of entries in rstcs array > + * @rstcs: array of struct reset_control_bulk_data with reset controls set > + * > + * Releases exclusive access right to reset controls previously obtained by a > + * call to reset_control_bulk_acquire(). > + * > + * See also: reset_control_release(), reset_control_bulk_acquire() > + */ > +void reset_control_bulk_release(int num_rstcs, > + struct reset_control_bulk_data *rstcs) > +{ > + int i; > + > + for (i = 0; i < num_rstcs; i++) > + reset_control_release(rstcs[i].rstc); > +} > +EXPORT_SYMBOL_GPL(reset_control_bulk_release); > + > - static struct reset_control *__reset_control_get_internal( > - struct reset_controller_dev *rcdev, > - unsigned int index, bool shared, bool acquired) > + static struct reset_control * > + __reset_control_get_internal(struct reset_controller_dev *rcdev, > + unsigned int index, bool shared, bool acquired) > { > struct reset_control *rstc; > > [2 OpenPGP digital signature ] >