Re: linux-next: manual merge of the akpm tree with the kbuild tree

2019-01-21 Thread Masahiro Yamada
On Tue, Jan 22, 2019 at 1:06 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > Makefile > > between commit: > > b57304bb03de ("kbuild: remove meaningless prepare2 target") > > from the kbuild tree and patch: > > "locking/atomics: buil

Re: linux-next: manual merge of the akpm tree with the kbuild tree

2013-07-04 Thread Michal Marek
On 4.7.2013 06:43, Andrew Morton wrote: > On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell > wrote: > >> Hi Andrew, >> >> Today's linux-next merge of the akpm tree got conflicts in >> tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h >> between commit b35310627f39 ("too

Re: linux-next: manual merge of the akpm tree with the kbuild tree

2013-07-03 Thread Andrew Morton
On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got conflicts in > tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h > between commit b35310627f39 ("tools/include: use stdint types for > user-space byte