* Re: linux-next: Tree for Jan 19
From: Paul Gortmaker @ 2017-01-26 16:19 UTC (permalink / raw)
To: Stafford Horne
Cc: linux, fengguang.wu, Stephen Rothwell, Stefan Kristiansson,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170126150838.GA21641@lianli.shorne-pla.net>
[Re: linux-next: Tree for Jan 19] On 27/01/2017 (Fri 00:08) Stafford Horne wrote:
> On Thu, Jan 26, 2017 at 02:45:15PM +0900, Stafford Horne wrote:
> > On Wed, Jan 25, 2017 at 11:37:11AM -0500, Paul Gortmaker wrote:
> > > [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
> > >
> > > [...]
> > >
> > > >
> > > > Are all of these builds using the tests from lkp-tests [0]?
> > >
> > > Not using any specific tests, other than compiling allmodconfig and
> > > defconfig.
> > >
> > > >
> > > > If so and no one is working on openrisc toolchain updates I will package up
> > > > a modern toolchain for the cdn [1] and send patches for lkp-test.
> > > >
> > > > If there is something else that needs to be done let me know.
> > > >
> > > > [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> > > > [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
> > >
> > > If you could work with Tony (his email is at the bottom of the crosstool
> > > front page in [1]) to get the or32 binutils updated, that would be
> > > great. With all the arch currrently in linux, I pretty much have to
> > > just use what is available from kernel.org as prebuilts.
> > >
> >
> > Thanks,
> >
> > I will followup with Tony.
>
> Hi Paul,
>
> Just in case you are interested I have uploaded toolchains to here:
>
> http://shorne.noip.me/crosstool/files/bin/x86_64/5.4.0/
Thanks, I was able to use this to build or32 defconfig.
Paul.
--
>
> I will be sending the same (the files/patches dir) to Tony.
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Stafford Horne @ 2017-01-26 15:08 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux, fengguang.wu, Stephen Rothwell, Stefan Kristiansson,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170126054515.GI7836@lianli.shorne-pla.net>
On Thu, Jan 26, 2017 at 02:45:15PM +0900, Stafford Horne wrote:
> On Wed, Jan 25, 2017 at 11:37:11AM -0500, Paul Gortmaker wrote:
> > [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
> >
> > [...]
> >
> > >
> > > Are all of these builds using the tests from lkp-tests [0]?
> >
> > Not using any specific tests, other than compiling allmodconfig and
> > defconfig.
> >
> > >
> > > If so and no one is working on openrisc toolchain updates I will package up
> > > a modern toolchain for the cdn [1] and send patches for lkp-test.
> > >
> > > If there is something else that needs to be done let me know.
> > >
> > > [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> > > [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
> >
> > If you could work with Tony (his email is at the bottom of the crosstool
> > front page in [1]) to get the or32 binutils updated, that would be
> > great. With all the arch currrently in linux, I pretty much have to
> > just use what is available from kernel.org as prebuilts.
> >
>
> Thanks,
>
> I will followup with Tony.
Hi Paul,
Just in case you are interested I have uploaded toolchains to here:
http://shorne.noip.me/crosstool/files/bin/x86_64/5.4.0/
I will be sending the same (the files/patches dir) to Tony.
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Paul Gortmaker @ 2017-01-26 14:52 UTC (permalink / raw)
To: Guenter Roeck
Cc: Stafford Horne, fengguang.wu, Stephen Rothwell,
Stefan Kristiansson, linux-next@vger.kernel.org, LKML
In-Reply-To: <2a1ef925-a217-31b6-ada7-4a2a0dfae51f@roeck-us.net>
[Re: linux-next: Tree for Jan 19] On 26/01/2017 (Thu 06:22) Guenter Roeck wrote:
> On 01/25/2017 09:38 PM, Stafford Horne wrote:
> >On Wed, Jan 25, 2017 at 08:54:53PM -0800, Guenter Roeck wrote:
> >>On 01/25/2017 08:37 AM, Paul Gortmaker wrote:
> >>>[Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
> >>>
> >>>[...]
> >>>
> >>>>
> >>>>Are all of these builds using the tests from lkp-tests [0]?
> >>>
> >>>Not using any specific tests, other than compiling allmodconfig and
> >>>defconfig.
> >>>
> >>>>
> >>>>If so and no one is working on openrisc toolchain updates I will package up
> >>>>a modern toolchain for the cdn [1] and send patches for lkp-test.
> >>>>
> >>>>If there is something else that needs to be done let me know.
> >>>>
> >>>>[0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> >>>>[1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
> >>>
> >>>If you could work with Tony (his email is at the bottom of the crosstool
> >>>front page in [1]) to get the or32 binutils updated, that would be
> >>>great. With all the arch currrently in linux, I pretty much have to
> >>>just use what is available from kernel.org as prebuilts.
> >>>
> >>
> >>Different problem, but from the 0day info I thought you might be interested
> >>in the following breakage as well (seen in -next).
> >>
> >>/opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c: In function 'do_adedata':
> >>/opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c:185:2: error: implicit declaration of function 'search_exception_tables'
> >>
> >>Reported on kerneltests.org.
> >
> >Thanks Guenter,
> >
> >Is this for me of Paul?
> >
> Paul, sorry.
Thanks for the heads up. I'll make an appropriate addition to the score
patch. Odd that I didn't see a mail from the 0day bot.
Paul.
--
>
> Guenter
>
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Guenter Roeck @ 2017-01-26 14:22 UTC (permalink / raw)
To: Stafford Horne
Cc: Paul Gortmaker, fengguang.wu, Stephen Rothwell,
Stefan Kristiansson, linux-next@vger.kernel.org, LKML
In-Reply-To: <20170126053801.GH7836@lianli.shorne-pla.net>
On 01/25/2017 09:38 PM, Stafford Horne wrote:
> On Wed, Jan 25, 2017 at 08:54:53PM -0800, Guenter Roeck wrote:
>> On 01/25/2017 08:37 AM, Paul Gortmaker wrote:
>>> [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
>>>
>>> [...]
>>>
>>>>
>>>> Are all of these builds using the tests from lkp-tests [0]?
>>>
>>> Not using any specific tests, other than compiling allmodconfig and
>>> defconfig.
>>>
>>>>
>>>> If so and no one is working on openrisc toolchain updates I will package up
>>>> a modern toolchain for the cdn [1] and send patches for lkp-test.
>>>>
>>>> If there is something else that needs to be done let me know.
>>>>
>>>> [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
>>>> [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
>>>
>>> If you could work with Tony (his email is at the bottom of the crosstool
>>> front page in [1]) to get the or32 binutils updated, that would be
>>> great. With all the arch currrently in linux, I pretty much have to
>>> just use what is available from kernel.org as prebuilts.
>>>
>>
>> Different problem, but from the 0day info I thought you might be interested
>> in the following breakage as well (seen in -next).
>>
>> /opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c: In function 'do_adedata':
>> /opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c:185:2: error: implicit declaration of function 'search_exception_tables'
>>
>> Reported on kerneltests.org.
>
> Thanks Guenter,
>
> Is this for me of Paul?
>
Paul, sorry.
Guenter
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Stafford Horne @ 2017-01-26 5:45 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux, fengguang.wu, Stephen Rothwell, Stefan Kristiansson,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170125163711.GE29778@windriver.com>
On Wed, Jan 25, 2017 at 11:37:11AM -0500, Paul Gortmaker wrote:
> [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
>
> [...]
>
> >
> > Are all of these builds using the tests from lkp-tests [0]?
>
> Not using any specific tests, other than compiling allmodconfig and
> defconfig.
>
> >
> > If so and no one is working on openrisc toolchain updates I will package up
> > a modern toolchain for the cdn [1] and send patches for lkp-test.
> >
> > If there is something else that needs to be done let me know.
> >
> > [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> > [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
>
> If you could work with Tony (his email is at the bottom of the crosstool
> front page in [1]) to get the or32 binutils updated, that would be
> great. With all the arch currrently in linux, I pretty much have to
> just use what is available from kernel.org as prebuilts.
>
Thanks,
I will followup with Tony.
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Stafford Horne @ 2017-01-26 5:38 UTC (permalink / raw)
To: Guenter Roeck
Cc: Paul Gortmaker, fengguang.wu, Stephen Rothwell,
Stefan Kristiansson, linux-next@vger.kernel.org, LKML
In-Reply-To: <1014aa6f-447d-9dcc-2a60-01156dcdf88f@roeck-us.net>
On Wed, Jan 25, 2017 at 08:54:53PM -0800, Guenter Roeck wrote:
> On 01/25/2017 08:37 AM, Paul Gortmaker wrote:
> > [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
> >
> > [...]
> >
> > >
> > > Are all of these builds using the tests from lkp-tests [0]?
> >
> > Not using any specific tests, other than compiling allmodconfig and
> > defconfig.
> >
> > >
> > > If so and no one is working on openrisc toolchain updates I will package up
> > > a modern toolchain for the cdn [1] and send patches for lkp-test.
> > >
> > > If there is something else that needs to be done let me know.
> > >
> > > [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> > > [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
> >
> > If you could work with Tony (his email is at the bottom of the crosstool
> > front page in [1]) to get the or32 binutils updated, that would be
> > great. With all the arch currrently in linux, I pretty much have to
> > just use what is available from kernel.org as prebuilts.
> >
>
> Different problem, but from the 0day info I thought you might be interested
> in the following breakage as well (seen in -next).
>
> /opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c: In function 'do_adedata':
> /opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c:185:2: error: implicit declaration of function 'search_exception_tables'
>
> Reported on kerneltests.org.
Thanks Guenter,
Is this for me of Paul?
You reported score above, but I think probably this is also impacting
openrisc.
Anyway,
I think this is due to Puals changes which separated out extable from
module. traps.c in score and openrisc use search_exception_tables and
include <linux/module.h> to get it.
I did see Paul post a patch to fix traps.c too,
This should be fixed by today.
-Stafford
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Guenter Roeck @ 2017-01-26 4:54 UTC (permalink / raw)
To: Paul Gortmaker, Stafford Horne
Cc: fengguang.wu, Stephen Rothwell, Stefan Kristiansson,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170125163711.GE29778@windriver.com>
On 01/25/2017 08:37 AM, Paul Gortmaker wrote:
> [Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
>
> [...]
>
>>
>> Are all of these builds using the tests from lkp-tests [0]?
>
> Not using any specific tests, other than compiling allmodconfig and
> defconfig.
>
>>
>> If so and no one is working on openrisc toolchain updates I will package up
>> a modern toolchain for the cdn [1] and send patches for lkp-test.
>>
>> If there is something else that needs to be done let me know.
>>
>> [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
>> [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
>
> If you could work with Tony (his email is at the bottom of the crosstool
> front page in [1]) to get the or32 binutils updated, that would be
> great. With all the arch currrently in linux, I pretty much have to
> just use what is available from kernel.org as prebuilts.
>
Different problem, but from the 0day info I thought you might be interested
in the following breakage as well (seen in -next).
/opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c: In function 'do_adedata':
/opt/buildbot/slave/next-next/build/arch/score/kernel/traps.c:185:2: error: implicit declaration of function 'search_exception_tables'
Reported on kerneltests.org.
Guenter
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the userns tree
From: Stephen Rothwell @ 2017-01-26 3:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: Eric W. Biederman, linux-next, linux-kernel, Aleksa Sarai
In-Reply-To: <20170125174322.777ddcb0e232d5409569e95c@linux-foundation.org>
Hi Andrew,
On Wed, 25 Jan 2017 17:43:22 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Thu, 26 Jan 2017 13:59:23 +1300 ebiederm@xmission.com (Eric W. Biederman) wrote:
>
> > Andrew do you see merit in Aleksa's patch that I don't? Otherwise can
> > you remove it from your tree?
>
> I have done so.
I'll drop it from linux-next on Monday (if there is no new mmotm by then).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the userns tree
From: Andrew Morton @ 2017-01-26 1:43 UTC (permalink / raw)
To: Eric W. Biederman
Cc: Stephen Rothwell, linux-next, linux-kernel, Aleksa Sarai
In-Reply-To: <871svqeivo.fsf@xmission.com>
On Thu, 26 Jan 2017 13:59:23 +1300 ebiederm@xmission.com (Eric W. Biederman) wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > fs/proc/base.c
> >
> > between commit:
> >
> > 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces")
> >
> > from the userns tree and commit:
> >
> > d15d29b5352f ("procfs: change the owner of non-dumpable and writeable files")
> >
> > from the akpm-current tree.
> >
> > I *think* that the former supercedes the latter?
>
> Sort of. After a long conversation it turns out what they are trying to
> do is orthogonal.
>
> The first (mine) is handling the case of non-dumpable tasks in user
> namespaces.
>
> The second by Aleksa Sarai is trying to trying to relax the permission
> checks in proc so that non-dumpable is not as strict, to sort out some
> runC issues where they are having challenges coding themselves into a
> corner. In the case of /proc/self I think there may be a case but in
> general relaxing the permission checks in proc gives me the Heebie
> Jeebies.
>
> Andrew do you see merit in Aleksa's patch that I don't? Otherwise can
> you remove it from your tree?
I have done so.
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the userns tree
From: Eric W. Biederman @ 2017-01-26 0:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Aleksa Sarai
In-Reply-To: <20170125160835.1b94db55@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/proc/base.c
>
> between commit:
>
> 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces")
>
> from the userns tree and commit:
>
> d15d29b5352f ("procfs: change the owner of non-dumpable and writeable files")
>
> from the akpm-current tree.
>
> I *think* that the former supercedes the latter?
Sort of. After a long conversation it turns out what they are trying to
do is orthogonal.
The first (mine) is handling the case of non-dumpable tasks in user
namespaces.
The second by Aleksa Sarai is trying to trying to relax the permission
checks in proc so that non-dumpable is not as strict, to sort out some
runC issues where they are having challenges coding themselves into a
corner. In the case of /proc/self I think there may be a case but in
general relaxing the permission checks in proc gives me the Heebie
Jeebies.
Andrew do you see merit in Aleksa's patch that I don't? Otherwise can
you remove it from your tree?
> I fixed it up (I just used the former) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Stephen thank you for pointing this out.
Eric
^ permalink raw reply
* Re: linux-next: Tree for Jan 19
From: Paul Gortmaker @ 2017-01-25 16:37 UTC (permalink / raw)
To: Stafford Horne
Cc: linux, fengguang.wu, Stephen Rothwell, Stefan Kristiansson,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170123141159.GE7836@lianli.shorne-pla.net>
[Re: linux-next: Tree for Jan 19] On 23/01/2017 (Mon 23:11) Stafford Horne wrote:
[...]
>
> Are all of these builds using the tests from lkp-tests [0]?
Not using any specific tests, other than compiling allmodconfig and
defconfig.
>
> If so and no one is working on openrisc toolchain updates I will package up
> a modern toolchain for the cdn [1] and send patches for lkp-test.
>
> If there is something else that needs to be done let me know.
>
> [0] git://git.kernel.org/pub/scm/linux/kernel/git/wfg/lkp-tests.git
> [1] https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.5.1/
If you could work with Tony (his email is at the bottom of the crosstool
front page in [1]) to get the or32 binutils updated, that would be
great. With all the arch currrently in linux, I pretty much have to
just use what is available from kernel.org as prebuilts.
Paul.
--
>
> -Stafford
^ permalink raw reply
* RE: linux-next: build failure after merge of the drm tree
From: Vincent ABRIOU @ 2017-01-25 10:52 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ville Syrjälä
In-Reply-To: <20170124122515.07a3fcc8@canb.auug.org.au>
Dave,
Here is the patch from Chris Wilson to solve the build issue:
[PATCH] drm/sti: Fix compilation failure for drm_framebuffer.pixel_format
BR
Vincent
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: mardi 24 janvier 2017 02:25
> To: Dave Airlie <airlied@linux.ie>
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Vincent
> ABRIOU <vincent.abriou@st.com>; Ville Syrjälä
> <ville.syrjala@linux.intel.com>
> Subject: linux-next: build failure after merge of the drm tree
>
> Hi Dave,
>
> After merging the drm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/sti/sti_plane.c: In function 'sti_plane_update_fps':
> drivers/gpu/drm/sti/sti_plane.c:76:33: error: 'struct drm_framebuffer' has
> no member named 'pixel_format'
> (char *)&plane->drm_plane.fb->pixel_format,
> ^
>
> Caused by commit
>
> a69e466b0666 ("drm/sti: update fps debugfs entries")
>
> Interacting with commit
>
> 438b74a5497c ("drm: Nuke fb->pixel_format")
>
> This should have been fixed up in commit
>
> d64a1661c8f7 ("Merge tag 'sti-drm-next-2017-01-06' of
> https://github.com/vinceab/linux into drm-next")
>
> I have used the drm tree from next-20170123 for today.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* [PATCH] pwm: STM32 fix compilation warning
From: Benjamin Gaignard @ 2017-01-25 8:50 UTC (permalink / raw)
To: sfr, linux-next, linux-kernel, thierry.reding, lee.jones
Cc: Benjamin Gaignard
remove useless curstate variable.
Fixes: bafffb6e7bd1 ("pwm: Add driver for STM32 plaftorm")
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
---
drivers/pwm/pwm-stm32.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index ce6232e..6139512 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -189,7 +189,6 @@ static void stm32_pwm_disable(struct stm32_pwm *priv, int ch)
static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
struct pwm_state *state)
{
- struct pwm_state curstate;
bool enabled;
struct stm32_pwm *priv = to_stm32_pwm_dev(chip);
int ret;
@@ -201,7 +200,7 @@ static int stm32_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
return 0;
}
- if (state->polarity != curstate.polarity)
+ if (state->polarity != pwm->state.polarity)
stm32_pwm_set_polarity(priv, pwm->hwpwm, state->polarity);
ret = stm32_pwm_config(priv, pwm->hwpwm,
--
1.9.1
^ permalink raw reply related
* Re: linux-next: build warning after merge of the mfd tree
From: Benjamin Gaignard @ 2017-01-25 8:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Lee Jones, linux-next, Linux Kernel Mailing List
In-Reply-To: <20170125155450.6e517bfc@canb.auug.org.au>
2017-01-25 5:54 GMT+01:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Lee,
>
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) produced this warning:
>
> drivers/pwm/pwm-stm32.c: In function 'stm32_pwm_apply':
> drivers/pwm/pwm-stm32.c:204:33: warning: 'curstate.polarity' may be used uninitialized in this function [-Wmaybe-uninitialized]
> if (state->polarity != curstate.polarity)
> ^
>
I will send a patch to fix that today
Benjamin
> Introduced by commit
>
> bafffb6e7bd1 ("pwm: Add driver for STM32 plaftorm")
>
> --
> Cheers,
> Stephen Rothwell
--
Benjamin Gaignard
Graphic Study Group
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply
* Re: linux-next: manual merge of the kselftest tree with the net-next tree
From: Daniel Borkmann @ 2017-01-25 7:39 UTC (permalink / raw)
To: Stephen Rothwell, Shuah Khan, David Miller, Networking
Cc: linux-next, linux-kernel, bamvor.zhangjian@huawei.com,
Bamvor Jian Zhang
In-Reply-To: <20170125150321.0b377f57@canb.auug.org.au>
On 01/25/2017 05:03 AM, Stephen Rothwell wrote:
> Hi Shuah,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/bpf/Makefile
>
> between commit:
>
> 62b64660262a ("bpf: add prog tag test case to bpf selftests")
>
> from the net-next tree and commit:
>
> 88baa78d1f31 ("selftests: remove duplicated all and clean target")
>
> from the kselftest tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Looks good to me, thanks!
^ permalink raw reply
* linux-next: Tree for Jan 25
From: Stephen Rothwell @ 2017-01-25 5:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
There will be no linux-next release until Monday (next-20170130).
Changes since 20170124:
New tree: extable
The drm tree still had its build failure so I used the version from
next-20170123.
The userns tree gained a conflict against the selinux tree.
The kselftest tree gained a conflict against the net-next tree.
The akpm-current tree gained a conflict against the userns tree.
Non-merge commits (relative to Linus' tree): 5038
5743 files changed, 197224 insertions(+), 106791 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 252 trees (counting Linus' and 36 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (0263d4ebd94b Merge tag 'platform-drivers-x86-v4.10-4' of git://git.infradead.org/linux-platform-drivers-x86)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (7a308bb3016f Linux 4.10-rc5)
Merging arm-current/fixes (90f92c631b21 ARM: 8613/1: Fix the uaccess crash on PB11MPCore)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (178f358208ce powerpc: Ignore reserved field in DCSR and PVR reads and writes)
Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (ec221a17a638 Merge branch 'lwt-module-unload')
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (e5072053b096 netfilter: conntrack: refine gc worker heuristics, redux)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (bd19b5ab1da6 Merge tag 'iwlwifi-for-kalle-2017-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (ea2a7fb12093 Revert "PCI: Add runtime PM support for PCIe ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (488dc164914f xhci: remove WARN_ON if dma mask is not set for platform devices)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (5d03a2fd2292 USB: serial: option: add device ID for HP lt2523 (Novatel E371))
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (9579c4dc2129 Merge tag 'iio-fixes-for-4.10b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (49def1853334 Linux 4.10-rc4)
Merging input-current/for-linus (3f5c34c6d468 Input: wm97xx - make missing platform data non-fatal)
Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (94a6fa899d2c vfio/type1: Remove pid_namespace.h include)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (3bfdfdcbce27 drm/i915: Ignore bogus plane coordinates on SKL when the plane is not visible)
Merging drm-misc-fixes/for-linux-next-fixes (7e9081c5aac7 drm/fence: fix memory overwrite when setting out_fence fd)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (01c4a81b2c85 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (73f9e92ed3d0 ARM: SoC: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (61e787270fde Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (3d928ca85412 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (1393f73bb898 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (cdc8c5c16f57 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (618fc1a367cd Merge branch 'omap-for-v4.11/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (73cb27cef98f Merge tag 'qcom-defconfig-for-4.11' into noo-for-4.11)
Merging renesas/next (b4f907b34180 Merge branch 'dt-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (4a8144f4d470 Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (829d2bd13392 arm64: entry-ftrace.S: avoid open-coded {adr,ldr}_l)
Merging clk/clk-next (8076e04441f2 clk: stm32f7: Introduce stm32f7 clocks for STM32F746 boards)
CONFLICT (add/add): Merge conflict in include/dt-bindings/clock/stm32fx-clock.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (d25c164fc0be m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (1d02d4bb23cc MIPS: Lantiq: Lock DMA register accesses for SMP)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (7ce7d89f4883 Linux 4.10-rc1)
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9437964885f8 s390/bpf: remove redundant check for non-null image)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (640764eb528b Merge branch 'for-next-next-v4.11-20170120' into for-next-20170120)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (70f16cef06b5 udf: allow implicit blocksize specification during mount)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (b63f5e84826b GFS2: Wake up io waiters whenever a flush is done)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (c929ea0b9103 SUNRPC: cleanup ida information when removing sunrpc module)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (4c7d0c9cb713 ovl: fix possible use after free on redirect dir lookup)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (83d230eb5c63 xfs: verify dirblocklog correctly)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (8098418ae7c3 Merge branch 'for-4.11/wacom' into for-next)
Merging i2c/i2c/for-next (701dc207bf55 i2c: piix4: Avoid race conditions with IMC)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (2c72fa4f5882 hwmon: Make name attribute mandatory for new APIs)
Merging jc_docs/docs-next (43d8808b0820 Documentation: cpuset: Fix 'cpuset.tasks' -> 'tasks')
Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
Merging pm/linux-next (10e335ed42b3 Merge branches 'acpica', 'pm-cpufreq' and 'pm-sleep' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (e4004621061f Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (264e6777f958 Merge branch 'netvsc-enhancements')
CONFLICT (content): Merge conflict in net/mpls/af_mpls.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (eb758c8864d4 esp: Introduce a helper to setup the trailer)
Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (106e0deca1ac rtlwifi: rtl8192cu: Convert driver to use common macros)
Merging bluetooth/master (0e40f4c9593b tcp: accept RST for rcv_nxt - 1 after receiving a FIN)
Merging mac80211-next/master (1331b62c9721 rfkill: remove rfkill-regulator)
Merging rdma/for-next (5c37077fd025 IB/ipoib: Remove the unnecessary error check)
Merging rdma-leon/rdma-next (f3cbb454fed0 Merge branch 'topic/odp-ksm' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (f0493e653f96 drm/mgag200: Added support for the new device G200eH3)
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
$ git reset --hard HEAD^
Merging next-20170123 version of drm
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
[master 4060658c940f] next-20170123/drm
Merging drm-panel/drm/panel/for-next (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel())
Merging drm-intel/for-linux-next (b976dc53ec43 drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake.)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (442ffefc0c3f drm/vgem: Switch to reservation_object_lock() helpers)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (95cc3a9501ff drm: mali-dp: Rename malidp_input_format to malidp_pixel_format)
Merging sunxi/sunxi/for-next (9181f40cede2 Merge branch 'sunxi/clk-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (9eb5d0e635eb ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform)
Merging sound-asoc/for-next (64240ade1b71 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (f719315b52b5 Input: constify device_type structures)
Merging block/for-next (79f6d4b71580 Merge branch 'for-4.11/block' into for-next)
Merging lightnvm/for-next (fa3742367ee5 lightnvm: add ioctls for vector I/Os)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (2ed14a2aac8a mmc: tmio: discard obsolete SDIO irqs before enabling irqs)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (c8fdae277039 md/r5cache: enable chunk_aligned_read with write back cache)
Merging mfd/for-mfd-next (666114db60a6 mfd: mt6397: Add MT6323 LED support into MT6397 driver)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32f429.dtsi
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (a1b94355ea3f power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (1f57ef5dc717 Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/qcom-smd' and 'regulator/topic/supplies' into regulator-next)
Merging security/next (c659af78eb7b tpm: Check size of response before accessing data)
Merging integrity/next (07a77aadc4e8 ima: fix ima_d_path() possible race with rename)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (c659af78eb7b tpm: Check size of response before accessing data)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (a51741ebe131 Documentation: usb: fix wrong documentation paths)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (e38103cebb33 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (4929143ff1e2 Merge branch 'ras/core')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (127c1225bf89 EDAC, sb_edac: Get rid of ->show_interleave_mode())
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
Merging rcu/rcu/next (8f28ec9a33d7 rcu: Make call_rcu() do deferred NOCB wakeups)
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (a17f32270af1 kvm: x86: Expose Intel VPOPCNTDQ feature to guest)
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
Merging kvms390/next (f97017a64449 KVM: s390: Add debug logging to basic cpu model interface)
Merging xen-tip/linux-next (da72ff5bfcb0 partially revert "xen: Remove event channel notification through Xen PCI platform device")
Merging percpu/for-next (aaf0f2fa6828 percpu_counter: percpu_counter_hotcpu_callback() cleanup)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (7b81271210d8 platform/x86: thinkpad_acpi: Add support for status LED)
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (aa75941ca1de serial: 8250_omap: Remove rx_dma_broken flag)
Merging usb/usb-next (afa197e3cb24 dt-bindings: mt8173-mtu3: add reference clock)
Merging usb-gadget/next (591c8004dd43 usb: gadget: f_fs: Accept up to 30 endpoints.)
Merging usb-serial/usb-next (2eee05020a0e USB: serial: opticon: fix CTS retrieval at open)
Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
Merging phy-next/next (a8df2768c2ed drivers: phy: constify phy_ops structures)
Merging staging/staging-next (1c5fa1c7dbff staging: media: lirc: use new parport device model)
Merging char-misc/char-misc-next (8e27a236312c Drivers: hv: vmbus: Cleanup hyperv_vmbus.h)
Merging extcon/extcon-next (4fcf37fb7dae extcon: palmas: Don't spam console)
Merging slave-dma/next (7919f00e4fdf Merge branch 'topic/zx' into next)
Merging cgroup/for-next (e055b0e58d99 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (b32d9f752e17 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (13c599069130 scsi: hisi_sas: decrease running_req in hisi_sas_slot_task_free())
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ec4537a7d64f pci: drop link_reset)
Merging rpmsg/for-next (5956dd81ac18 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (ffd6ce2f3b20 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (2a15343f1e82 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (e52d5f1c5221 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (68eb94f16227 proc: Better ownership of files for non-dumpable tasks in user namespaces)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (21da8ba5b665 rtc: sun6i: Switch to devm_rtc_device_register)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (586270614c58 module.h: remove extable.h include now users have migrated)
Merging akpm-current/current (ab81b9a880b4 ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in fs/proc/base.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: Reimplement IDR and IDA using the radix tree
Applying: idr: support storing NULL in the IDR
Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (2361296903e9 mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the userns tree
From: Stephen Rothwell @ 2017-01-25 5:08 UTC (permalink / raw)
To: Andrew Morton, Eric W. Biederman; +Cc: linux-next, linux-kernel, Aleksa Sarai
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/proc/base.c
between commit:
68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces")
from the userns tree and commit:
d15d29b5352f ("procfs: change the owner of non-dumpable and writeable files")
from the akpm-current tree.
I *think* that the former supercedes the latter?
I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the mfd tree
From: Stephen Rothwell @ 2017-01-25 4:54 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-next, linux-kernel, Benjamin Gaignard
Hi Lee,
After merging the mfd tree, today's linux-next build (powerpc
allyesconfig) produced this warning:
drivers/pwm/pwm-stm32.c: In function 'stm32_pwm_apply':
drivers/pwm/pwm-stm32.c:204:33: warning: 'curstate.polarity' may be used uninitialized in this function [-Wmaybe-uninitialized]
if (state->polarity != curstate.polarity)
^
Introduced by commit
bafffb6e7bd1 ("pwm: Add driver for STM32 plaftorm")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the userns tree with the selinux tree
From: Stephen Rothwell @ 2017-01-25 4:16 UTC (permalink / raw)
To: Eric W. Biederman, Paul Moore; +Cc: linux-next, linux-kernel, Stephen Smalley
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
security/selinux/hooks.c
between commit:
be0554c9bf9f ("selinux: clean up cred usage and simplify")
from the selinux tree and commit:
9227dd2a84a7 ("exec: Remove LSM_UNSAFE_PTRACE_CAP")
from the userns tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc security/selinux/hooks.c
index 0d24eb2325d2,cece6fe55f02..000000000000
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2397,9 -2404,8 +2397,8 @@@ static int selinux_bprm_set_creds(struc
/* Make sure that anyone attempting to ptrace over a task that
* changes its SID has the appropriate permit */
- if (bprm->unsafe &
- (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
+ if (bprm->unsafe & LSM_UNSAFE_PTRACE) {
- u32 ptsid = ptrace_parent_sid(current);
+ u32 ptsid = ptrace_parent_sid();
if (ptsid != 0) {
rc = avc_has_perm(ptsid, new_tsec->sid,
SECCLASS_PROCESS,
^ permalink raw reply
* linux-next: manual merge of the kselftest tree with the net-next tree
From: Stephen Rothwell @ 2017-01-25 4:03 UTC (permalink / raw)
To: Shuah Khan, David Miller, Networking
Cc: linux-next, linux-kernel, Daniel Borkmann,
bamvor.zhangjian@huawei.com, Bamvor Jian Zhang
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/bpf/Makefile
between commit:
62b64660262a ("bpf: add prog tag test case to bpf selftests")
from the net-next tree and commit:
88baa78d1f31 ("selftests: remove duplicated all and clean target")
from the kselftest tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/bpf/Makefile
index 769a6cb42b4b,058351b0694f..000000000000
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -1,13 -1,7 +1,7 @@@
CFLAGS += -Wall -O2 -I../../../../usr/include
- test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
-TEST_GEN_PROGS = test_verifier test_maps test_lru_map
++TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map
- TEST_PROGS := $(test_objs) test_kmod.sh
- TEST_FILES := $(test_objs)
-
- all: $(test_objs)
+ TEST_PROGS := test_kmod.sh
include ../lib.mk
-
- clean:
- $(RM) $(test_objs)
^ permalink raw reply
* mmotm 2017-01-24-15-37 uploaded
From: akpm @ 2017-01-24 23:37 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-01-24-15-37 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.10-rc5:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* memory_hotplug-zone_can_shift-returns-boolean-value.patch
* mm-respect-foll_force-foll_cow-for-thp.patch
* dax-fix-build-warnings-with-fs_dax-and-fs_iomap.patch
* kernel-watchdog-prevent-false-hardlockup-on-overloaded-system.patch
* memstick-core-avoid-wnonnull-warning.patch
* userfaultfd-fix-sigbus-resulting-from-false-rwsem-wakeups.patch
* slub-trace-free-objects-at-kern_info.patch
* mm-alloc_contig-re-allow-cma-to-compact-fs-pages.patch
* proc-add-a-schedule-point-in-proc_pid_readdir.patch
* mm-memcg-do-not-retry-precharge-charges.patch
* documentation-filesystems-proctxt-add-vmpin.patch
* radix-tree-fix-private-list-warnings.patch
* mm-mempolicyc-do-not-put-mempolicy-before-using-its-nodemask.patch
* frv-add-atomic64_add_unless.patch
* fbdev-color-map-copying-bounds-checking.patch
* panic-add-missing-n.patch
* mm-page_alloc-fix-check-for-null-preferred_zone.patch
* mm-page_alloc-fix-fast-path-race-with-cpuset-update-or-removal.patch
* mm-page_alloc-move-cpuset-seqcount-checking-to-slowpath.patch
* mm-page_alloc-fix-premature-oom-when-racing-with-cpuset-mems-update.patch
* frv-add-missing-atomic64-operations.patch
* romfs-use-different-way-to-generate-fsid-for-block-or-mtd.patch
* mn10300-fix-build-error-of-missing-fpu_save.patch
* mm-do-not-export-ioremap_page_range-symbol-for-external-module.patch
* maintainers-add-dan-streetman-to-zswap-maintainers.patch
* maintainers-add-dan-streetman-to-zbud-maintainers.patch
* zswap-disable-changing-params-if-init-fails.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* tracing-add-__print_flags_u64.patch
* dax-add-tracepoint-infrastructure-pmd-tracing.patch
* dax-update-maintainers-entries-for-fs-dax.patch
* dax-add-tracepoints-to-dax_pmd_load_hole.patch
* dax-add-tracepoints-to-dax_pmd_insert_mapping.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault-v7.patch
* mm-dax-move-pmd_fault-to-take-only-vmf-parameter.patch
* dax-enable-iostat-for-read-write.patch
* dax-enable-iostat-for-read-write-fix.patch
* dma-debug-add-comment-for-failed-to-check-map-error.patch
* tools-vm-add-missing-makefile-rules.patch
* scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
* scripts-lindent-clean-up-and-optimize.patch
* scripts-checkstackpl-add-support-for-nios2.patch
* m32r-use-generic-currenth.patch
* m32r-fix-build-warning.patch
* debugobjects-track-number-of-kmem_cache_alloc-kmem_cache_free-done.patch
* debugobjects-scale-thresholds-with-of-cpus.patch
* debugobjects-reduce-contention-on-the-global-pool_lock.patch
* ocfs2-dlmglue-prepare-tracking-logic-to-avoid-recursive-cluster-lock.patch
* ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-vfs-entry-points.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdogc-do-not-hardcode-cpu-0-as-the-initial-thread.patch
mm.patch
* slub-do-not-merge-cache-if-slub_debug-contains-a-never-merge-flag.patch
* mm-slub-add-a-dump_stack-to-the-unexpected-gfp-check.patch
* tmpfs-change-shmem_mapping-to-test-shmem_aops.patch
* mm-throttle-show_mem-from-warn_alloc.patch
* mm-throttle-show_mem-from-warn_alloc-fix.patch
* mm-page_alloc-dont-convert-pfn-to-idx-when-merging.patch
* mm-page_alloc-avoid-page_to_pfn-when-merging-buddies.patch
* mm-vmallocc-use-rb_entry_safe.patch
* mm-trace-extract-compaction_status-and-zone_type-to-a-common-header.patch
* oom-trace-add-oom-detection-tracepoints.patch
* oom-trace-add-compaction-retry-tracepoint.patch
* userfaultfd-document-_ior-_iow.patch
* userfaultfd-correct-comment-about-uffd_feature_pagefault_flag_wp.patch
* userfaultfd-convert-bug-to-warn_on_once.patch
* userfaultfd-use-vma_is_anonymous.patch
* userfaultfd-non-cooperative-split-the-find_userfault-routine.patch
* userfaultfd-non-cooperative-add-ability-to-report-non-pf-events-from-uffd-descriptor.patch
* userfaultfd-non-cooperative-report-all-available-features-to-userland.patch
* userfaultfd-non-cooperative-add-fork-event.patch
* userfaultfd-non-cooperative-add-fork-event-build-warning-fix.patch
* userfaultfd-non-cooperative-dup_userfaultfd-use-mm_count-instead-of-mm_users.patch
* userfaultfd-non-cooperative-add-mremap-event.patch
* userfaultfd-non-cooperative-optimize-mremap_userfaultfd_complete.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_dontneed-request.patch
* userfaultfd-non-cooperative-avoid-madv_dontneed-race-condition.patch
* userfaultfd-non-cooperative-wake-userfaults-after-uffdio_unregister.patch
* userfaultfd-hugetlbfs-add-copy_huge_page_from_user-for-hugetlb-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-hugetlb_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-__mcopy_atomic_hugetlb-for-huge-page-uffdio_copy.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
* userfaultfd-hugetlbfs-add-userfaultfd-hugetlb-hook.patch
* userfaultfd-hugetlbfs-allow-registration-of-ranges-containing-huge-pages.patch
* userfaultfd-hugetlbfs-add-userfaultfd_hugetlb-test.patch
* userfaultfd-hugetlbfs-userfaultfd_huge_must_wait-for-hugepmd-ranges.patch
* userfaultfd-hugetlbfs-gup-support-vm_fault_retry.patch
* userfaultfd-hugetlbfs-reserve-count-on-error-in-__mcopy_atomic_hugetlb.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_hugetlbfs.patch
* userfaultfd-introduce-vma_can_userfault.patch
* userfaultfd-shmem-add-shmem_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-shmem-introduce-vma_is_shmem.patch
* userfaultfd-shmem-add-tlbflushh-header-for-microblaze.patch
* userfaultfd-shmem-use-shmem_mcopy_atomic_pte-for-shared-memory.patch
* userfaultfd-shmem-add-userfaultfd-hook-for-shared-memory-faults.patch
* userfaultfd-shmem-allow-registration-of-shared-memory-ranges.patch
* userfaultfd-shmem-add-userfaultfd_shmem-test.patch
* userfaultfd-shmem-lock-the-page-before-adding-it-to-pagecache.patch
* userfaultfd-shmem-avoid-a-lockup-resulting-from-corrupted-page-flags.patch
* userfaultfd-shmem-avoid-leaking-blocks-and-used-blocks-in-uffdio_copy.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_shmem.patch
* userfaultfd-non-cooperative-selftest-introduce-userfaultfd_open.patch
* userfaultfd-non-cooperative-selftest-add-ufd-parameter-to-copy_page.patch
* userfaultfd-non-cooperative-selftest-add-test-for-fork-madvdontneed-and-remap-events.patch
* userfaultfd-selftest-test-uffdio_zeropage-on-all-memory-types.patch
* mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock.patch
* mm-vmscan-remove-unused-mm_vmscan_memcg_isolate.patch
* mm-vmscan-add-active-list-aging-tracepoint.patch
* mm-vmscan-add-active-list-aging-tracepoint-update.patch
* mm-vmscan-show-the-number-of-skipped-pages-in-mm_vmscan_lru_isolate.patch
* mm-vmscan-show-lru-name-in-mm_vmscan_lru_isolate-tracepoint.patch
* mm-vmscan-extract-shrink_page_list-reclaim-counters-into-a-struct.patch
* mm-vmscan-enhance-mm_vmscan_lru_shrink_inactive-tracepoint.patch
* mm-vmscan-add-mm_vmscan_inactive_list_is_low-tracepoint.patch
* trace-vmscan-postprocess-sync-with-tracepoints-updates.patch
* nfs-no-pg_private-waiters-remain-remove-waker.patch
* mm-un-export-wake_up_page-functions.patch
* mm-fix-filemapc-kernel-doc-warnings.patch
* mm-page_alloc-swap-likely-to-unlikely-as-code-logic-is-different-for-next_zones_zonelist.patch
* mm-compaction-add-vmstats-for-kcompactd-work.patch
* mm-page_alloc-skip-over-regions-of-invalid-pfns-where-possible.patch
* mmcompaction-serialize-waitqueue_active-checks.patch
* mm-bootmemc-cosmetic-improvement-of-code-readability.patch
* mm-fix-some-typos-in-mm-zsmallocc.patch
* mm-memblockc-trivial-code-refine-in-memblock_is_region_memory.patch
* mm-memblockc-check-return-value-of-memblock_reserve-in-memblock_virt_alloc_internal.patch
* mm-sparse-use-page_private-to-get-page-private-value.patch
* mm-memory_hotplug-set-magic-number-to-page-freelsit-instead-of-page-lrunext.patch
* powerpc-do-not-make-the-entire-heap-executable.patch
* mm-swap-fix-kernel-message-in-swap_info_get.patch
* mm-swap-add-cluster-lock.patch
* mm-swap-add-cluster-lock-v5.patch
* mm-swap-split-swap-cache-into-64mb-trunks.patch
* mm-swap-skip-read-ahead-for-unreferenced-swap-slots.patch
* mm-swap-allocate-swap-slots-in-batches.patch
* mm-swap-free-swap-slots-in-batch.patch
* mm-swap-add-cache-for-swap-slots-allocation.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix-2.patch
* mm-swap-enable-swap-slots-cache-usage.patch
* mm-swap-skip-readahead-only-when-swap-slot-cache-is-enabled.patch
* mm-thp-add-new-defermadvise-defrag-option.patch
* writeback-use-rb_entry.patch
* mm-vmscan-do-not-count-freed-pages-as-pgdeactivate.patch
* mm-vmscan-cleanup-lru-size-claculations.patch
* mm-vmscan-consider-eligible-zones-in-get_scan_count.patch
* revert-mm-bail-out-in-shrink_inactive_list.patch
* mm-page_alloc-do-not-report-all-nodes-in-show_mem.patch
* mm-page_alloc-warn_alloc-print-nodemask.patch
* arch-mm-remove-arch-specific-show_mem.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
* mm-oom-do-not-enfore-oom-killer-for-__gfp_nofail-automatically.patch
* mm-help-__gfp_nofail-allocations-which-do-not-trigger-oom-killer.patch
* mm-page_alloc-warn_alloc-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-drop-zap_details-ignore_dirty.patch
* mm-drop-zap_details-check_swap_entries.patch
* mm-drop-unused-argument-of-zap_page_range.patch
* oom-reaper-use-madvise_dontneed-logic-to-decide-if-unmap-the-vma.patch
* mm-memblockc-remove-unnecessary-log-and-clean-up.patch
* zram-remove-obsolete-sysfs-attrs.patch
* mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix-2.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled-fix.patch
* mm-fix-type-width-of-section-to-from-pfn-conversion-macros.patch
* mm-devm_memremap_pages-use-multi-order-radix-for-zone_device-lookups.patch
* mm-introduce-struct-mem_section_usage-to-track-partial-population-of-a-section.patch
* mm-introduce-common-definitions-for-the-size-and-mask-of-a-section.patch
* mm-cleanup-sparse_init_one_section-return-value.patch
* mm-track-active-portions-of-a-section-at-boot.patch
* mm-track-active-portions-of-a-section-at-boot-fix.patch
* mm-track-active-portions-of-a-section-at-boot-fix-fix.patch
* mm-fix-register_new_memory-zone-type-detection.patch
* mm-convert-kmalloc_section_memmap-to-populate_section_memmap.patch
* mm-prepare-for-hot-add-remove-of-sub-section-ranges.patch
* mm-support-section-unaligned-zone_device-memory-ranges.patch
* mm-support-section-unaligned-zone_device-memory-ranges-fix.patch
* mm-support-section-unaligned-zone_device-memory-ranges-fix-2.patch
* mm-enable-section-unaligned-devm_memremap_pages.patch
* libnvdimm-pfn-dax-stop-padding-pmem-namespaces-to-section-alignment.patch
* mm-memory_hotplugc-unexport-__remove_pages.patch
* memblock-let-memblock_type_name-know-about-physmem-type.patch
* memblock-also-dump-physmem-list-within-__memblock_dump_all.patch
* memblock-embed-memblock-type-name-within-struct-memblock_type.patch
* userfaultfd-non-cooperative-rename-event_madvdontneed-to-event_remove.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_remove-request.patch
* userfaultfd-non-cooperative-selftest-enable-remove-event-test-for-shmem.patch
* mm-vmscan-scan-dirty-pages-even-in-laptop-mode.patch
* mm-vmscan-kick-flushers-when-we-encounter-dirty-pages-on-the-lru.patch
* mm-vmscan-remove-old-flusher-wakeup-from-direct-reclaim-path.patch
* mm-vmscan-only-write-dirty-pages-that-the-scanner-has-seen-twice.patch
* mm-vmscan-move-dirty-pages-out-of-the-way-until-theyre-flushed.patch
* mm-page_alloc-split-buffered_rmqueue.patch
* mm-page_alloc-split-buffered_rmqueue-fix.patch
* mm-page_alloc-split-alloc_pages_nodemask.patch
* mm-page_alloc-drain-per-cpu-pages-from-workqueue-context.patch
* mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests.patch
* mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf.patch
* hwpoison-soft-offlining-for-non-lru-movable-page.patch
* mm-fix-comments-for-mmap_init.patch
* mm-write-protect-madv_free-pages.patch
* zram-remove-waitqueue-for-io-done.patch
* zswap-allow-initialization-at-boot-without-pool.patch
* zswap-clear-compressor-or-zpool-param-if-invalid-at-init.patch
* mm-page_alloc-remove-redundant-checks-from-alloc-fastpath.patch
* mm-page_alloc-dont-check-cpuset-allowed-twice-in-fast-path.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-drain-quarantine-of-memcg-slab-objects.patch
* kasan-add-memcg-kmem_cache-test.patch
* frv-pci-frv-fix-build-warning.patch
* proc-use-rb_entry.patch
* proc-less-code-duplication-in-proc-cmdline.patch
* procfs-change-the-owner-of-non-dumpable-and-writeable-files.patch
* uapi-mqueueh-add-missing-linux-typesh-include.patch
* add-explanation-of-udelay-inaccuracy.patch
* iopoll-include-linux-ktimeh-instead-of-linux-hrtimerh.patch
* compiler-gcch-added-new-macro-for-gcc-attribute.patch
* m68k-replaced-gcc-specific-macros-with-ones-from-compilerh.patch
* notifier-simplify-expression.patch
* lib-add-module-support-to-crc32-tests.patch
* lib-add-module-support-to-glob-tests.patch
* lib-add-module-support-to-atomic64-tests.patch
* find_bit-micro-optimise-find_next__bit.patch
* find_bit-micro-optimise-find_next__bit-v2.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
* rbtree-use-designated-initializers.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort-fix.patch
* lib-update-lz4-compressor-module.patch
* lib-decompress_unlz4-change-module-to-work-with-new-lz4-module-version.patch
* crypto-change-lz4-modules-to-work-with-new-lz4-module-version.patch
* fs-pstore-fs-squashfs-change-usage-of-lz4-to-work-with-new-lz4-version.patch
* checkpatch-warn-on-embedded-function-names.patch
* checkpatch-warn-on-logging-continuations.patch
* checkpatch-update-logfunctions.patch
* hfs-fix-fix-hfs_readdir.patch
* hfs-atomically-read-inode-size.patch
* hfsplus-atomically-read-inode-size.patch
* fs-reiserfs-atomically-read-inode-size.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-use-get_user_pages_unlocked.patch
* fs-affs-remove-reference-to-affs_parent_ino.patch
* fs-affs-add-validation-block-function.patch
* fs-affs-make-affs-exportable.patch
* fs-affs-use-octal-for-permissions.patch
* fs-affs-add-prefix-to-some-functions.patch
* fs-affs-nameic-forward-declarations-clean-up.patch
* fs-affs-make-export-work-with-cold-dcache.patch
* fs-affs-make-export-work-with-cold-dcache-fix.patch
* config-android-recommended-disable-aio-support.patch
* config-android-base-enable-hardened-usercopy-and-kernel-aslr.patch
* fonts-keep-non-sparc-fonts-listed-together.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
linux-next.patch
linux-next-rejects.patch
* fs-add-i_blocksize.patch
* fs-add-i_blocksize-fix.patch
* nilfs2-use-nilfs_btree_node_size.patch
* nilfs2-use-i_blocksize.patch
* reimplement-idr-and-ida-using-the-radix-tree.patch
* reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr.patch
* reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
* reimplement-idr-and-ida-using-the-radix-tree-fix.patch
* scripts-spellingtxt-add-swith-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-swithc-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-user-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-union-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-one-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-partiton-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-aligment-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-algined-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-efective-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-varible-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-embeded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-againt-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-neded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-unneded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialization-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-initialiazation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialised-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-comsumer-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disbled-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overide-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overrided-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-configuartion-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-applys-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-explictely-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-omited-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disassocation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-deintialized-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwritting-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwriten-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-therfore-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-followings-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-some-typo-words.patch
* lib-vsprintfc-remove-%z-support.patch
* checkpatchpl-warn-against-using-%z.patch
* checkpatchpl-warn-against-using-%z-fix.patch
* mm-add-new-mmgrab-helper.patch
* mm-add-new-mmget-helper.patch
* mm-use-mmget_not_zero-helper.patch
* mm-clarify-mm_structmm_userscount-documentation.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* Re: Please add extable branch to linux-next
From: Stephen Rothwell @ 2017-01-24 22:50 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next
In-Reply-To: <20170124214207.GW29778@windriver.com>
Hi Paul,
On Tue, 24 Jan 2017 16:42:08 -0500 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> Would you please add the "extable" branch to linux-next for a once around
> addition from this repo?
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git
Added from today. If I forget to remove it once it is merged, please
just remind me, thanks.
One thing, once you get an Acked-by from someone, you may as well
remove the Cc tag for them.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
^ permalink raw reply
* Please add extable branch to linux-next
From: Paul Gortmaker @ 2017-01-24 21:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen,
Would you please add the "extable" branch to linux-next for a once around
addition from this repo?
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git
Viewed in cgit here:
https://git.kernel.org/cgit/linux/kernel/git/paulg/linux.git/log/?h=extable
The v3 review is summarized here:
https://marc.info/?l=linux-sh&m=148510292912878&w=2
Thanks,
Paul.
^ permalink raw reply
* Re: linux-next: manual merge of the kselftest tree with the net-next tree
From: Shuah Khan @ 2017-01-24 15:17 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking, Bamvor Jian Zhang,
bamvor.zhangjian@huawei.com
Cc: linux-next, linux-kernel, David Herrmann, Daniel Mack
In-Reply-To: <20170124154524.2a993739@canb.auug.org.au>
On 01/23/2017 09:45 PM, Stephen Rothwell wrote:
> Hi Shuah,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/bpf/Makefile
>
> between commit:
>
> 4d3381f5a322 ("bpf: Add tests for the lpm trie map")
>
> from the net-next tree and commit:
>
> 88baa78d1f31 ("selftests: remove duplicated all and clean target")
>
> from the kselftest tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Yes. Please.
>
> P.S. Shuah, that kselftest commit has a different email address in its
> Author and Signed-off-by.
>
Yes you are right. I didn't notice the discrepancy.
Bamvor! Your gitconfig is outdated perhaps!
thanks,
-- Shuah
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the arm-soc tree
From: Lee Jones @ 2017-01-24 8:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, linux-next, linux-kernel,
Amelie Delaunay, Alexandre TORGUE, Benjamin Gaignard,
Fabrice GASNIER
In-Reply-To: <20170124134319.2a6ba85d@canb.auug.org.au>
On Tue, 24 Jan 2017, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> arch/arm/boot/dts/stm32f429.dtsi
>
> between commits:
>
> 3604ef9c8154 ("ARM: dts: stm32: Add ADC support to stm32f429")
> dd3feb755a4a ("ARM: dts: stm32: Add RTC support for STM32F429 MCU")
>
> from the arm-soc tree and commit:
>
> 9072b6b2ba83 ("ARM: dts: stm32: add Timers driver for stm32f429 MCU")
>
> from the mfd tree.
An immutable branch as already been posted for this.
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox