linux-kernel - Re: linux-next: manual merge of the iommu tree with the pci-current 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] [day] [month] [year] [list]

Message-ID: <20111216153011.GC28302@8bytes.org>
Date:	Fri, 16 Dec 2011 16:30:11 +0100
From:	Joerg Roedel <joro@...tes.org>
To:	Jesse Barnes <jbarnes@...tuousgeek.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: Re: linux-next: manual merge of the iommu tree with the
	pci-current tree

On Fri, Dec 16, 2011 at 07:18:40AM -0800, Jesse Barnes wrote:
> Yeah, this is probably my fault; pri-changes has drifted relative to my
> linux-next branch.  I'll rebase it onto linux-next and push again.
> That should fix things.

Please don't rebase. I already pulled in the changes and don't want to
rebase that :) Can you just merge the pri-changes branch into your
linux-next branch?


	Joerg

--
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/