public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Corey Minyard <cminyard@mvista•com>, Wolfram Sang <wsa@the-dreams•de>
Cc: "Corey Minyard" <minyard@acm•org>,
	"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
	"Linux Next Mailing List" <linux-next@vger•kernel.org>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
	"Wolfram Sang" <wsa@kernel•org>
Subject: linux-next: manual merge of the ipmi tree with the i2c tree
Date: Fri, 23 Sep 2022 14:37:25 +1000	[thread overview]
Message-ID: <20220923143725.0641ee4f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]

Hi all,

Today's linux-next merge of the ipmi tree got a conflict in:

  drivers/char/ipmi/ipmi_ipmb.c

between commit:

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree and commit:

  80d98a33008c ("ipmi:ipmb: Don't call ipmi_unregister_smi() on a register failure")

from the ipmi 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.

Also, from Uwe:

"There is an immutable tag that can be merged into your tree to
resolve the conflict before you send your changes to Linux at

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable"

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/char/ipmi/ipmi_ipmb.c
index 25c010c9ec25,740dc0f824e0..000000000000
--- a/drivers/char/ipmi/ipmi_ipmb.c
+++ b/drivers/char/ipmi/ipmi_ipmb.c
@@@ -436,8 -434,16 +434,14 @@@ static void ipmi_ipmb_cleanup(struct ip
  	iidev->slave = NULL;
  	iidev->client = NULL;
  	ipmi_ipmb_stop_thread(iidev);
+ }
+ 
 -static int ipmi_ipmb_remove(struct i2c_client *client)
++static void ipmi_ipmb_remove(struct i2c_client *client)
+ {
+ 	struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
  
+ 	ipmi_ipmb_cleanup(iidev);
  	ipmi_unregister_smi(iidev->intf);
 -
 -	return 0;
  }
  
  static int ipmi_ipmb_probe(struct i2c_client *client)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2022-09-23  4:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220923143725.0641ee4f@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=cminyard@mvista$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=minyard@acm$(echo .)org \
    --cc=u.kleine-koenig@pengutronix$(echo .)de \
    --cc=wsa@kernel$(echo .)org \
    --cc=wsa@the-dreams$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox