linux-kernel - Re: linux-next: manual merge of the trivial tree with the mips 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: <alpine.LNX.2.00.1205221101020.16396@pobox.suse.cz>
Date:	Tue, 22 May 2012 11:01:18 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	John Crispin <blogic@...nwrt.org>,
	Ralf Baechle <ralf@...ux-mips.org>,
	Masanari Iida <standby24x7@...il.com>
Subject: Re: linux-next: manual merge of the trivial tree with the mips
 tree

On Tue, 22 May 2012, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/pci/pci-lantiq.c between commit 57c8cb8f2429 ("MIPS: pci:
> convert lantiq driver to OF") from the mips tree and commit 6997991ab0db
> ("mips: Fix printk typos in arc/mips") from the trivial tree.
> 
> The former did the fix from the latter as a side effect so I used that.

I have dropped the hunk from trivial.git to avoid the unnecessary 
conflict, thanks.

-- 
Jiri Kosina
SUSE Labs
--
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/