linux-kernel - Re: linux-next: manual merge of the pm tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4805506.yPQhhiqbXU@vostro.rjw.lan>
Date:	Wed, 11 Feb 2015 03:03:49 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc:	Bjorn Helgaas <bhelgaas@...gle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the pm tree with the pci tree

On Wednesday, February 11, 2015 02:41:35 AM Rafael J. Wysocki wrote:
> On Wednesday, February 11, 2015 12:07:55 PM Stephen Rothwell wrote:
> > Hi Rafael,
> > 
> > Today's linux-next merge of the pm tree got a conflict in
> > drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
> > resources on failure in of_pci_get_host_bridge_resources()") from the
> > pci tree and commit 5c493df25a0d ("Merge branch 'pci/host-generic' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into
> > acpi-resources") from the pm tree.
> > 
> > I fixed it up (I just use the latter version, please check when it
> > comes out) and can carry the fix as necessary (no action is required,
> > though someone might want to tell Linus how to resolve it - including
> > the removal of the "kfree(bus_range);").
> 
> Sorry, I messed this up.  The commit that supposed to be a merge ended
> up as a non-merge commit in my tree, just because I tried to modify
> the changelog of it without doing the merge again.
> 
> Then, I should have noticed that when I was putting together the pull request
> for Linus earlier today, but then I didn't.

Linus merged my tree and the PCI one already, but his conflict resolution
didn't remove the kfree(bus_range); line, so it looks like we'll need a
separate patch removing it.

Lorenzo, will you send it or should I prepare one?


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)