From: Ludovic Desroches <ludovic.desroches@microchip.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Peng Hao <peng.hao2@zte.com.cn>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: Re: linux-next: manual merge of the at91 tree with the at91-fixes tree
Date: Fri, 5 Apr 2019 11:05:45 +0200 [thread overview]
Message-ID: <20190405090545.7tdtbbxussybt2yq@M43218.corp.atmel.com> (raw)
In-Reply-To: <20190405091519.48aa4098@canb.auug.org.au>
Hi Stephen,
On Fri, Apr 05, 2019 at 09:15:19AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the at91 tree got a conflict in:
>
> arch/arm/mach-at91/pm.c
>
> between commit:
>
> ba5e60c9b75d ("arm/mach-at91/pm : fix possible object reference leak")
>
> from the at91-fixes tree and commit:
>
> c3f5b8fde71f ("ARM: at91: pm: introduce at91_soc_pm structure")
>
> from the at91 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm/mach-at91/pm.c
> index 2a757dcaa1a5,5571658b3c46..000000000000
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@@ -620,10 -676,8 +676,10 @@@ static int __init at91_pm_backup_init(v
> return 0;
>
> securam_fail:
> + put_device(&pdev->dev);
> +securam_fail_no_ref_dev:
> - iounmap(pm_data.sfrbu);
> - pm_data.sfrbu = NULL;
> + iounmap(soc_pm.data.sfrbu);
> + soc_pm.data.sfrbu = NULL;
> return ret;
> }
>
Resolution sounds good.
Thanks
Ludovic
prev parent reply other threads:[~2019-04-05 9:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 22:15 linux-next: manual merge of the at91 tree with the at91-fixes tree Stephen Rothwell
2019-04-05 9:05 ` Ludovic Desroches [this message]
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=20190405090545.7tdtbbxussybt2yq@M43218.corp.atmel.com \
--to=ludovic.desroches@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=peng.hao2@zte.com.cn \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).