Messages in this thread | | | Subject | Re: linux-next: manual merge of the akpm-current tree with the kbuild tree | From | Michal Marek <> | Date | Wed, 6 Jan 2016 09:07:30 +0100 |
| |
On 2016-01-06 07:54, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > scripts/tags.sh > > between commit: > > 93209d65c1d3 ("tags: Unify emacs and exuberant rules") > > from the kbuild tree and commit: > > ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers") > > from the akpm-current tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
That's correct, thanks.
Michal
| |