[lkml]   [2013]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the tip tree with the h8300-remove tree
Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/h8300/include/asm/Kbuild between commit 4b0847842204 ("Drop support
for Renesas H8/300 (h8300) architecture") from the h8300-remove tree and
commit a787870924db ("sched, arch: Create asm/preempt.h") from the tip

I just removed the file and can carry the fix as necessary (no action
is required).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-09-27 08:21    [W:0.031 / U:14.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site