mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
	Chandrakanth Patil <chandrakanth.patil@broadcom.com>,
	James Bottomley <James.Bottomley@hansenpartnership.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	"Martin K. Petersen" <mkp@kernel.org>,
	Ranjan Kumar <ranjan.kumar@broadcom.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the scsi tree
Date: Tue, 29 Sep 2026 12:07:09 +0100	[thread overview]
Message-ID: <3fa086ea-2868-4cac-a34b-2389355c31b0@sirena.org.uk> (raw)
In-Reply-To: <CAMuHMdUYNwi_MZtKGxnLLpUKDVAgRK8zT+2eaOcHAqcecx_LcA@mail.gmail.com>

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

On Tue, Sep 29, 2026 at 10:48:09AM +0200, Geert Uytterhoeven wrote:
> On Mon, 28 Sept 2026 at 16:23, Mark Brown <broonie@kernel.org> wrote:

> >         }
> >  -      if (tgtdev)
> >  -              mpi3mr_tgtdev_put(tgtdev);
> >         kfree(mr_sas_port);
> >         return NULL;
> >   }

> Are you sure this is correct?
> Martin's conflict resolution in 0b5b2fb484f3b kept the

>        if (tgtdev)
>                mpi3mr_tgtdev_put(tgtdev);

> part.

Dunno.  There was another put came in further up the function.

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

  reply	other threads:[~2026-09-29 11:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-28 14:15 Mark Brown
2026-09-29  8:48 ` Geert Uytterhoeven
2026-09-29 11:07   ` Mark Brown [this message]
2026-09-30  7:12     ` Geert Uytterhoeven
2026-09-30  9:41       ` Ranjan Kumar
2026-09-30 11:16         ` Mark Brown
2026-10-01  2:19         ` Martin K. Petersen
  -- strict thread matches above, loose matches on Subject: below --
2023-04-03  6:40 Stephen Rothwell
2018-01-25 22:39 Stephen Rothwell
2018-01-25 23:18 ` James Bottomley
2016-11-09  2:57 Stephen Rothwell

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=3fa086ea-2868-4cac-a34b-2389355c31b0@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=chandrakanth.patil@broadcom.com \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=mkp@kernel.org \
    --cc=ranjan.kumar@broadcom.com \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®