Re: linux-next: manual merge of the tip tree with the modules tree

On Sat, Jun 20, 2015 at 06:35:58PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > include/linux/seqlock.h > > between commit: > > 7fc26327b756 ("seqlock: Introduce raw_read_seqcount_latch()") > > from the modules tree and commit

linux-next: manual merge of the tip tree with the modules tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: include/linux/seqlock.h between commit: 7fc26327b756 ("seqlock: Introduce raw_read_seqcount_latch()") from the modules tree and commit: c4bfa3f5f906 ("seqcount: Introduce raw_write_seqcount_barrier()") from the tip tre