From: Mark Brown <broonie@kernel•org>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Hongling Zeng <zenghongling@kylinos•cn>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Mon, 25 May 2026 16:07:07 +0100 [thread overview]
Message-ID: <ahRlm-SGZaH4u3C-@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1932 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/gpib/cb7210/cb7210.c
between commit:
2eae90a457baa ("gpib: cb7210: Fix region leak when request_irq fails")
from the char-misc.current tree and commit:
5ad2849605585 ("gpib: cb7210: Fix region leak when request_irq fails")
from the char-misc 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.
diff --combined drivers/gpib/cb7210/cb7210.c
index 673b5bfe2e7d1,05058bf2cd50b..0000000000000
--- a/drivers/gpib/cb7210/cb7210.c
+++ b/drivers/gpib/cb7210/cb7210.c
@@@ -1049,8 -1049,7 +1049,8 @@@ static int cb_isa_attach(struct gpib_bo
if (!request_region(config->ibbase, cb7210_iosize, DRV_NAME)) {
dev_err(board->gpib_dev, "ioports starting at 0x%x are already in use\n",
config->ibbase);
- return -EBUSY;
+ retval = -EBUSY;
+ goto err_release_region;
}
nec_priv->iobase = config->ibbase;
cb_priv->fifo_iobase = nec7210_iobase(cb_priv);
@@@ -1063,16 -1062,12 +1063,16 @@@
// install interrupt handler
if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, DRV_NAME, board)) {
dev_err(board->gpib_dev, "failed to obtain IRQ %d\n", config->ibirq);
- release_region(nec7210_iobase(cb_priv), cb7210_iosize);
- return -EBUSY;
+ retval = -EBUSY;
+ goto err_release_region;
}
cb_priv->irq = config->ibirq;
return cb7210_init(cb_priv, board);
+
+err_release_region:
+ release_region(nec7210_iobase(cb_priv), cb7210_iosize);
+ return retval;
}
static void cb_isa_detach(struct gpib_board *board)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-05-25 15:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-25 15:07 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-14 3:32 linux-next: manual merge of the char-misc tree with the char-misc.current tree Stephen Rothwell
2025-11-14 19:10 ` Dinh Nguyen
2025-10-24 1:49 Stephen Rothwell
2025-10-24 5:24 ` Greg KH
2021-12-06 3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
2019-10-18 3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2018-12-04 4:35 Stephen Rothwell
2018-12-04 7:42 ` Greg KH
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
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=ahRlm-SGZaH4u3C-@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zenghongling@kylinos$(echo .)cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox