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:
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: build atomic headers as required"
from the akpm tree.
I fixed it up (I hope -
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/xtensa/include/asm/Kbuild
between commit:
35ff5ae79f85 ("xtensa: move generic-y of exported headers to uapi/asm/Kbuild")
from the kbuild tree and patch:
"xtensa: use generic fb.h"
from the akpm tree.
I fixed it
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/xtensa/include/asm/Kbuild
between commit:
35ff5ae79f85 ("xtensa: move generic-y of exported headers to uapi/asm/Kbuild")
from the kbuild tree and patch:
"xtensa: use generic fb.h"
from the akpm tree.
I fixed it
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
On 4.7.2013 06:43, Andrew Morton wrote:
On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell s...@canb.auug.org.au
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
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
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 byteshift headers") from the kbuild tree and commit
"scripts/sortextable.c:
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 byteshift headers) from the kbuild tree and commit
scripts/sortextable.c: fix
On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell s...@canb.auug.org.au
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
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace
timeconst.pl with a bc script") from the kbuild tree and commit
"timeconst.pl: remove deprecated defined(@array)" from the akpm tree.
I just dropped the akpm
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 70730bca1331 (kernel: Replace
timeconst.pl with a bc script) from the kbuild tree and commit
timeconst.pl: remove deprecated defined(@array) from the akpm tree.
I just dropped the akpm tree
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
scripts/tags.sh between commit 9f14b4201239 ("scripts/tags.sh: Fix regex
syntax for etags") from the kbuild tree and commit "scripts/tags.sh: add
magic for declarations of popular kernel type" from the akpm tree.
I fixed it
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
scripts/tags.sh between commit 9f14b4201239 (scripts/tags.sh: Fix regex
syntax for etags) from the kbuild tree and commit scripts/tags.sh: add
magic for declarations of popular kernel type from the akpm tree.
I fixed it up
14 matches
Mail list logo
