linux-kernel - Re: [GIT PULL] ACPI and power management updates for 3.20-rc1

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] [day] [month] [year] [list]

Date:	Wed, 11 Feb 2015 02:56:22 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	"Rafael J. Wysocki" <rafael@...nel.org>,
	ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	"linux-pm@...r.kernel.org" <linux-pm@...r.kernel.org>,
	Linux PCI <linux-pci@...r.kernel.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: Re: [GIT PULL] ACPI and power management updates for 3.20-rc1

On Wednesday, February 11, 2015 02:51:38 AM Rafael J. Wysocki wrote:
> On Tuesday, February 10, 2015 10:19:34 PM Rafael J. Wysocki wrote:
> > Hi Linus,
> > 
> > Please pull from
> > 
> >  git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \
> >  pm+acpi-3.20-rc1
> > 
> > to receive ACPI and power management material for v3.20-rc1 with
> > top-most commit b5e82233cab43c25fc0a1c28d9136a086db4aa52
> > 
> >  Merge branch 'pm-tools'
> > 
> > on top of commit bfa76d49576599a4b9f9b7a71f23d73d6dcff735
> > 
> >  Linux 3.19
> 
> I messed up one thing here, sorry about that.
> 
> Commit 5c493df25a0d ("Merge branch 'pci/host-generic' of
> git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into
> acpi-resources") was supposed to be a merge, but I did something
> wrong (I know what even) and it ended up as a non-merge one.
> And then I didn't notice that it went wrong which was another
> failure.
> 
> So this commit will conflict with d2be00c0fb5a ("of/pci: Free resources on
> failure in of_pci_get_host_bridge_resources()") from the PCI tree, but
> 5c493df25a0d is how the final code should look like (the kfree(bus_range);
> line needs to go away in particular).
> 
> Please let me know if you want me to fix this up (although that would involve
> rebasing).

I see you've pulled it already, so thanks for that and sorry for the noise.

Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/