* Re: linux-next: build warning after merge of the tip tree
From: Rich Felker @ 2016-07-25 14:53 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Mark Brown,
Marc Zyngier
In-Reply-To: <57961014.7030902@linaro.org>
On Mon, Jul 25, 2016 at 03:11:48PM +0200, Daniel Lezcano wrote:
> On 07/25/2016 09:16 AM, Thomas Gleixner wrote:
> > On Sun, 24 Jul 2016, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> >> produced this warning:
> >>
> >> In file included from include/linux/clocksource.h:18:0,
> >> from include/linux/clockchips.h:13,
> >> from drivers/clocksource/jcore-pit.c:14:
> >> include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
> >> .data = (fn == (fn_type)NULL) ? fn : fn }
> >> ^
> >> include/linux/of.h:1020:3: note: in expansion of macro '_OF_DECLARE'
> >> _OF_DECLARE(table, name, compat, fn, of_init_fn_1_ret)
> >> ^
> >> include/linux/clocksource.h:247:2: note: in expansion of macro 'OF_DECLARE_1_RET'
> >> OF_DECLARE_1_RET(clksrc, name, compat, fn)
> >> ^
> >> drivers/clocksource/jcore-pit.c:277:1: note: in expansion of macro 'CLOCKSOURCE_OF_DECLARE'
> >> CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init);
> >> ^
> >>
> >> Introduced by commits
> >>
> >> b7c4db861683 ("clocksource/drivers/clksrc-probe: Introduce init functions with return code")
> >> 177cf6e52b0a ("clocksources: Switch back to the clksrc table")
> >>
> >> interacting with commit
> >>
> >> e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")
> >>
> >> from the sh tree.
> >
> > And why is that driver coming through the superh tree and not through the
> > clocksource maintainers? It's not only based on an old interface it's probably
> > unreviewed as well ...
>
> Rich,
>
> why are these changes in linux-next ?
>
> Except I am missing something, I don't see a new version sent for review
> on the mailing list. The interrupt controller driver is almost empty as
> stated by Marc Zyngier and there is no explanation / discussion about it.
>
> I don't know the goal of adding those patches in linux-next via your
> tree, may be you misunderstood how linux-next works and you should
> remove them. But if the purpose was to merge the patches, I remind you
> that being an arch maintainer does not give you the right to apply any
> patches, everywhere, at all cost, without review, because you want them
> in, you must follow the process, otherwise you take the risk to upset a
> lot of people and to be kicked out.
If this is upsetting people I can remove them. Last time I got
feedback from at least one (driver) subsystem maintainer that (if I
understood it correctly) indicated they would like to have seen the
patch in linux-next without problems before upstreaming it through
their tree. That was my motivation for including it here. I'm not
trying to bypass other maintainers to push patches upstream and I can
remove all non-arch/sh stuff from for-next if that would be better.
Rich
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Rich Felker @ 2016-07-25 14:48 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Stephen Rothwell, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Daniel Lezcano
In-Reply-To: <alpine.DEB.2.11.1607250915160.5629@nanos>
On Mon, Jul 25, 2016 at 09:16:48AM +0200, Thomas Gleixner wrote:
> On Sun, 24 Jul 2016, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> > produced this warning:
> >
> > In file included from include/linux/clocksource.h:18:0,
> > from include/linux/clockchips.h:13,
> > from drivers/clocksource/jcore-pit.c:14:
> > include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
> > .data = (fn == (fn_type)NULL) ? fn : fn }
> > ^
> > include/linux/of.h:1020:3: note: in expansion of macro '_OF_DECLARE'
> > _OF_DECLARE(table, name, compat, fn, of_init_fn_1_ret)
> > ^
> > include/linux/clocksource.h:247:2: note: in expansion of macro 'OF_DECLARE_1_RET'
> > OF_DECLARE_1_RET(clksrc, name, compat, fn)
> > ^
> > drivers/clocksource/jcore-pit.c:277:1: note: in expansion of macro 'CLOCKSOURCE_OF_DECLARE'
> > CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init);
> > ^
> >
> > Introduced by commits
> >
> > b7c4db861683 ("clocksource/drivers/clksrc-probe: Introduce init functions with return code")
> > 177cf6e52b0a ("clocksources: Switch back to the clksrc table")
> >
> > interacting with commit
> >
> > e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")
> >
> > from the sh tree.
>
> And why is that driver coming through the superh tree and not through the
> clocksource maintainers? It's not only based on an old interface it's probably
> unreviewed as well ...
Drivers will go upstream through their proper subsystem maintainers,
not from my tree, but last time I got feedback that these drivers had
not seen any testing in linux-next. I can refrain from including
patches that I can't upstream directly in my for-next branch in the
future if you'd prefer but this way seemed to make less work for
others.
Rich
^ permalink raw reply
* Re: linux-next: manual merge of the pwm tree with the regulator tree
From: Thierry Reding @ 2016-07-25 14:26 UTC (permalink / raw)
To: Doug Anderson
Cc: Stephen Rothwell, Mark Brown, Liam Girdwood,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris Brezillon, Alexandre Courbot
In-Reply-To: <CAD=FV=Ufs+NBgSmMeJNUwGUnJZOC1Tvpt6PvSCQLAkxxLULhUA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4109 bytes --]
On Mon, Jul 25, 2016 at 06:29:00AM -0700, Doug Anderson wrote:
> Hi,
>
> On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding
> <thierry.reding@gmail.com> wrote:
> > On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote:
> >> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote:
> >> > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote:
> >> > > Hi,
> >> > >
> >> > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> > > > Hi Thierry,
> >> > > >
> >> > > > Today's linux-next merge of the pwm tree got a conflict in:
> >> > > >
> >> > > > drivers/regulator/pwm-regulator.c
> >> > > >
> >> > > > between commit:
> >> > > >
> >> > > > 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call")
> >> > > > 27bfa8893b15 ("regulator: pwm: Support for enable GPIO")
> >> > > > c2588393e631 ("regulator: pwm: Fix regulator ramp delay for continuous mode")
> >> > > >
> >> > > > from the regulator tree and commit:
> >> > > >
> >> > > > b0303deaa480 ("regulator: pwm: Adjust PWM config at probe time")
> >> > > > 8bd57ca236d0 ("regulator: pwm: Switch to the atomic PWM API")
> >> > > > 25d16595935b ("regulator: pwm: Retrieve correct voltage")
> >> > > > 53f239af4c14 ("regulator: pwm: Support extra continuous mode cases")
> >> > > >
> >> > > > from the pwm tree.
> >> > > >
> >> > > > I fixed it up (I think, please check - 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
> >> > >
> >> > > [ cut ]
> >> > >
> >> > > > - /* Delay required by PWM regulator to settle to the new voltage */
> >> > > > - usleep_range(ramp_delay, ramp_delay + 1000);
> >> > > > + /* Ramp delay is in uV/uS. Adjust to uS and delay */
> >> > > > + ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
> >> > >
> >> > > This was what I was worried about and why I originally sent my patch
> >> > > based upon Boris's series. The above should be:
> >> > >
> >> > > ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
> >> > >
> >> > > Specifically note the use of "req_min_uV" and not "min_uV".
> >> >
> >> > Okay, so this is something that needs to be fixed up in one of Boris'
> >> > patches? Can you help point out where exactly? The conflict should be
> >> > gone as of tomorrow's linux-next.
> >>
> >> Looks like the below should be squashed into commit:
> >>
> >> 4585082afab4 regulator: pwm: Support extra continuous mode cases
> >>
> >> Can you confirm?
> >>
> >> Thierry
> >>
> >> --- >8 ---
> >> diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
> >> index 263a2d16d909..c24524242da2 100644
> >> --- a/drivers/regulator/pwm-regulator.c
> >> +++ b/drivers/regulator/pwm-regulator.c
> >> @@ -237,7 +237,7 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
> >> return 0;
> >>
> >> /* Ramp delay is in uV/uS. Adjust to uS and delay */
> >> - ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
> >> + ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
> >> usleep_range(ramp_delay, ramp_delay + DIV_ROUND_UP(ramp_delay, 10));
> >>
> >> return 0;
> >
> > Doug? Can you confirm?
>
> Yes, right. Sorry, previous email got lost in the shuffle since I was
> on vacation.
>
> Right, commit 4585082afab4 ("regulator: pwm: Support extra continuous
> mode cases") is the one that renamed the parameters and so this use of
> one of the parameters needs to be part of that commit.
Squashed it into the above commit and pushed everything out.
Thanks,
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the pwm tree with the regulator tree
From: Doug Anderson @ 2016-07-25 13:29 UTC (permalink / raw)
To: Thierry Reding
Cc: Stephen Rothwell, Mark Brown, Liam Girdwood,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris Brezillon, Alexandre Courbot
In-Reply-To: <20160725082906.GA4667@ulmo.ba.sec>
Hi,
On Mon, Jul 25, 2016 at 1:29 AM, Thierry Reding
<thierry.reding@gmail.com> wrote:
> On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote:
>> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote:
>> > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote:
>> > > Hi,
>> > >
>> > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > > > Hi Thierry,
>> > > >
>> > > > Today's linux-next merge of the pwm tree got a conflict in:
>> > > >
>> > > > drivers/regulator/pwm-regulator.c
>> > > >
>> > > > between commit:
>> > > >
>> > > > 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call")
>> > > > 27bfa8893b15 ("regulator: pwm: Support for enable GPIO")
>> > > > c2588393e631 ("regulator: pwm: Fix regulator ramp delay for continuous mode")
>> > > >
>> > > > from the regulator tree and commit:
>> > > >
>> > > > b0303deaa480 ("regulator: pwm: Adjust PWM config at probe time")
>> > > > 8bd57ca236d0 ("regulator: pwm: Switch to the atomic PWM API")
>> > > > 25d16595935b ("regulator: pwm: Retrieve correct voltage")
>> > > > 53f239af4c14 ("regulator: pwm: Support extra continuous mode cases")
>> > > >
>> > > > from the pwm tree.
>> > > >
>> > > > I fixed it up (I think, please check - 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
>> > >
>> > > [ cut ]
>> > >
>> > > > - /* Delay required by PWM regulator to settle to the new voltage */
>> > > > - usleep_range(ramp_delay, ramp_delay + 1000);
>> > > > + /* Ramp delay is in uV/uS. Adjust to uS and delay */
>> > > > + ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
>> > >
>> > > This was what I was worried about and why I originally sent my patch
>> > > based upon Boris's series. The above should be:
>> > >
>> > > ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
>> > >
>> > > Specifically note the use of "req_min_uV" and not "min_uV".
>> >
>> > Okay, so this is something that needs to be fixed up in one of Boris'
>> > patches? Can you help point out where exactly? The conflict should be
>> > gone as of tomorrow's linux-next.
>>
>> Looks like the below should be squashed into commit:
>>
>> 4585082afab4 regulator: pwm: Support extra continuous mode cases
>>
>> Can you confirm?
>>
>> Thierry
>>
>> --- >8 ---
>> diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
>> index 263a2d16d909..c24524242da2 100644
>> --- a/drivers/regulator/pwm-regulator.c
>> +++ b/drivers/regulator/pwm-regulator.c
>> @@ -237,7 +237,7 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
>> return 0;
>>
>> /* Ramp delay is in uV/uS. Adjust to uS and delay */
>> - ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
>> + ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
>> usleep_range(ramp_delay, ramp_delay + DIV_ROUND_UP(ramp_delay, 10));
>>
>> return 0;
>
> Doug? Can you confirm?
Yes, right. Sorry, previous email got lost in the shuffle since I was
on vacation.
Right, commit 4585082afab4 ("regulator: pwm: Support extra continuous
mode cases") is the one that renamed the parameters and so this use of
one of the parameters needs to be part of that commit.
Thanks!
-Doug
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Daniel Lezcano @ 2016-07-25 13:11 UTC (permalink / raw)
To: Stephen Rothwell, Rich Felker
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Mark Brown, Marc Zyngier
In-Reply-To: <alpine.DEB.2.11.1607250915160.5629@nanos>
On 07/25/2016 09:16 AM, Thomas Gleixner wrote:
> On Sun, 24 Jul 2016, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
>> produced this warning:
>>
>> In file included from include/linux/clocksource.h:18:0,
>> from include/linux/clockchips.h:13,
>> from drivers/clocksource/jcore-pit.c:14:
>> include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
>> .data = (fn == (fn_type)NULL) ? fn : fn }
>> ^
>> include/linux/of.h:1020:3: note: in expansion of macro '_OF_DECLARE'
>> _OF_DECLARE(table, name, compat, fn, of_init_fn_1_ret)
>> ^
>> include/linux/clocksource.h:247:2: note: in expansion of macro 'OF_DECLARE_1_RET'
>> OF_DECLARE_1_RET(clksrc, name, compat, fn)
>> ^
>> drivers/clocksource/jcore-pit.c:277:1: note: in expansion of macro 'CLOCKSOURCE_OF_DECLARE'
>> CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init);
>> ^
>>
>> Introduced by commits
>>
>> b7c4db861683 ("clocksource/drivers/clksrc-probe: Introduce init functions with return code")
>> 177cf6e52b0a ("clocksources: Switch back to the clksrc table")
>>
>> interacting with commit
>>
>> e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")
>>
>> from the sh tree.
>
> And why is that driver coming through the superh tree and not through the
> clocksource maintainers? It's not only based on an old interface it's probably
> unreviewed as well ...
Rich,
why are these changes in linux-next ?
Except I am missing something, I don't see a new version sent for review
on the mailing list. The interrupt controller driver is almost empty as
stated by Marc Zyngier and there is no explanation / discussion about it.
I don't know the goal of adding those patches in linux-next via your
tree, may be you misunderstood how linux-next works and you should
remove them. But if the purpose was to merge the patches, I remind you
that being an arch maintainer does not give you the right to apply any
patches, everywhere, at all cost, without review, because you want them
in, you must follow the process, otherwise you take the risk to upset a
lot of people and to be kicked out.
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Arnaldo Carvalho de Melo @ 2016-07-25 12:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Josh Poimboeuf, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160723150845.3af8e452@canb.auug.org.au>
Em Sat, Jul 23, 2016 at 03:08:45PM +1000, Stephen Rothwell escreveu:
> On Fri, 22 Jul 2016 16:57:34 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > I applied your patch and will push it to Ingo, now we must cross our
> > fingers so that Stephen doesn't come back to us once more telling it is
> > still broken :o)
> Unfortunately, this is what I get when I just build perf/core:
> DESCEND objtool
> CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/builtin-check.o
Cool! objtool is fixed, we're not at a different tool using those
headers, and your patch fixes it, I see Andy acked it, I'll merge this
and push to Ingo,
Thanks,
- Arnaldo
> LD /home/sfr/next/x86_64_allmodconfig/tools/objtool/objtool-in.o
> Warning: objtool: x86 instruction decoder differs from kernel
> LINK /home/sfr/next/x86_64_allmodconfig/tools/objtool/objtool
> In file included from /home/sfr/next/next/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
> from /home/sfr/next/next/include/uapi/asm-generic/int-ll64.h:11,
> from /home/sfr/next/next/include/uapi/asm-generic/types.h:6,
> from /home/sfr/next/next/arch/x86/include/uapi/asm/types.h:4,
> from /home/sfr/next/next/tools/include/linux/types.h:9,
> from /home/sfr/next/next/include/uapi/linux/elf.h:4,
> from /home/sfr/next/next/arch/x86/entry/vdso/vdso2c.c:66:
> /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2: error: #error Inconsistent word size. Check asm/bitsperlong.h
> #error Inconsistent word size. Check asm/bitsperlong.h
> ^
>
> The be clear: this is a ppc64le hosted, x86_64 target cross build.
>
> I than added the following patch, and the build finishes successfully.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 23 Jul 2016 14:35:40 +1000
> Subject: [PATCH] x86: make the vdso2c compiler use the host architecture
> headers
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/entry/vdso/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
> index 253b72eaade6..25e88c030c47 100644
> --- a/arch/x86/entry/vdso/Makefile
> +++ b/arch/x86/entry/vdso/Makefile
> @@ -55,7 +55,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
> $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
> $(call if_changed,vdso)
>
> -HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
> +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
> hostprogs-y += vdso2c
>
> quiet_cmd_vdso2c = VDSO2C $@
> --
> 2.8.1
>
> There may be a more correct way to do this ...
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the i2c tree
From: Andy Shevchenko @ 2016-07-25 12:03 UTC (permalink / raw)
To: Wolfram Sang
Cc: Rafael J. Wysocki, Stephen Rothwell, linux-next,
linux-kernel@vger.kernel.org, Octavian Purdila, Jarkko Nikula,
Andy Shevchenko, Mika Westerberg
In-Reply-To: <20160719034806.GA1640@katana>
On Tue, Jul 19, 2016 at 6:48 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> > Well, not knowing much about ACPI, I just need the conflict resolution
>> > for my latest i2c/for-next and your above branch. If you want to do it,
>> > fine with me. But maybe Jarkko will be back to office on Monday, too.
>>
>> Unfortunately, I don't see how these branches can be merged in a sensible
>> way without adding too much new code into the merge itself.
>>
>> Something needs to be dropped and then rebased and applied again.
>
> Okay, I'll drop the I2C parts. Next to the core parts which I will drop,
> there was also a driver patch making use of the core changes for which I
> requested some updates. Since those did not happen yet (Jarkko on
> holiday?), the core patches alone are not important anyhow.
Jarkko and Mika are on holidays, I recently noticed this thread,
sorry. For now your solution seems okay, since we can't push broken
parts into v4.8-rc1.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* Re: linux-next: the merge window has opened
From: Stephen Rothwell @ 2016-07-25 10:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
In-Reply-To: <20160725164148.4d79e928@canb.auug.org.au>
Hi all,
On Mon, 25 Jul 2016 16:41:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Please do not add material destined for v4.9 to your linux-next included
> branches until after v8.1-rc1 has been released.
^^^
4.8
I wonder where my wind has wandered off to :-)
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20160725 build: 0 failures 6 warnings (next-20160725)
From: Build bot for Mark Brown @ 2016-07-25 10:09 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160725
Git describe: next-20160725
Commit: f7d63d9920 Add linux-next specific files for 20160725
Build Time: 88 min 40 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 6
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
4 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
2 warnings 0 mismatches : x86_64-defconfig
6 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 6
6 ../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
6 ../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
2 ../include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
^ permalink raw reply
* Re: linux-next: manual merge of the pwm tree with the regulator tree
From: Thierry Reding @ 2016-07-25 8:29 UTC (permalink / raw)
To: Doug Anderson
Cc: Stephen Rothwell, Mark Brown, Liam Girdwood,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boris Brezillon, Alexandre Courbot
In-Reply-To: <20160711213900.GA12942@ulmo.ba.sec>
[-- Attachment #1: Type: text/plain, Size: 3308 bytes --]
On Mon, Jul 11, 2016 at 11:39:00PM +0200, Thierry Reding wrote:
> On Mon, Jul 11, 2016 at 11:30:59PM +0200, Thierry Reding wrote:
> > On Mon, Jul 11, 2016 at 09:47:34AM -0700, Doug Anderson wrote:
> > > Hi,
> > >
> > > On Sun, Jul 10, 2016 at 11:56 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > Hi Thierry,
> > > >
> > > > Today's linux-next merge of the pwm tree got a conflict in:
> > > >
> > > > drivers/regulator/pwm-regulator.c
> > > >
> > > > between commit:
> > > >
> > > > 830583004e61 ("regulator: pwm: Drop unneeded pwm_enable() call")
> > > > 27bfa8893b15 ("regulator: pwm: Support for enable GPIO")
> > > > c2588393e631 ("regulator: pwm: Fix regulator ramp delay for continuous mode")
> > > >
> > > > from the regulator tree and commit:
> > > >
> > > > b0303deaa480 ("regulator: pwm: Adjust PWM config at probe time")
> > > > 8bd57ca236d0 ("regulator: pwm: Switch to the atomic PWM API")
> > > > 25d16595935b ("regulator: pwm: Retrieve correct voltage")
> > > > 53f239af4c14 ("regulator: pwm: Support extra continuous mode cases")
> > > >
> > > > from the pwm tree.
> > > >
> > > > I fixed it up (I think, please check - 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
> > >
> > > [ cut ]
> > >
> > > > - /* Delay required by PWM regulator to settle to the new voltage */
> > > > - usleep_range(ramp_delay, ramp_delay + 1000);
> > > > + /* Ramp delay is in uV/uS. Adjust to uS and delay */
> > > > + ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
> > >
> > > This was what I was worried about and why I originally sent my patch
> > > based upon Boris's series. The above should be:
> > >
> > > ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
> > >
> > > Specifically note the use of "req_min_uV" and not "min_uV".
> >
> > Okay, so this is something that needs to be fixed up in one of Boris'
> > patches? Can you help point out where exactly? The conflict should be
> > gone as of tomorrow's linux-next.
>
> Looks like the below should be squashed into commit:
>
> 4585082afab4 regulator: pwm: Support extra continuous mode cases
>
> Can you confirm?
>
> Thierry
>
> --- >8 ---
> diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
> index 263a2d16d909..c24524242da2 100644
> --- a/drivers/regulator/pwm-regulator.c
> +++ b/drivers/regulator/pwm-regulator.c
> @@ -237,7 +237,7 @@ static int pwm_regulator_set_voltage(struct regulator_dev *rdev,
> return 0;
>
> /* Ramp delay is in uV/uS. Adjust to uS and delay */
> - ramp_delay = DIV_ROUND_UP(abs(min_uV - old_uV), ramp_delay);
> + ramp_delay = DIV_ROUND_UP(abs(req_min_uV - old_uV), ramp_delay);
> usleep_range(ramp_delay, ramp_delay + DIV_ROUND_UP(ramp_delay, 10));
>
> return 0;
Doug? Can you confirm?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the vfs tree with the overlayfs tree
From: Miklos Szeredi @ 2016-07-25 8:09 UTC (permalink / raw)
To: Al Viro; +Cc: Stephen Rothwell, linux-next, linux-kernel, Miklos Szeredi
In-Reply-To: <20160725003028.GQ2356@ZenIV.linux.org.uk>
On Mon, Jul 25, 2016 at 2:30 AM, Al Viro <viro@zeniv.linux.org.uk> wrote:
> On Mon, Jul 25, 2016 at 10:24:53AM +1000, Stephen Rothwell wrote:
>> Hi Al,
>>
>> Today's linux-next merge of the vfs tree got a conflict in:
>>
>> fs/overlayfs/super.c
>>
>> between commit:
>>
>> e2475b7276d0 ("ovl: check mounter creds on underlying lookup")
>>
>> from the overlayfs tree and commit:
>>
>> b3ac9a85b31c ("qstr: constify instances in overlayfs")
>>
>> from the vfs 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.
>
> FWIW, if Miklos could pick that one-liner into overlayfs tree, I'd be only
> happy to drop it from that queue.
OK, picked that one.
Thanks,
Miklos
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Thomas Gleixner @ 2016-07-25 7:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ingo Molnar, H. Peter Anvin, Peter Zijlstra, Rich Felker,
linux-next, linux-kernel, Daniel Lezcano
In-Reply-To: <20160724153233.49f1574d@canb.auug.org.au>
On Sun, 24 Jul 2016, Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> In file included from include/linux/clocksource.h:18:0,
> from include/linux/clockchips.h:13,
> from drivers/clocksource/jcore-pit.c:14:
> include/linux/of.h:1004:20: warning: comparison of distinct pointer types lacks a cast
> .data = (fn == (fn_type)NULL) ? fn : fn }
> ^
> include/linux/of.h:1020:3: note: in expansion of macro '_OF_DECLARE'
> _OF_DECLARE(table, name, compat, fn, of_init_fn_1_ret)
> ^
> include/linux/clocksource.h:247:2: note: in expansion of macro 'OF_DECLARE_1_RET'
> OF_DECLARE_1_RET(clksrc, name, compat, fn)
> ^
> drivers/clocksource/jcore-pit.c:277:1: note: in expansion of macro 'CLOCKSOURCE_OF_DECLARE'
> CLOCKSOURCE_OF_DECLARE(jcore_pit, "jcore,pit", jcore_pit_init);
> ^
>
> Introduced by commits
>
> b7c4db861683 ("clocksource/drivers/clksrc-probe: Introduce init functions with return code")
> 177cf6e52b0a ("clocksources: Switch back to the clksrc table")
>
> interacting with commit
>
> e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")
>
> from the sh tree.
And why is that driver coming through the superh tree and not through the
clocksource maintainers? It's not only based on an old interface it's probably
unreviewed as well ...
Thanks,
tglx
^ permalink raw reply
* linux-next: the merge window has opened
From: Stephen Rothwell @ 2016-07-25 6:41 UTC (permalink / raw)
To: linux-next; +Cc: LKML
Hi all,
Please do not add material destined for v4.9 to your linux-next included
branches until after v8.1-rc1 has been released.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the block tree
From: Stephen Rothwell @ 2016-07-25 6:32 UTC (permalink / raw)
To: Greg KH, Jens Axboe
Cc: linux-next, linux-kernel, James Simmons, Mike Christie, Linus
In-Reply-To: <20160614150737.015362de@canb.auug.org.au>
Hi all,
On Tue, 14 Jun 2016 15:07:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/llite/lloop.c
>
> between commit:
>
> 95fe6c1a209e ("block, fs, mm, drivers: use bio set/get op accessors")
>
> from the block tree and commit:
>
> 67b1a24e883c ("staging: lustre: llite: remove lloop device")
>
> from the staging tree.
>
> I fixed it up (I removed the file) 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.
Since Linus has merged the staging tree, this file will need to be
removed when the block tree is merged into Linus' tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the drm tree
From: Stephen Rothwell @ 2016-07-25 6:29 UTC (permalink / raw)
To: Greg KH, Dave Airlie
Cc: linux-next, linux-kernel, Christian König, Daniel Vetter,
Gustavo Padovan, Linus
In-Reply-To: <20160620143353.03399257@canb.auug.org.au>
Hi all,
On Mon, 20 Jun 2016 14:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/android/sync.h
>
> between commit:
>
> 76bf0db55439 ("dma-buf/fence: make fence context 64 bit v2")
>
> from the drm tree and commits:
>
> 342952d3a5c4 ("staging/android: remove 'destroyed' member from struct sync_timeline")
> 1fe82e2e1486 ("staging/android: rename sync.h to sync_debug.h")
>
> from the staging tree.
>
> I fixed it up (I removed the file and applied the following fix patch)
> 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 20 Jun 2016 14:28:29 +1000
> Subject: [PATCH] staging/android: merge fix up for sync.h renaming
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/android/sync_debug.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
> index 425ebc5c32aa..fab66396d421 100644
> --- a/drivers/staging/android/sync_debug.h
> +++ b/drivers/staging/android/sync_debug.h
> @@ -34,7 +34,8 @@ struct sync_timeline {
> char name[32];
>
> /* protected by child_list_lock */
> - int context, value;
> + u64 context;
> + int value;
>
> struct list_head child_list_head;
> spinlock_t child_list_lock;
> --
> 2.8.1
Since Linus has merged the staging tree, this extra merge resolution
will now be needed when the drm tree is merged with Linus' tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Jul 25
From: Stephen Rothwell @ 2016-07-25 6:17 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160724:
The powerpc tree still had its build failure for which I applied a fix patch.
The vfs tree gained conflicts against the f2fs and overlayfs trees.
The nvdimm tree gained a conflict against the kvm tree.
Non-merge commits (relative to Linus' tree): 11060
10157 files changed, 569997 insertions(+), 204782 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 240 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
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 (523d939ef98f Linux 4.7)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (107df03203bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec/master (1ba5bf993c6a xfrm: fix crash in XFRM_MSG_GETSA netlink handler)
Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation)
Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7)
Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (e9003c9cfaa1 Input: tsc200x - report proper input_dev name)
Merging crypto-current/master (87dcdebd6beb crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
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 (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (b4dff2874006 ARC: dma: fix address translation in arc_dma_free)
Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1)
Merging arm-soc/for-next (9914c2a60844 arm-soc: document merge)
Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and '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 (63a404a3f177 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (370c3261ba8a Merge branch 'omap-for-v4.8/soc' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes)
Merging renesas/next (314a0bb0dd88 Merge branch 'heads/soc-fixes-for-v4.8' into next)
Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (6083e0f837ac Merge branch for-4.8/arm64/defconfig into for-next)
Merging arm64/for-next/core (a95b0644b38c Merge branch 'for-next/kprobes' into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/mm/fault.c
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 (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
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 (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (5ab4159a469d Merge branch '4.7-fixes' into mips-for-linux-next)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (ccf5c442a1b8 crypto: vmx - Convert to CPU feature based module autoloading)
Applying: powerpc: fix for "Move MMU backend selection out of platform code"
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (55d1544ea11e s390/cio: fix premature wakeup during chp configure)
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 (2f740786bc01 sh: Delete unnecessary checks before the function call "mempool_destroy")
Applying: clocksource: make J-Core timer_interrupt more unique
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (701aa322c418 Fixup: fs_info/root cleanups and qgroups patches)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (bd975d1eead2 cifs: fix crash due to race in hmac(md5) handling)
Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (7bc949164511 ext4: verify extent header depth)
Merging f2fs/dev (5dbb99df8c07 f2fs: clean up codying style and redundancy)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4bb06282417f fuse: use filemap_check_errors())
Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules"
Merging gfs2/for-next (e1cb6be9e142 GFS2: Fix gfs2_replay_incr_blk for multiple journal sizes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (6fdf339b0ca7 NFSv4.2: Fix warning "variable ‘stateids’ set but not used")
Merging nfsd/nfsd-next (96c35631204c SUNRPC: change UDP socket space reservation)
Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling)
Merging overlayfs/overlayfs-next (bc12ac8bda5d Merge branch 'overlayfs-linus' into overlayfs-next)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (f2bdfda9a1c6 Merge branch 'xfs-4.8-misc-fixes-4' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (c0f933c90415 Merge branch 'work.const-qstr' into for-next)
CONFLICT (content): Merge conflict in fs/overlayfs/super.c
CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next)
Merging i2c/i2c/for-next (2c32e9ed5dcb Merge branch 'i2c/for-4.8' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (b53893aae441 hwmon: (adt7411) set bit 3 in CFG1 register)
Merging v4l-dvb/master (bcbadf9d8331 Merge branch 'topic/docs-next' into to_next)
Merging pm/linux-next (522c233d18d3 Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (36727348f33b dmaengine: ioatdma: fix uninitialized array usage)
Merging net-next/master (de0ba9a0d890 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging netfilter-next/master (4b512e1c1f8d netfilter: nft_compat: fix crash when related match/target module is removed)
Merging ipvs-next/master (be2cef49904b ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable)
Merging bluetooth/master (f176b0d0374d 6lowpan: ndisc: no overreact if no short address is available)
Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API)
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5)
Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7)
Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding)
Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM)
CONFLICT (content): Merge conflict in drivers/mtd/devices/Kconfig
Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address)
Merging crypto/master (0f95e2ffc58f Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging drm/drm-next (c11dea5b0290 Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next)
CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in Documentation/index.rst
Applying: drm/i915/opregion: fix up for argument change
Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel)
Merging drm-intel/for-linux-next (fa95986095e3 drm/i915: Set legacy properties when using legacy gamma set IOCTL. (v2))
Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes)
Merging drm-misc/topic/drm-misc (d9a7ed770f9d drm/etnaviv: Optimize error handling in etnaviv_gem_new_userptr())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (ec17db5f3f15 Merge branch 'kbuild/misc' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (c802d8b16509 mm: SLUB hardened usercopy support)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (275353bb684e ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members)
Merging sound-asoc/for-next (e7ca8fcd1504 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (9fc3d73bedc7 module: Do a WARN_ON_ONCE() for assert module mutex not held)
Merging input/next (0097ff3d5dad Input: tty/vt/keyboard - use memdup_user())
Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (modify/delete): fs/ext4/crypto.c deleted in HEAD and modified in block/for-next. Version block/for-next of fs/ext4/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c
CONFLICT (content): Merge conflict in block/blk-lib.c
$ git rm -f fs/ext4/crypto.c
Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
Merging device-mapper/for-next (b5ab4a9ba557 dm: allow bio-based table to be upgraded to bio-based with DAX support)
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (3741bfa8ea78 mmc: sdhci-msm: Add support for UHS cards)
Merging md/for-next (0e5313e2d4ef raid10: improve random reads performance)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
Merging watchdog/master (e035d8f787b1 watchdog: sbsa: Drop status function)
Merging iommu/next (a9f890f46e6a Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release)
Merging jc_docs/docs-next (a88b1672d4dd doc-rst: kernel-doc: fix handling of address_space tags)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg())
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (7587eb18fa9d Fix spelling errors in Documentation/devicetree)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
CONFLICT (content): Merge conflict in arch/arc/kernel/setup.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (56432b7324d0 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging perf/perf/core (60cbdf5d051d tools build: Fix objtool build with ARCH=x86_64)
Applying: x86: make the vdso2c compiler use the host architecture headers
Merging tip/auto-latest (1203ef006905 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c
CONFLICT (content): Merge conflict in arch/sh/include/asm/spinlock.h
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM"
Applying: locking/spinlock, arch: merge fix for "sh: add J2 atomics using the cas.l instruction"
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
Merging rcu/rcu/next (4d0000ea434f list: Expand list_first_entry_or_null())
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (912902ce78b0 Merge tag 'kvm-arm-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next)
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree.
CONFLICT (content): Merge conflict in include/linux/irqchip/arm-gic-v3.h
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h
$ git rm -f virt/kvm/arm/vgic.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (3f312db6b65b KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype)
CONFLICT (content): Merge conflict in virt/kvm/irqchip.c
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3)
Merging xen-tip/linux-next (aea305e11f7a xen-blkback: really don't leak mode property)
CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (332e081225fc intel-vbtn: new driver for Intel Virtual Button)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (523d939ef98f Linux 4.7)
Merging tty/tty-next (67417f9c262e Merge 4.7-rc6 into tty-next)
Merging usb/usb-next (cb42b63d893d cdc-acm: beautify probe())
Applying: staging: emxx_udc: allow modular build
Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status)
Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting)
Merging staging/staging-next (6c71ee3b6157 Merge tag 'iio-for-4.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (45c7d71e1675 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing)
Merging extcon/extcon-next (c2692f2dad4f extcon: Block the bit masking operation for cable state except for extcon core)
Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next)
CONFLICT (content): Merge conflict in kernel/cgroup.c
Merging scsi/for-next (354a086d9369 scsi:libsas: fix oops caused by assigning a freed task to ->lldd_task)
Merging target-updates/for-next (4f29d35158e2 cxgb3i,cxgb4i: fix symbol not declared sparse warning)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (9e4bc77c45ba Merge branch 'for-4.8' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (9573e7923007 pinctrl: fix pincontrol definition for marvell)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (152b09f20130 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (9637e7e0403a Merge branch 'for-4.8/regulator' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
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 (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
CONFLICT (content): Merge conflict in fs/proc/root.c
CONFLICT (content): Merge conflict in fs/posix_acl.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (d22527fed2f0 Merge branch 'clk-fixes' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (7c844fbeb7ce coresight: etm4x: remove duplicated include from coresight-etm4x.c)
Merging rtc/rtc-next (bb9dbb01bef9 rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy)
CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (0606263f24f3 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
Applying: dm: merge fix for "pmem: kill __pmem address space"
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (029c4d7a7ee5 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in include/linux/thread_info.h
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label
Applying: sparc: support static_key usage in non-module __exit sections
Applying: tile: support static_key usage in non-module __exit sections
Applying: arm: jump label may reference text in __exit
Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
Applying: dynamic_debug: add jump label support
Applying: ipc/sem.c: fix complex_count vs. simple op race
Applying: ipc/sem.c: remove duplicated memory barriers
Applying: media: mtk-vcodec: remove unused dma_attrs
Applying: dma-mapping: use unsigned long for dma_attrs
Applying: alpha: dma-mapping: use unsigned long for dma_attrs
Applying: arc: dma-mapping: use unsigned long for dma_attrs
Applying: ARM: dma-mapping: use unsigned long for dma_attrs
Applying: arm64: dma-mapping: use unsigned long for dma_attrs
Applying: avr32: dma-mapping: use unsigned long for dma_attrs
Applying: blackfin: dma-mapping: use unsigned long for dma_attrs
Applying: c6x: dma-mapping: use unsigned long for dma_attrs
Applying: cris: dma-mapping: use unsigned long for dma_attrs
Applying: frv: dma-mapping: use unsigned long for dma_attrs
Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs
Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs
Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs
Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs
Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs
Applying: infiniband: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: dma-mapping: use unsigned long for dma_attrs
Applying: media: dma-mapping: use unsigned long for dma_attrs
Applying: xen: dma-mapping: use unsigned long for dma_attrs
Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs
Applying: powerpc: dma-mapping: use unsigned long for dma_attrs
Applying: video: dma-mapping: use unsigned long for dma_attrs
Applying: x86: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs
Applying: h8300: dma-mapping: use unsigned long for dma_attrs
Applying: hexagon: dma-mapping: use unsigned long for dma_attrs
Applying: ia64: dma-mapping: use unsigned long for dma_attrs
Applying: m68k: dma-mapping: use unsigned long for dma_attrs
Applying: metag: dma-mapping: use unsigned long for dma_attrs
Applying: microblaze: dma-mapping: use unsigned long for dma_attrs
Applying: mips: dma-mapping: use unsigned long for dma_attrs
Applying: mn10300: dma-mapping: use unsigned long for dma_attrs
Applying: nios2: dma-mapping: use unsigned long for dma_attrs
Applying: openrisc: dma-mapping: use unsigned long for dma_attrs
Applying: parisc: dma-mapping: use unsigned long for dma_attrs
Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs
Applying: s390: dma-mapping: use unsigned long for dma_attrs
Applying: sh: dma-mapping: use unsigned long for dma_attrs
Applying: sparc: dma-mapping: use unsigned long for dma_attrs
Applying: tile: dma-mapping: use unsigned long for dma_attrs
Applying: unicore32: dma-mapping: use unsigned long for dma_attrs
Applying: xtensa: dma-mapping: use unsigned long for dma_attrs
Applying: remoteproc: qcom: use unsigned long for dma_attrs
Applying: dma-mapping: remove dma_get_attr
Applying: dma-mapping: document the DMA attributes next to the declaration
Merging akpm/master (181d7c9c2974 dma-mapping: document the DMA attributes next to the declaration)
^ permalink raw reply
* linux-next: manual merge of the nvdimm tree with the kvm tree
From: Stephen Rothwell @ 2016-07-25 4:46 UTC (permalink / raw)
To: Dan Williams, Marcelo Tosatti, Gleb Natapov, kvm
Cc: linux-next, linux-kernel, Yunhong Jiang, Paolo Bonzini,
Haozhong Zhang
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
arch/x86/kvm/vmx.c
between commits:
64672c95ea4c ("kvm: vmx: hook preemption timer support")
37e4c997dadf ("KVM: VMX: validate individual bits of guest MSR_IA32_FEATURE_CONTROL")
from the kvm tree and commit:
dfa169bbee00 ("Revert "KVM: x86: add pcommit support"")
from the nvdimm 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 arch/x86/kvm/vmx.c
index 9dcfb31f81ae,48394e9d56ef..000000000000
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@@ -7680,19 -7554,6 +7676,12 @@@ static int handle_pml_full(struct kvm_v
return 1;
}
- static int handle_pcommit(struct kvm_vcpu *vcpu)
- {
- /* we never catch pcommit instruct for L1 guest. */
- WARN_ON(1);
- return 1;
- }
-
+static int handle_preemption_timer(struct kvm_vcpu *vcpu)
+{
+ kvm_lapic_expired_hv_timer(vcpu);
+ return 1;
+}
+
/*
* The exit handlers return 1 if the exit was handled fully and guest execution
* may resume. Otherwise they set the kvm_run parameter to indicate what needs
@@@ -7743,8 -7604,6 +7732,7 @@@ static int (*const kvm_vmx_exit_handler
[EXIT_REASON_XSAVES] = handle_xsaves,
[EXIT_REASON_XRSTORS] = handle_xrstors,
[EXIT_REASON_PML_FULL] = handle_pml_full,
- [EXIT_REASON_PCOMMIT] = handle_pcommit,
+ [EXIT_REASON_PREEMPTION_TIMER] = handle_preemption_timer,
};
static const int kvm_vmx_max_exit_handlers =
@@@ -8053,10 -7912,6 +8041,8 @@@ static bool nested_vmx_exit_handled(str
* the XSS exit bitmap in vmcs12.
*/
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES);
- case EXIT_REASON_PCOMMIT:
- return nested_cpu_has2(vmcs12, SECONDARY_EXEC_PCOMMIT);
+ case EXIT_REASON_PREEMPTION_TIMER:
+ return false;
default:
return true;
}
@@@ -9239,22 -9072,6 +9225,13 @@@ static void vmx_cpuid_update(struct kvm
if (cpu_has_secondary_exec_ctrls())
vmcs_set_secondary_exec_control(secondary_exec_ctl);
+
- if (static_cpu_has(X86_FEATURE_PCOMMIT) && nested) {
- if (guest_cpuid_has_pcommit(vcpu))
- vmx->nested.nested_vmx_secondary_ctls_high |=
- SECONDARY_EXEC_PCOMMIT;
- else
- vmx->nested.nested_vmx_secondary_ctls_high &=
- ~SECONDARY_EXEC_PCOMMIT;
- }
-
+ if (nested_vmx_allowed(vcpu))
+ to_vmx(vcpu)->msr_ia32_feature_control_valid_bits |=
+ FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
+ else
+ to_vmx(vcpu)->msr_ia32_feature_control_valid_bits &=
+ ~FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
}
static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
^ permalink raw reply
* Re: linux-next: build failure after merge of the sh tree
From: Stephen Rothwell @ 2016-07-25 4:18 UTC (permalink / raw)
To: Rich Felker; +Cc: linux-next, linux-kernel
In-Reply-To: <20160725035730.GR15995@brightrain.aerifal.cx>
Hi Rich,
On Sun, 24 Jul 2016 23:57:30 -0400 Rich Felker <dalias@libc.org> wrote:
>
> If it's acceptable I'll rebase this change into sh for-next and the
> patch I send to the subsystem maintainer.
Sure.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the sh tree
From: Stephen Rothwell @ 2016-07-25 4:16 UTC (permalink / raw)
To: Rich Felker
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160725035503.GQ15995@brightrain.aerifal.cx>
Hi Rich,
On Sun, 24 Jul 2016 23:55:03 -0400 Rich Felker <dalias@libc.org> wrote:
>
> On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/sh/include/asm/spinlock.h
> >
> > between commit:
> >
> > 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction")
> >
> > from the sh tree and commit:
> >
> > 726328d92a42 ("locking/spinlock, arch: Update and fix spin_unlock_wait() implementations")
> >
> > from the tip tree.
> >
> > I fixed it up (I used this file from the sh tree and then added the merge
> > fix patch 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.
>
> Assuming the J2 SMP changes go upstream this merge window, should I
> simply cite this conflict and your patch when sending the pull request
> to Linux, or include the merge fix patch myself?
Just mention it to Linus.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the sh tree
From: Rich Felker @ 2016-07-25 3:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160724175501.7a46e24f@canb.auug.org.au>
On Sun, Jul 24, 2016 at 05:55:01PM +1000, Stephen Rothwell wrote:
> Hi Rich,
>
> After merging the sh tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
>
> drivers/clocksource/jcore-pit.c:145:20: error: conflicting types for 'timer_interrupt'
> static irqreturn_t timer_interrupt(int irq, void *dev_id)
> ^
> In file included from arch/powerpc/include/asm/irqflags.h:11:0,
> from include/linux/irqflags.h:15,
> from include/linux/spinlock.h:53,
> from include/linux/mmzone.h:7,
> from include/linux/gfp.h:5,
> from include/linux/slab.h:14,
> from drivers/clocksource/jcore-pit.c:12:
> arch/powerpc/include/asm/hw_irq.h:36:13: note: previous declaration of 'timer_interrupt' was here
> extern void timer_interrupt(struct pt_regs *);
> ^
>
> Caused by commit
>
> e0aa0655c60b ("clocksource: add J-Core timer/clocksource driver")
>
> I added this fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sun, 24 Jul 2016 17:42:19 +1000
> Subject: [PATCH] clocksource: make J-Core timer_interrupt more unique
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/clocksource/jcore-pit.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c
> index b9d693bcb41e..373b9f954a5c 100644
> --- a/drivers/clocksource/jcore-pit.c
> +++ b/drivers/clocksource/jcore-pit.c
> @@ -142,7 +142,7 @@ static int jcore_pit_cpu_notify(struct notifier_block *self,
> return NOTIFY_OK;
> }
>
> -static irqreturn_t timer_interrupt(int irq, void *dev_id)
> +static irqreturn_t jcore_timer_interrupt(int irq, void *dev_id)
> {
> struct jcore_pit *pit = this_cpu_ptr(dev_id);
>
> @@ -224,7 +224,7 @@ static void __init jcore_pit_init(struct device_node *node)
> goto out;
> }
>
> - err = request_irq(pit_irq, timer_interrupt,
> + err = request_irq(pit_irq, jcore_timer_interrupt,
> IRQF_TIMER | IRQF_PERCPU, "jcore_pit", pit_percpu);
> if (err) {
> pr_err("pit irq request failed: %d\n", err);
> --
If it's acceptable I'll rebase this change into sh for-next and the
patch I send to the subsystem maintainer.
Rich
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the sh tree
From: Rich Felker @ 2016-07-25 3:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160724151342.32b35c80@canb.auug.org.au>
On Sun, Jul 24, 2016 at 03:13:42PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/sh/include/asm/spinlock.h
>
> between commit:
>
> 2da83dfce7df ("sh: add J2 atomics using the cas.l instruction")
>
> from the sh tree and commit:
>
> 726328d92a42 ("locking/spinlock, arch: Update and fix spin_unlock_wait() implementations")
>
> from the tip tree.
>
> I fixed it up (I used this file from the sh tree and then added the merge
> fix patch 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.
Assuming the J2 SMP changes go upstream this merge window, should I
simply cite this conflict and your patch when sending the pull request
to Linux, or include the merge fix patch myself?
Rich
^ permalink raw reply
* Re: linux-next: build warning after merge of the sh tree
From: Rich Felker @ 2016-07-25 3:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160724110012.188b6a27@canb.auug.org.au>
On Sun, Jul 24, 2016 at 11:00:12AM +1000, Stephen Rothwell wrote:
> Hi Rich,
>
> After merging the sh tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> WARNING: modpost: missing MODULE_LICENSE() in drivers/spi/spi-jcore.o
>
> Introduced by commit
>
> 8c7f438f0661 ("spi: add driver for J-Core SPI controller")
Thanks. I'll make that change for sending to the subsystem maintainer
and include it in my next rebase of for-next.
Rich
^ permalink raw reply
* Re: linux-next: manual merge of the vfs tree with the overlayfs tree
From: Al Viro @ 2016-07-25 0:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Miklos Szeredi, linux-next, linux-kernel, Miklos Szeredi
In-Reply-To: <20160725102453.7fbe3ddd@canb.auug.org.au>
On Mon, Jul 25, 2016 at 10:24:53AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/overlayfs/super.c
>
> between commit:
>
> e2475b7276d0 ("ovl: check mounter creds on underlying lookup")
>
> from the overlayfs tree and commit:
>
> b3ac9a85b31c ("qstr: constify instances in overlayfs")
>
> from the vfs 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.
FWIW, if Miklos could pick that one-liner into overlayfs tree, I'd be only
happy to drop it from that queue.
^ permalink raw reply
* linux-next: manual merge of the vfs tree with the overlayfs tree
From: Stephen Rothwell @ 2016-07-25 0:24 UTC (permalink / raw)
To: Al Viro, Miklos Szeredi; +Cc: linux-next, linux-kernel, Miklos Szeredi
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/super.c
between commit:
e2475b7276d0 ("ovl: check mounter creds on underlying lookup")
from the overlayfs tree and commit:
b3ac9a85b31c ("qstr: constify instances in overlayfs")
from the vfs 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 fs/overlayfs/super.c
index 4c91d9ed4689,bc10c261a006..000000000000
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@@ -419,21 -423,12 +419,21 @@@ static bool ovl_dentry_weird(struct den
DCACHE_OP_COMPARE);
}
-static inline struct dentry *ovl_lookup_real(struct dentry *dir,
+static inline struct dentry *ovl_lookup_real(struct super_block *ovl_sb,
+ struct dentry *dir,
- struct qstr *name)
+ const struct qstr *name)
{
+ const struct cred *old_cred;
struct dentry *dentry;
+ int err;
- dentry = lookup_hash(name, dir);
+ old_cred = ovl_override_creds(ovl_sb);
+ err = inode_permission(dir->d_inode, MAY_EXEC);
+ if (err)
+ dentry = ERR_PTR(err);
+ else
+ dentry = lookup_hash(name, dir);
+ revert_creds(old_cred);
if (IS_ERR(dentry)) {
if (PTR_ERR(dentry) == -ENOENT)
^ permalink raw reply
* linux-next: manual merge of the vfs tree with the f2fs tree
From: Stephen Rothwell @ 2016-07-25 0:21 UTC (permalink / raw)
To: Al Viro, Jaegeuk Kim; +Cc: linux-next, linux-kernel, Chao Yu
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in:
fs/f2fs/dir.c
fs/f2fs/f2fs.h
between commit:
91246c21b859 ("f2fs: fix to report error number of f2fs_find_entry")
from the f2fs tree and commit:
14bffd7c398a ("qstr: constify instances in f2fs")
from the vfs 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 fs/f2fs/dir.c
index a485f68a76b1,3b095a35aa47..000000000000
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@@ -267,13 -259,25 +267,13 @@@ out
struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p)
{
- struct page *page;
- struct f2fs_dir_entry *de;
- struct f2fs_dentry_block *dentry_blk;
-
- if (f2fs_has_inline_dentry(dir))
- return f2fs_parent_inline_dir(dir, p);
-
- page = get_lock_data_page(dir, 0, false);
- if (IS_ERR(page))
- return NULL;
+ struct qstr dotdot = QSTR_INIT("..", 2);
- dentry_blk = kmap(page);
- de = &dentry_blk->dentry[1];
- *p = page;
- unlock_page(page);
- return de;
+ return f2fs_find_entry(dir, &dotdot, p);
}
- ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr,
-ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr)
++ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,
+ struct page **page)
{
ino_t res = 0;
struct f2fs_dir_entry *de;
diff --cc fs/f2fs/f2fs.h
index 30981094dff8,fd0a156d7561..000000000000
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@@ -1912,11 -1804,11 +1912,11 @@@ struct page *init_inode_metadata(struc
const struct qstr *, struct page *);
void update_parent_metadata(struct inode *, struct inode *, unsigned int);
int room_for_filename(const void *, int, int);
-void f2fs_drop_nlink(struct inode *, struct inode *, struct page *);
+void f2fs_drop_nlink(struct inode *, struct inode *);
- struct f2fs_dir_entry *f2fs_find_entry(struct inode *, struct qstr *,
+ struct f2fs_dir_entry *f2fs_find_entry(struct inode *, const struct qstr *,
struct page **);
struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);
- ino_t f2fs_inode_by_name(struct inode *, struct qstr *, struct page **);
-ino_t f2fs_inode_by_name(struct inode *, const struct qstr *);
++ino_t f2fs_inode_by_name(struct inode *, const struct qstr *, struct page **);
void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,
struct page *, struct inode *);
int update_dent_inode(struct inode *, struct inode *, const struct qstr *);
^ 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