linux-kernel - Re: linux-next: manual merge of the sparc-current tree with Linus' 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20090926.202007.257820623.davem@davemloft.net>
Date:	Sat, 26 Sep 2009 20:20:07 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	JBeulich@...ell.com, akpm@...ux-foundation.org
Subject: Re: linux-next: manual merge of the sparc-current tree with Linus'
 tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Sat, 26 Sep 2009 11:01:58 +1000

> Today's linux-next merge of the sparc-current tree got a conflict in
> arch/sparc/include/asm/vio.h between commit
> 8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
> couple of bogus uses of it") from Linus' tree and commit
> 87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
> () in vio_dring_avail()") from the sparc-current tree.
> 
> I just used the sparc-current version for today.

Thanks Stephen.  When Linus pulled in my tree he resolved the
merge conflict and thus you shouldn't have to deal with this
any more either.
--
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/