linux-kernel - RE: linux-next: manual merge of the tegra tree with the 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]

Date:	Wed, 12 Sep 2012 09:14:24 -0700
From:	Stephen Warren <swarren@...dia.com>
To:	Greg KH <greg@...ah.com>, Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Colin Cross <ccross@...roid.com>, Olof Johansson <olof@...om.net>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Venu Byravarasu <vbyravarasu@...dia.com>,
	Felipe Balbi <balbi@...com>,
	Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@....com>,
	Will Deacon <will.deacon@....com>
Subject: RE: linux-next: manual merge of the tegra tree with the  tree

Greg KH wrote at Wednesday, September 12, 2012 10:12 AM:
> On Wed, Sep 12, 2012 at 04:43:53PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tegra tree got a conflict in
> > arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
> > commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
> > the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
> > to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
> > remove dead code") from the tegra tree.
> >
> > The latter removed the files, so I did that (no action is required).
> 
> Stephen (Warren that is), should be fixing this up in his tree soon, as
> he will be including the same patchset that caused this problem in his
> tree to resolve this.

This issue is something else; the issue we've been discussing doesn't 
cause any merge conflict in linux-next, but rather causes a build failure
once the two trees are merged together (due to a new #include of a file
that got renamed elsewhere). I've already re-generated my for-next to
avoid that issue in tomorrow's linux-next.

-- 
nvpublic

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