On Tue, 21 Jun 2011, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > arch/s390/kvm/sie64a.S between commit 57e98c34511e ("[S390] move sie code > to entry.S") from the s390 tree and commit e44ba033c565 ("treewide: > remove duplicate includes") from the trivial tree. > > The former merged this file into another file, so I just removed this file. Thanks for reporting, I have dropped the hunk. -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html