* next-20160919 build: 2 failures 5 warnings (next-20160919)
From: Build bot for Mark Brown @ 2016-09-19 10:02 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160919
Git describe: next-20160919
Commit: 3551fc28a8 Add linux-next specific files for 20160919
Build Time: 85 min 56 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 5
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
6 warnings 0 mismatches : arm-multi_v5_defconfig
7 warnings 0 mismatches : arm-multi_v7_defconfig
5 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-allnoconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings Summary: 5
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
3 ../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
2 ../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 2 errors, 1 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 5 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: next-20160914 build: 2 failures 3 warnings (next-20160914)
From: Mark Brown @ 2016-09-19 10:21 UTC (permalink / raw)
To: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, Lee Jones,
arnd
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <20160914171137.GF27974@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
On Wed, Sep 14, 2016 at 06:11:37PM +0100, Mark Brown wrote:
> On Wed, Sep 14, 2016 at 09:18:08AM +0100, Build bot for Mark Brown wrote:
> Today's -next fails to build both arm and arm64 allmodconfig due to:
> > arm64-allmodconfig
> > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
> > arm-allmodconfig
> > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
> due to 262d5cc6ceb293 (mfd: tps65217: Add support for IRQs) since
> irq_set_parent() isn't exported.
This is still breaking the build, do we have any ETA on getting the
export added?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160914 build: 2 failures 3 warnings (next-20160914)
From: Arnd Bergmann @ 2016-09-19 10:31 UTC (permalink / raw)
To: Mark Brown
Cc: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, Lee Jones,
kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <20160919102150.GI10189@sirena.org.uk>
On Monday, September 19, 2016 11:21:50 AM CEST Mark Brown wrote:
> On Wed, Sep 14, 2016 at 06:11:37PM +0100, Mark Brown wrote:
> > On Wed, Sep 14, 2016 at 09:18:08AM +0100, Build bot for Mark Brown wrote:
>
> > Today's -next fails to build both arm and arm64 allmodconfig due to:
>
> > > arm64-allmodconfig
> > > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
>
> > > arm-allmodconfig
> > > ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
>
> > due to 262d5cc6ceb293 (mfd: tps65217: Add support for IRQs) since
> > irq_set_parent() isn't exported.
>
> This is still breaking the build, do we have any ETA on getting the
> export added?
Thomas said he'd add it if the export is needed, but so far nobody
could tell if it is, or if the correct fix is something else, so
I have not sent a patch for inclusion.
My guess is that this is indeed the correct fix, but I don't understand
at all what the function does, and Marcin Niestroj said the same thing,
he just copied the code from a driver that is always built-in.
FWIW, the original function is
static int regmap_irq_map(struct irq_domain *h, unsigned int virq,
irq_hw_number_t hw)
{
struct regmap_irq_chip_data *data = h->host_data;
irq_set_chip_data(virq, data);
irq_set_chip(virq, &data->irq_chip);
irq_set_nested_thread(virq, 1);
irq_set_parent(virq, data->irq);
irq_set_noprobe(virq);
return 0;
}
and this is the new one:
static int tps65217_irq_map(struct irq_domain *h, unsigned int virq,
irq_hw_number_t hw)
{
struct tps65217 *tps = h->host_data;
irq_set_chip_data(virq, tps);
irq_set_chip_and_handler(virq, &tps65217_irq_chip, handle_edge_irq);
irq_set_nested_thread(virq, 1);
irq_set_parent(virq, tps->irq);
irq_set_noprobe(virq);
return 0;
}
twl6030_irq_map() has another almost identical copy, and the only
other caller of irq_set_parent() is gpiochip_set_chained_irqchip(),
which is completely different.
Arnd
^ permalink raw reply
* Re: next-20160914 build: 2 failures 3 warnings (next-20160914)
From: Mark Brown @ 2016-09-19 10:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, Lee Jones,
kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <2300987.vYzazfRX5F@wuerfel>
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
On Mon, Sep 19, 2016 at 12:31:04PM +0200, Arnd Bergmann wrote:
> My guess is that this is indeed the correct fix, but I don't understand
> at all what the function does, and Marcin Niestroj said the same thing,
> he just copied the code from a driver that is always built-in.
Yes, most of the code is copied from regmap-irq. Setting the parent is
needed for edge triggered interrupts that don't latch state when
disabled but isn't needed in the general case.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160914 build: 2 failures 3 warnings (next-20160914)
From: Arnd Bergmann @ 2016-09-19 11:30 UTC (permalink / raw)
To: Mark Brown
Cc: Marcin Niestroj, Grygorii Strashko, Tony Lindgren, Lee Jones,
kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <20160919105429.GK10189@sirena.org.uk>
On Monday, September 19, 2016 11:54:29 AM CEST Mark Brown wrote:
> On Mon, Sep 19, 2016 at 12:31:04PM +0200, Arnd Bergmann wrote:
>
> > My guess is that this is indeed the correct fix, but I don't understand
> > at all what the function does, and Marcin Niestroj said the same thing,
> > he just copied the code from a driver that is always built-in.
>
> Yes, most of the code is copied from regmap-irq. Setting the parent is
> needed for edge triggered interrupts that don't latch state when
> disabled but isn't needed in the general case.
I found this in the tps65217 data sheet:
9.3.7 Interrupt Pin (nINT)
The interrupt pin is used to signal any event or fault
condition to the host processor. Whenever a fault or event
occurs in the IC the corresponding interrupt bit is set in
the INT register, and the open-drain output is pulled low.
The nINT pin is released (returns to Hi-Z state) and fault
bits are cleared when the INT register is read by the
host. However, if a failure persists, the corresponding
INT bit remains set and the nINT pin is pulled low again
after a maximum of 32 µs.
Interrupt events include pushbutton pressed/released, USB
and AC voltage status change.
The MASK bits in the INT register are used to mask events
from generating interrupts. The MASK settings affect the
nINT pin only and have no impact on protection and
monitor circuits themselves. Note that persisting event
conditions such as ISINK enabled shutdown can cause the
nINT pin to be pulled low for an extended period of
time which can keep the host in a loop trying to resolve
the interrupt. If this behavior is not desired, set the
corresponding mask bit after receiving the interrupt and
keep polling the INT register to see when the event
condition has disappeared. Then unmask the interrupt bit
again.
Does this tell us if it's needed or not?
Arnd
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Christoph Hellwig @ 2016-09-19 13:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next, linux-kernel, Christoph Hellwig
In-Reply-To: <20160919161834.08302d33@canb.auug.org.au>
Thanks Stephen,
the fix looks good to me:
Reviewed-by: Christoph Hellwig <hch@lst.de>
I had actually seen the error earlier, but for the setups I got builbot
results moving the code to this new pci-dependent file fixed it. I guess
that didn't went far enough.
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Jens Axboe @ 2016-09-19 14:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Christoph Hellwig
In-Reply-To: <20160919161834.08302d33@canb.auug.org.au>
On 09/19/2016 12:18 AM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> In file included from block/blk-mq-pci.c:13:0:
> include/linux/blk-mq.h:57:18: error: field 'kobj' has incomplete type
> struct kobject kobj;
> ^
> include/linux/blk-mq.h:121:2: error: unknown type name 'softirq_done_fn'
> softirq_done_fn *complete;
> ^
> include/linux/blk-mq.h: In function 'blk_mq_rq_from_pdu':
> include/linux/blk-mq.h:253:22: error: invalid application of 'sizeof' to incomplete type 'struct request'
> return pdu - sizeof(struct request);
> ^
> include/linux/blk-mq.h: In function 'blk_mq_rq_to_pdu':
> include/linux/blk-mq.h:257:2: error: invalid use of undefined type 'struct request'
> return rq + 1;
> ^
>
> Caused by commit
>
> 973c4e372c8f ("blk-mq: provide a default queue mapping for PCI device")
>
> include/linux/blk-mq.h does not include all the headers files that it
> depends on, and building block/blk-mq-pci.c should depend on CONFIG_BLOCK.
>
> I applied this fix patch (the block/blk-mq-pci.c may not be becessary):
Added, thanks Stephen.
--
Jens Axboe
^ permalink raw reply
* Re: next-20160914 build: 2 failures 3 warnings (next-20160914)
From: Grygorii Strashko @ 2016-09-19 15:31 UTC (permalink / raw)
To: Arnd Bergmann, Mark Brown
Cc: Marcin Niestroj, Tony Lindgren, Lee Jones, kernel-build-reports,
linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <1474883226.Je8NqnULCh@wuerfel>
On 09/19/2016 02:30 PM, Arnd Bergmann wrote:
> On Monday, September 19, 2016 11:54:29 AM CEST Mark Brown wrote:
>> On Mon, Sep 19, 2016 at 12:31:04PM +0200, Arnd Bergmann wrote:
>>
>>> My guess is that this is indeed the correct fix, but I don't understand
>>> at all what the function does, and Marcin Niestroj said the same thing,
>>> he just copied the code from a driver that is always built-in.
>>
>> Yes, most of the code is copied from regmap-irq. Setting the parent is
>> needed for edge triggered interrupts that don't latch state when
>> disabled but isn't needed in the general case.
>
> I found this in the tps65217 data sheet:
>
> 9.3.7 Interrupt Pin (nINT)
> The interrupt pin is used to signal any event or fault
> condition to the host processor. Whenever a fault or event
> occurs in the IC the corresponding interrupt bit is set in
> the INT register, and the open-drain output is pulled low.
> The nINT pin is released (returns to Hi-Z state) and fault
> bits are cleared when the INT register is read by the
> host. However, if a failure persists, the corresponding
> INT bit remains set and the nINT pin is pulled low again
> after a maximum of 32 µs.
>
> Interrupt events include pushbutton pressed/released, USB
> and AC voltage status change.
> The MASK bits in the INT register are used to mask events
> from generating interrupts. The MASK settings affect the
> nINT pin only and have no impact on protection and
> monitor circuits themselves. Note that persisting event
> conditions such as ISINK enabled shutdown can cause the
> nINT pin to be pulled low for an extended period of
> time which can keep the host in a loop trying to resolve
> the interrupt. If this behavior is not desired, set the
> corresponding mask bit after receiving the interrupt and
> keep polling the INT register to see when the event
> condition has disappeared. Then unmask the interrupt bit
> again.
>
> Does this tell us if it's needed or not?
>
The irq_set_parent() is required for proper supporting of lazy irq disabling
for threaded nested irqs and allow them to be re-triggered in the following case:
driverX:
disable(nested_irq);
...
parent irq triggered
|- handle_nested_irq()
|- mark nested_irq with IRQS_PENDING
...
driverX:
enable(nested_irq);
|- if IRQS_PENDING -> resend parent_irq [*], because nested threaded irq can't
be resend by itself
[*] if parent_irq is not set the IRQS_PENDING status will be ignored and irq might be lost.
Also, it was "mandatory" to be done before commit 75a06189fc5
"genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD"
which made setting of parent_irq optional.
So, if is it required or not depends not only on HW, but, rather, on MFD drivers implementation
(Interrupt controller and MFD cell drivers).
--
regards,
-grygorii
^ permalink raw reply
* Re: Re: linux-next: build failure after merge of the pm tree
From: Krzysztof Kozlowski @ 2016-09-19 16:12 UTC (permalink / raw)
To: MyungJoo Ham
Cc: Rafael J. Wysocki, Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Krzysztof Kozlowski, Chanwoo Choi
In-Reply-To: <1589961933.1419204.1474270644855.JavaMail.weblogic@ep1ml103c>
On Mon, Sep 19, 2016 at 07:37:24AM +0000, MyungJoo Ham wrote:
> > On Wednesday, September 14, 2016 02:27:47 PM Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > After merging the pm tree, today's linux-next build (powerpc allyesconfig)
> > > failed like this:
> > >
> > > drivers/devfreq/tegra-devfreq.c: In function 'tegra_devfreq_target':
> > > drivers/devfreq/tegra-devfreq.c:500:2: error: implicit declaration of function 'clk_set_min_rate' [-Werror=implicit-function-declaration]
> > > clk_set_min_rate(tegra->emc_clock, rate);
> > > ^
> > >
> > > Caused by commit
> > >
> > > 797da5598f3a ("PM / devfreq: Add COMPILE_TEST for build coverage")
>
> @Rafael: Thank you!
>
>
> @Kozlowski:
>
> It looks like COMMON_CLK is required to be "selected" for TEGRA.
>
> Although COMMON_CLK is supposed to be widely used by most ARM platforms
> especially if "Multiple platfrom selection" for ARMv7 is used,
> COMPILE_TEST won't recognize it.
>
> Adding COMMON_CLK for TEGRA will solve this instance of issue; however,
> for COMPILE_TEST to be reasonably robust, each "COMPILE_TEST"ed item
> should "select" every required item. How do you want to proceed with
> COMPILE_TEST on SoC-specific device drivers?
I think drivers should depend on COMMON_CLK in such case. This tegra
driver probably does not require strict ARCH_TEGRA_124_SOC dependency
because it does not use any SoC-specific data/functions etc. However it
uses common clock framework so explicit dependency looks proper to me.
In fact this is already seen in kernel like SND_SOC_TEGRA, SND_MXS_SOC,
PWM_IMG(with compile test), SND_SOC_RCAR (even without compile test).
Best regards,
Krzysztof
^ permalink raw reply
* Re: linux-next: build failure after merge of the slave-dma tree
From: Vinod Koul @ 2016-09-19 16:38 UTC (permalink / raw)
To: Peter Griffin; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160916083444.GA4730@griffinp-ThinkPad-X1-Carbon-2nd>
On Fri, Sep 16, 2016 at 09:34:44AM +0100, Peter Griffin wrote:
> Hi Vinod & Stephen,
>
> On Fri, 16 Sep 2016, Stephen Rothwell wrote:
>
> > Hi Vinod,
> >
> > After merging the slave-dma tree, today's linux-next build (arm
> > multi_v7_defconfig build) failed like this:
>
> FYI Patch 17 of 19 in the fdma series "drm/virtio: kconfig: Fix recursive dependency
> issue." [1], fixes this issue. It looks like that hasn't been applied. I should have
> made it clearer that this was a depedency (and the other white drm/kconfig white
> space fixup obviously isn't).
Yeah it should have been mentioned.
And I do not like to merge DRM patches for this and that too without ACKs.
I am dropping this branch from next untill I get ACK from someone on DRM
side to apply this
Thanks
--
~Vinod
^ permalink raw reply
* mmotm 2016-09-19-16-52 uploaded
From: akpm @ 2016-09-19 23:53 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-09-19-16-52 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.8-rc7:
(patches marked "*" will be included in linux-next)
* mem-hotplug-dont-clear-the-only-node-in-new_node_page.patch
* ocfs2-dlm-fix-race-between-convert-and-migration.patch
* maintainers-modify-maintainers-email-of-intelfb.patch
* khugepaged-fix-use-after-free-in-collapse_huge_page.patch
* mm-thp-fix-leaking-mapped-pte-in-__collapse_huge_page_swapin.patch
* mm-avoid-endless-recursion-in-dump_page.patch
* maintainers-update-email-for-vlynq-bus-entry.patch
* autofs-use-dentry-flags-to-block-walks-during-expire.patch
* mm-fix-the-page_swap_info-bug_on-check.patch
* ipc-shm-fix-crash-if-config_shmem-is-not-set.patch
* ocfs2-fix-trans-extend-while-flush-truncate-log.patch
* ocfs2-fix-trans-extend-while-free-cached-blocks.patch
* fsnotify-add-a-way-to-stop-queueing-events-on-group-shutdown.patch
* fanotify-fix-list-corruption-in-fanotify_get_response.patch
* ocfs2-fix-double-unlock-in-case-retry-after-free-truncate-log.patch
* mm-memcontrol-make-per-cpu-charge-cache-irq-safe-for-socket-accounting.patch
* cgroup-duplicate-cgroup-reference-when-cloning-sockets.patch
* ocfs2-fix-start-offset-to-ocfs2_zero_range_for_truncate.patch
* revert-ocfs2-bump-up-o2cb-network-protocol-version.patch
* rapidio-rio_cm-avoid-gfp_kernel-in-atomic-context.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
* mmksm-fix-endless-looping-in-allocating-memory-when-ksm-enable.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fsnotify-drop-notification_mutex-before-destroying-event.patch
* fsnotify-convert-notification_mutex-to-a-spinlock.patch
* fsnotify-convert-notification_mutex-to-a-spinlock-fix.patch
* fanotify-use-notification_lock-instead-of-access_lock.patch
* fanotify-fix-possible-false-warning-when-freeing-events.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* fs-ocfs2-dlmfs-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-cluster-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-super-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-dlm-remove-deprecated-create_singlethread_workqueue.patch
* ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-oom-deduplicate-victim-selection-code-for-memcg-and-global-oom.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-zsmalloc-add-per-class-compact-trace-event.patch
* mm-vmalloc-fix-align-value-calculation-error.patch
* mm-vmalloc-fix-align-value-calculation-error-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
* mm-memcontrol-add-sanity-checks-for-memcg-idref-on-get-put.patch
* mm-oom_killc-fix-task_will_free_mem-comment.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
* mm-compaction-cleanup-unused-functions.patch
* mm-compaction-rename-compact_partial-to-compact_success.patch
* mm-compaction-dont-recheck-watermarks-after-compact_success.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority-fix.patch
* mm-compaction-use-correct-watermark-when-checking-compaction-success.patch
* mm-compaction-create-compact_gap-wrapper.patch
* mm-compaction-create-compact_gap-wrapper-fix.patch
* mm-compaction-use-proper-alloc_flags-in-__compaction_suitable.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders-fix.patch
* mm-vmscan-make-compaction_ready-more-accurate-and-readable.patch
* mem-hotplug-fix-node-spanned-pages-when-we-have-a-movable-node.patch
* mm-fix-set-pageblock-migratetype-in-deferred-struct-page-init.patch
* mm-vmscan-get-rid-of-throttle_vm_writeout.patch
* mm-debug_pagealloc-clean-up-guard-page-handling-code.patch
* mm-debug_pagealloc-dont-allocate-page_ext-if-we-dont-use-guard-page.patch
* mm-page_owner-move-page_owner-specific-function-to-page_ownerc.patch
* mm-page_ext-rename-offset-to-index.patch
* mm-page_ext-support-extra-space-allocation-by-page_ext-user.patch
* mm-page_owner-dont-define-fields-on-struct-page_ext-by-hard-coding.patch
* do_generic_file_read-fail-immediately-if-killed.patch
* mm-pagewalk-fix-the-comment-for-test_walk.patch
* mm-unrig-vma-cache-hit-ratio.patch
* mm-swap-add-swap_cluster_list.patch
* mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
* mmoom_reaper-reduce-find_lock_task_mm-usage.patch
* mmoom_reaper-do-not-attempt-to-reap-a-task-twice.patch
* oom-keep-mm-of-the-killed-task-available.patch
* kernel-oom-fix-potential-pgd_lock-deadlock-from-__mmdrop.patch
* mm-oom-get-rid-of-signal_struct-oom_victims.patch
* oom-suspend-fix-oom_killer_disable-vs-pm-suspend-properly.patch
* mm-oom-enforce-exit_oom_victim-on-current-task.patch
* mm-make-sure-that-kthreads-will-not-refault-oom-reaped-memory.patch
* oom-oom_reaper-allow-to-reap-mm-shared-by-the-kthreads.patch
* mm-use-zonelist-name-instead-of-using-hardcoded-index.patch
* mm-introduce-arch_reserved_kernel_pages.patch
* mm-memblock-expose-total-reserved-memory.patch
* powerpc-implement-arch_reserved_kernel_pages.patch
* mm-nobootmemc-remove-duplicate-macro-arch_low_address_limit-statements.patch
* mm-bootmemc-replace-kzalloc-by-kzalloc_node.patch
* mm-dont-use-radix-tree-writeback-tags-for-pages-in-swap-cache.patch
* oom-warn-if-we-go-oom-for-higher-order-and-compaction-is-disabled.patch
* mm-mlock-check-against-vma-for-actual-mlock-size.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix-2.patch
* mm-mlock-avoid-increase-mm-locked_vm-on-mlock-when-already-mlock2mlock_onfault.patch
* selftest-split-mlock2_-funcs-into-separate-mlock2h.patch
* selftests-vm-add-test-for-mlock-when-areas-are-intersected.patch
* selftest-move-seek_to_smaps_entry-out-of-mlock2-testsc.patch
* selftests-expanding-more-mlock-selftest.patch
* thp-dax-add-thp_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-call-thp_get_unmapped_area-for-pmd-mappings.patch
* cpu-fix-node-state-for-whether-it-contains-cpu.patch
* mm-proc-make-the-task_mmu-walk_page_range-limit-in-clear_refs_write-obvious.patch
* thp-reduce-usage-of-huge-zero-pages-atomic-counter.patch
* mm-memcontrol-make-the-walk_page_range-limit-obvious.patch
* memory-hotplug-fix-store_mem_state-return-value.patch
* mm-fix-cache-mode-tracking-in-vm_insert_mixed.patch
* mm-swap-use-offset-of-swap-entry-as-key-of-swap-cache.patch
* mm-remove-page_file_index.patch
* revert-mm-oom-prevent-premature-oom-killer-invocation-for-high-order-request.patch
* mm-compaction-more-reliably-increase-direct-compaction-priority.patch
* mm-compaction-restrict-full-priority-to-non-costly-orders.patch
* mm-compaction-make-full-priority-ignore-pageblock-suitability.patch
* mm-dont-emit-warning-from-pagefault_out_of_memory.patch
* mm-page_ioc-replace-some-bug_ons-with-vm_bug_on_page.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix.patch
* mm-split-gfp_mask-and-mapping-flags-into-separate-fields.patch
* mm-move-phys_mem_access_prot_allowed-declaration-to-pgtableh.patch
* fs-bufferc-make-__getblk_slow-static.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-fix-2.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-checkpatch-fixes.patch
* mm-shmemc-constify-anon_ops.patch
* mm-nobootmem-move-the-comment-of-free_all_bootmem.patch
* mm-vma_merge-fix-vm_page_prot-smp-race-condition-against-rmap_walk.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* ia64-implement-atomic64_dec_if_positive.patch
* atomic64-no-need-for-config_arch_has_atomic64_dec_if_positive.patch
* proc-much-faster-proc-vmstat.patch
* proc-faster-proc-status.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
* meminfo-break-apart-a-very-long-seq_printf-with-ifdefs.patch
* proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
* proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
* proc-fix-timerslack_ns-cap_sys_nice-check-when-adjusting-self.patch
* proc-unsigned-file-descriptors.patch
* min-max-remove-sparse-warnings-when-theyre-nested.patch
* nmi_backtrace-add-more-trigger__cpu_backtrace-methods.patch
* nmi_backtrace-do-a-local-dump_stack-instead-of-a-self-nmi.patch
* arch-tile-adopt-the-new-nmi_backtrace-framework.patch
* nmi_backtrace-generate-one-line-reports-for-idle-cpus.patch
* spellingtxt-modeled-is-spelt-correctly.patch
* uprobes-remove-function-declarations-from-arch-mipss390.patch
* set-git-diff-driver-for-c-source-code-files.patch
* mailmap-add-johan-hovold.patch
* cred-simpler-1d-supplementary-groups.patch
* console-dont-prefer-first-registered-if-dt-specifies-stdout-path.patch
* radix-tree-slot-can-be-null-in-radix_tree_next_slot.patch
* radix-tree-tests-add-iteration-test.patch
* radix-tree-tests-properly-initialize-mutex.patch
* lib-harden-strncpy_from_user.patch
* make-isdigit-table-lookupless.patch
* kstrtox-smaller-_parse_integer.patch
* lib-bitmapc-enhance-bitmap-syntax.patch
* lib-bitmapc-enhance-bitmap-syntax-fix.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* checkpatch-see-if-modified-files-are-marked-obsolete-in-maintainers.patch
* checkpatch-look-for-symbolic-permissions-and-suggest-octal-instead.patch
* checkpatch-test-multiple-line-block-comment-alignment.patch
* checkpatch-dont-test-for-prefer-ether_addr_foo.patch
* checkpatch-externalize-the-structs-that-should-be-const.patch
* const_structscheckpatch-add-frequently-used-from-julia-lawalls-list.patch
* checkpatch-speed-up-checking-for-filenames-in-sections-marked-obsolete.patch
* checkpatch-improve-the-block-comment-alignment-test.patch
* checkpatch-add-strict-test-for-macro-argument-reuse.patch
* checkpatch-add-strict-test-for-precedence-challenged-macro-arguments.patch
* checkpatch-improve-macro_arg_precedence-test.patch
* kprobes-include-asm-sectionsh-instead-of-asm-generic-sectionsh.patch
* autofs-fix-typos-in-documentation-filesystems-autofs4txt.patch
* autofs-drop-unnecessary-extern-in-autofs_ih.patch
* autofs-test-autofs-versions-first-on-sb-initialization.patch
* autofs-fix-autofs4_fill_super-error-exit-handling.patch
* autofs-add-warn_on1-for-non-dir-link-inode-case.patch
* autofs-remove-ino-free-in-autofs4_dir_symlink.patch
* autofs-use-autofs4_free_ino-to-kfree-dentry-data.patch
* autofs-remove-obsolete-sb-fields.patch
* autofs-dont-fail-to-free_dev_ioctlparam.patch
* autofs-remove-autofs_devid_len.patch
* autofs-fix-documentation-regarding-devid-on-ioctl.patch
* autofs-update-struct-autofs_dev_ioctl-in-documentation.patch
* autofs-fix-pr_debug-message.patch
* autofs-fix-dev-ioctl-number-range-check.patch
* autofs-fix-dev-ioctl-number-range-check-fix.patch
* autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch
* autofs-fix-print-format-for-ioctl-warning-message.patch
* autofs-move-inclusion-of-linux-limitsh-to-uapi.patch
* autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch
* autofs-remove-possibly-misleading-define-debug.patch
* autofs-refactor-ioctl-fn-vector-in-iookup_dev_ioctl.patch
* fs-make-is_local_mountpoint-usable-by-others.patch
* fs-add-have_local_submounts.patch
* autofs-make-mountpoint-checks-namespace-aware.patch
* fs-remove-unused-have_submounts-function.patch
* pipe-relocate-round_pipe_size-above-pipe_set_size.patch
* pipe-move-limit-checking-logic-into-pipe_set_size.patch
* pipe-refactor-argument-for-account_pipe_buffers.patch
* pipe-fix-limit-checking-in-pipe_set_size.patch
* pipe-simplify-logic-in-alloc_pipe_info.patch
* pipe-fix-limit-checking-in-alloc_pipe_info.patch
* pipe-make-account_pipe_buffers-return-a-value-and-use-it.patch
* pipe-cap-initial-pipe-capacity-according-to-pipe-max-size-limit.patch
* ptrace-clear-tif_syscall_trace-on-ptrace-detach.patch
* kexec_file-allow-arch-specific-memory-walking-for-kexec_add_buffer.patch
* kexec_file-change-kexec_add_buffer-to-take-kexec_buf-as-argument.patch
* kexec_file-factor-out-kexec_locate_mem_hole-from-kexec_add_buffer.patch
* powerpc-change-places-using-config_kexec-to-use-config_kexec_core-instead.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c.patch
* powerpc-generalize-elf64_apply_relocate_add.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load.patch
* powerpc-add-functions-to-read-elf-files-of-any-endianness.patch
* powerpc-implement-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load-fix.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation-fix.patch
* powerpc-enable-config_kexec_file-in-powerpc-server-defconfigs.patch
* kexec_file-include-the-purgatory-segment-in-the-kexec-image-checksum.patch
* kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* powerpc-kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* kexec_file-add-mechanism-to-update-kexec-segments.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* ima-serialize-the-binary_runtime_measurements.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rio_cm-use-memdup_user-instead-of-duplicating-code.patch
* random-simplify-api-for-random-address-requests.patch
* x86-use-simpler-api-for-random-address-requests.patch
* arm-use-simpler-api-for-random-address-requests.patch
* arm64-use-simpler-api-for-random-address-requests.patch
* tile-use-simpler-api-for-random-address-requests.patch
* unicore32-use-simpler-api-for-random-address-requests.patch
* random-remove-unused-randomize_range.patch
* dma-mapping-introduce-the-dma_attr_no_warn-attribute.patch
* powerpc-implement-the-dma_attr_no_warn-attribute.patch
* nvme-use-the-dma_attr_no_warn-attribute.patch
* x86-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* mips-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-fix.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-checkpatch-fixes.patch
* config-android-remove-config_ipv6_privacy.patch
* config-android-move-device-mapper-options-to-recommended.patch
* config-android-set-selinux-as-default-security-mode.patch
* config-android-enable-config_seccomp.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msg-implement-lockless-pipelined-wakeups.patch
* ipc-msg-batch-queue-sender-wakeups.patch
* ipc-msg-make-ss_wakeup-kill-arg-boolean.patch
* ipc-msg-lockless-security-checks-for-msgsnd.patch
* ipc-msg-avoid-waking-sender-upon-full-queue.patch
* ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next.patch
linux-next-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-mlx5-deviceh-kill-build_bug_ons.patch
* kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* mm-kmemleak-avoid-using-__va-on-addresses-that-dont-have-a-lowmem-mapping.patch
* enable-code-completion-in-vim.patch
* kthread-add-kerneldoc-for-kthread_create.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix.patch
* treewide-remove-redundant-include-linux-kconfigh.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
* linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Stephen Rothwell @ 2016-09-20 0:19 UTC (permalink / raw)
To: Kevin Hilman, Carlo Caione, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Jerome Brunet
Hi all,
Today's linux-next merge of the amlogic tree got a conflict in:
arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
between commit:
8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
from the arm-soc tree and commit:
d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
from the amlogic tree.
This patch was modified before being merged into the arm-soc tree.
Please clean up the amlogic tree.
I fixed it up (I used the arm-soc tree version) 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: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2016-09-20 2:42 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-next, linux-kernel, Lucas Stach, Philipp Zabel, Liu Ying
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/imx/ipuv3-crtc.c
between commit:
a474478642d5 ("drm/imx: fix crtc vblank state regression")
from Linus' tree and commit:
5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")
from the drm tree.
I fixed it up (I think - 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 drivers/gpu/drm/imx/ipuv3-crtc.c
index 462056e4b9e4,9df29f1cb16a..000000000000
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@@ -77,7 -77,8 +77,10 @@@ static void ipu_crtc_atomic_disable(str
}
spin_unlock_irq(&crtc->dev->event_lock);
+ drm_crtc_vblank_off(crtc);
++
+ /* always disable planes on the CRTC */
+ drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, true);
}
static void imx_drm_crtc_reset(struct drm_crtc *crtc)
^ permalink raw reply
* linux-next: manual merge of the staging tree with the vfs tree
From: Stephen Rothwell @ 2016-09-20 5:03 UTC (permalink / raw)
To: Greg KH, Al Viro; +Cc: linux-next, linux-kernel, Dmitry Eremin, James Simmons
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/file.c
between commit:
47b34458fc93 ("lustre: use %pD")
from the vfs tree and commit:
bb5c7f2630de ("staging: lustre: changelog: fix comparison between signed and unsigned")
from the staging 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 drivers/staging/lustre/lustre/llite/file.c
index 23249b3e6cad,5d4d17f2de61..000000000000
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -1141,8 -1123,8 +1123,8 @@@ ll_file_io_generic(const struct lu_env
struct cl_io *io;
ssize_t result;
- CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
- CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",
- file->f_path.dentry->d_name.name, iot, *ppos, count);
++ CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
+ file, iot, *ppos, count);
restart:
io = vvp_env_thread_io(env);
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-20 6:26 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
fs/notify/notification.c: In function 'fsnotify_add_event':
fs/notify/notification.c:116:22: error: 'struct fsnotify_group' has no member named 'notification_mutex'
mutex_unlock(&group->notification_mutex);
^
Caused by a bad git merge automatic resolution. I had to apply the
following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Sep 2016 16:23:48 +1000
Subject: [PATCH] fix bad merge of fs/notify/notification.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/notify/notification.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index ac14fa4d266b..1a8010e7a2a0 100644
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -112,11 +112,6 @@ int fsnotify_add_event(struct fsnotify_group *group,
return 2;
}
- if (group->shutdown) {
- mutex_unlock(&group->notification_mutex);
- return 2;
- }
-
if (group->q_len >= group->max_events) {
ret = 2;
/* Queue overflow event only if it isn't already queued */
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-20 6:44 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
powerpc-linux-gcc: error: unrecognized command line option '-m'
scripts/Makefile.build:290: recipe for target 'arch/powerpc/purgatory/printf.o' failed
and a few more like that.
Caused by commit
8635b1186486 ("powerpc: add purgatory for kexec_file_load implementation")
I have disabled KEXEC_FILE on powerpc again for now.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2016 19:12:42 +1000
Subject: [PATCH] disable KEXEC_FILE on powerpc for now
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 41300c3a1bfe..86ea07d7ead2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -467,6 +467,7 @@ config KEXEC_FILE
depends on PPC64
depends on CRYPTO=y
depends on CRYPTO_SHA256=y
+ depends on BROKEN
help
This is a new version of the kexec system call. This call is
file based and takes in file descriptors as system call arguments
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-20 6:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/kernel/built-in.o: In function `.apply_relocate_add':
(.text+0x302e4): undefined reference to `.elf64_apply_relocate_add'
I needed to add the following merge resolution patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Sep 2016 16:50:31 +1000
Subject: [PATCH] fix another merge resolution
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 8dca64f2851f..e59ed6af0523 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -125,7 +125,7 @@ obj-y += iomap.o
endif
ifneq ($(CONFIG_MODULES)$(CONFIG_KEXEC_FILE),)
-ifeq ($(CONFIG_WORD_SIZE),64)
+ifeq ($(BITS),64)
obj-y += elf_util.o elf_util_64.o
endif
endif
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-20 7:30 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Michael Ellerman
In-Reply-To: <20160920164414.4062bb0b@canb.auug.org.au>
Hi all,
On Tue, 20 Sep 2016 16:44:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the akpm-current tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> powerpc-linux-gcc: error: unrecognized command line option '-m'
> scripts/Makefile.build:290: recipe for target 'arch/powerpc/purgatory/printf.o' failed
>
> and a few more like that.
OK, this is (most likely) caused by the CONFIG_WORD_SIZE -> BITS change
interacting with the KEXEC_FILE changes. Tomorrow I will do a better
merge conflict resolution patch that fixes all those.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Sep 20
From: Stephen Rothwell @ 2016-09-20 8:04 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160919:
The kbuild tree still had its build failure and warnings for PowerPC,
for which I applied a couple of patches
The amlogic tree gained a conflict against the arm-soc tree.
The drm tree gained a conflict against Linus' tree.
The block tree lost its build failure.
The staging tree gained a conflict againste the vfs tree.
The slave-dma tree lost its build failure.
The akpm-current tree gained a build failure due to a bad automatic
merge resolution. I applied a merge fix patch. And another for which
I disabled KEXEC_FILE on powerpc.
Non-merge commits (relative to Linus' tree): 8592
8103 files changed, 409276 insertions(+), 233758 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 242 trees (counting Linus' and 34 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 (d2ffb0103aae Merge branch 'akpm' (patches from Andrew))
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (ed7d9a1d7da6 powerpc/powernv/pci: Fix missed TCE invalidations that should fallback to OPAL)
Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
Merging net/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging ipsec/master (b588479358ce xfrm: Fix memory leak of aead algorithm name)
Merging netfilter/master (440f895aa97f drivers: net: phy: xgene: Fix 'remove' function)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (3f640970a414 ALSA: hda - Fix headset mic detection problem for several Dell laptops)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (3be7988674ab Linux 4.8-rc7)
Merging usb-gadget-fixes/fixes (696118c016dd usb: dwc3: pci: fix build warning on !PM_SLEEP)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (4af2ff91ec3f Input: silead_gsl1680 - use "silead/" prefix for firmware loading)
Merging crypto-current/master (2db34e78f126 crypto: arm64/aes-ctr - fix NULL dereference in tail processing)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
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 (3be7988674ab Linux 4.8-rc7)
Merging kbuild/for-next (fbe6e37dab97 kbuild: add arch specific post-link Makefile)
CONFLICT (content): Merge conflict in arch/Kconfig
Applying: ppc: there is no clear_pages to export
Applying: powerpc/64: whitelist unresolved modversions CRCs
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (0ca6e5d62910 ARC: dw2 unwind: enable cfi pseudo ops in string lib)
Merging arm/for-next (32cb4b0bce85 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (89bb72f04b7b arm-soc: document merges)
Merging pinctrl/for-next (d6d8a9f007dc Merge branch 'devel' into for-next)
Merging amlogic/for-next (6b8356243e10 Merge branch 'v4.9/defconfig' into tmp/aml-rebuild)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
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 (9336be5db24d Merge branch anholt/bcm2835-dt-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 (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (aece9653181d Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (9fd74f79b723 Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' 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 (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (85023b2e1325 arm64: pmu: Hoist pmu platform device name)
CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
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 (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (f5e14739ed35 CREDITS: Update fingerprint for Geert Uytterhoeven)
Merging m68knommu/for-next (066dc6943021 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (2d47d37e4f0f Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (523d939ef98f Linux 4.7)
Merging powerpc/next (e1c0d66fcb17 powerpc: Set used_(vsr|vr|spe) in sigreturn path when MSR bits are active)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c783b91ebdba s390: add assembler include path for vx-insn.h)
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 (ecc8bebe29f5 tile: remove #pragma unroll from finv_buffer_remote())
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (56b508b018fd Merge branch 'for-next-next-4.9-20160909' into for-next-20160909)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (348c1bfa84df Move check for prefix path to within cifs_get_root())
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (5d3ddd84eaef udf: don't bother with full-page write optimisations in adinicb case)
Merging ext4/dev (e36767750532 blockgroup_lock.h: simplify definition of NR_BG_LOCKS)
Merging f2fs/dev (5905f9afa272 f2fs: handle error in recover_orphan_inode)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (663ed4a5e67c fuse: update attributes before splice read)
Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (06826fca0a6c nfsd: randomize SETCLIENTID reply to help distinguish servers)
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (8eac98b8beb4 ovl: during copy up, switch to mounter's creds early)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (4d50b3be79ed Merge branch 'iomap-4.9-dax' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
Merging vfs/for-next (3baf32898e1c parisc: use %pD)
Merging pci/next (503104ad2dc4 Merge branches 'pci/host-aardvark', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar' and 'pci/host-tegra' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (fb9063c0a5e9 Merge branch 'for-4.9/upstream' into for-next)
Merging i2c/i2c/for-next (fd0f514448a9 Merge branch 'i2c/for-4.9' 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 (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (2cfd100bf2f7 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (625f866d6fef Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
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 net-next/master (6b352ebccbcf net: ethernet: broadcom: bcmgenet: use new api ethtool_{get|set}_link_ksettings)
Merging ipsec-next/master (34a3d4b2d1f1 xfrm: fix header file comment reference to struct xfrm_replay_state_esn)
Merging netfilter-next/master (14e2dee0996f netfilter: nft_hash: fix hash overflow validation)
CONFLICT (content): Merge conflict in net/netfilter/nf_tables_netdev.c
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (80ba4f1d365a mwifiex: fix null pointer deference when adapter is null)
Merging bluetooth/master (af4168c5a925 Bluetooth: Set appearance only for LE capable controllers)
Merging mac80211-next/master (c13ed534b8db Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging rdma/for-next (64278fe89b72 Merge branch 'hns-roce' into k.o/for-4.9)
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging nand/nand/next (147054c1ccbd mtd: nand: Fix nand_command_lp() for 8bits opcodes)
Merging crypto/master (36e09e1f874b crypto: squash lines for simple wrapper functions)
Merging drm/drm-next (26e34d2d8ba7 Merge tag 'imx-drm-next-2016-09-19' of git://git.pengutronix.de/git/pza/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/imx-drm-core.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (8e4f768c434e drm/i915/dsi: double check element parsing against size if present)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (699fbeeac466 drm/fb-helper: Fix sparse warnings)
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 (3459ab314ce7 drm/msm: bump kernel api version for explicit fencing)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (aaaae4bcfeee Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (a16039cbf1a1 ALSA: line6: Add hwdep interface to access the POD control messages)
Merging sound-asoc/for-next (7de467e35998 Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/topology', 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (722dc54628ca Input: tps65218-pwrbutton - add support for tps65217 variant)
Merging block/for-next (984da77adcfa Merge branch 'for-4.9/block-irq' into for-next)
Merging lightnvm/for-next (b67347d7dc28 lightnvm: propagate device_add() error code)
Merging device-mapper/for-next (3075292fe80f dm cache policy smq: distribute entries to random levels when switching to smq)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (6d947b50d8b9 mmc: sdhci-acpi: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fcd4a4cc1359 raid5: allow arbitrary max_hw_sectors)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (fcb63d9f5c3a mfd: tps65217: Fix nonstandard declaration)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (bb1e41ba324f power: reset: st: Remove obsolete platforms from dt doc)
Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
Merging regulator/for-next (49503a990264 Merge remote-tracking branches 'regulator/topic/set-voltage', 'regulator/topic/tps65218' and 'regulator/topic/tps80031' into regulator-next)
Merging security/next (de2f4b3453d2 Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9b6a9ecc2d88 selinux: fix error return code in policydb_read())
Merging tpmdd/next (ebfd7532e985 tpm: add check for minimum buffer size in tpm_transmit())
Merging watchdog/master (3be7988674ab Linux 4.8-rc7)
Merging iommu/next (8b8d24825446 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/renesas' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (2e06285655b5 vfio: platform: mark symbols static where possible)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
Merging devicetree/for-next (f94277af03ea of/platform: Initialise dev->fwnode appropriately)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (b25589c028f8 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (0c51f6e94a99 Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in include/linux/jump_label.h
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
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 (c7c35407cd86 EDAC, sb_edac: Remove NULL pointer check on array pci_tad)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (52e6bc6d43a4 bug: Avoid Kconfig warning for BUG_ON_DATA_CORRUPTION)
Merging kvm/linux-next (ad53e35ae529 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (5d947a1447f9 KVM: ARM: cleanup kvm_timer_hyp_init)
Merging kvm-mips/next (d5888477d31c KVM: MIPS: Emulate MMIO via TLB miss for EVA)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (aad9e5ba2433 KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init())
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (4f0fbdf22e73 xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc())
Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (fa1bc2a09f5f platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function)
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 (f3f624941be0 leds: Only remove trigger if one is actually configured.)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (2f5bb02ff224 Merge 4.8-rc5 into driver-core-next)
Merging tty/tty-next (d2ec3f77de8e pty: make ptmx file ops read-only after init)
Merging usb/usb-next (3a383cc0b8cc Revert "usb: gadget: NCM: Protect dev->port_usb using dev->lock")
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (26e9c85b48b4 staging: lustre: update version to 2.6.99)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
Merging char-misc/char-misc-next (4b7b948b1fcd vme: fake: fix build for 64-bit dma_addr_t)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (ba021806f080 Merge branch 'topic/hsu' into next)
Merging cgroup/for-next (65a3de66d4ef Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (fb8be2382689 Merge branch 'misc' into for-next)
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 libata/for-next (4bf4f57f34b0 Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c2da060a2d88 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0203a5ff55d7 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/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 (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (7f4d3b52b6b6 clk: uniphier: add clock data for UniPhier SoCs)
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 (29b4817d4018 Linux 4.8-rc1)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (970fc7f4afd5 rtc: cmos: Initialize hpet timer before irq is registered)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (33b69bc53b00 Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (bbf581ca3712 ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
CONFLICT (content): Merge conflict in net/core/sock.c
CONFLICT (content): Merge conflict in mm/page_io.c
CONFLICT (content): Merge conflict in include/linux/relay.h
CONFLICT (content): Merge conflict in fs/notify/group.c
CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify_user.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
Applying: fix bad merge of fs/notify/notification.c
Applying: disable KEXEC_FILE on powerpc for now
Applying: fix another merge resolution
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Merging akpm/master (cb6f9fa7e45e treewide: remove redundant #include <linux/kconfig.h>)
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the vfs tree
From: Greg KH @ 2016-09-20 11:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Al Viro, linux-next, linux-kernel, Dmitry Eremin, James Simmons
In-Reply-To: <20160920150327.7f646dee@canb.auug.org.au>
On Tue, Sep 20, 2016 at 03:03:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/llite/file.c
>
> between commit:
>
> 47b34458fc93 ("lustre: use %pD")
>
> from the vfs tree and commit:
>
> bb5c7f2630de ("staging: lustre: changelog: fix comparison between signed and unsigned")
>
> from the staging 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 drivers/staging/lustre/lustre/llite/file.c
> index 23249b3e6cad,5d4d17f2de61..000000000000
> --- a/drivers/staging/lustre/lustre/llite/file.c
> +++ b/drivers/staging/lustre/lustre/llite/file.c
> @@@ -1141,8 -1123,8 +1123,8 @@@ ll_file_io_generic(const struct lu_env
> struct cl_io *io;
> ssize_t result;
>
> - CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
> - CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",
> - file->f_path.dentry->d_name.name, iot, *ppos, count);
> ++ CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
> + file, iot, *ppos, count);
Fixup looks good to me, thanks for doing this.
greg k-h
^ permalink raw reply
* Re: next-20160920 build: 2 failures 5 warnings (next-20160920)
From: Mark Brown @ 2016-09-20 11:18 UTC (permalink / raw)
To: frank zago, James Simmons, Dmitry Eremin, Oleg Drokin,
James Simmons, Greg Kroah-Hartman
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-kernel
In-Reply-To: <E1bmIpL-0004P7-Bh@optimist>
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
On Tue, Sep 20, 2016 at 12:03:03PM +0100, Build bot for Mark Brown wrote:
Today's -next fails to build arm and arm64 allmodconfig due to:
> arm64-allmodconfig
> arm-allmodconfig
> ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
> ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
due to the series of commits that were added yesterday removing
EXPORT_SYMBOL()s.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160920 build: 2 failures 5 warnings (next-20160920)
From: Greg Kroah-Hartman @ 2016-09-20 11:39 UTC (permalink / raw)
To: Mark Brown
Cc: frank zago, James Simmons, Dmitry Eremin, Oleg Drokin,
James Simmons, kernel-build-reports, linaro-kernel, linux-next,
linux-kernel
In-Reply-To: <20160920111848.GQ10189@sirena.org.uk>
On Tue, Sep 20, 2016 at 12:18:48PM +0100, Mark Brown wrote:
> On Tue, Sep 20, 2016 at 12:03:03PM +0100, Build bot for Mark Brown wrote:
>
> Today's -next fails to build arm and arm64 allmodconfig due to:
>
> > arm64-allmodconfig
> > arm-allmodconfig
> > ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
> > ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
>
> due to the series of commits that were added yesterday removing
> EXPORT_SYMBOL()s.
Thanks, James has sent me a patch that was supposed to fix this, but
needs to be redone before I can take it...
greg k-h
^ permalink raw reply
* next-20160920 build: 2 failures 5 warnings (next-20160920)
From: Build bot for Mark Brown @ 2016-09-20 11:03 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160920
Git describe: next-20160920
Commit: 6b7f746a58 Add linux-next specific files for 20160920
Build Time: 84 min 53 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 4
Warnings: 5
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
6 warnings 0 mismatches : arm-multi_v5_defconfig
7 warnings 0 mismatches : arm-multi_v7_defconfig
5 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-allnoconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 4
2 ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
2 ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
2 ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings Summary: 5
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
3 ../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
2 ../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 4 errors, 1 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 4 errors, 5 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/mmc/host/meson-gxbb.c:411:22: warning: unused variable 'cmd' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the drm tree with Linus' tree
From: Philipp Zabel @ 2016-09-20 12:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next, linux-kernel, Lucas Stach, Liu Ying
In-Reply-To: <20160920124206.67755097@canb.auug.org.au>
Hi Stephen,
Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/imx/ipuv3-crtc.c
>
> between commit:
>
> a474478642d5 ("drm/imx: fix crtc vblank state regression")
>
> from Linus' tree and commit:
>
> 5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")
>
> from the drm tree.
>
> I fixed it up (I think - 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.
Thank you for the fix. It shouldn't be critical, but I'd put the
drm_crtc_vblank_off last, for symmetry reasons.
regards
Philipp
^ permalink raw reply
* Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Kevin Hilman @ 2016-09-20 21:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Carlo Caione, Olof Johansson, Arnd Bergmann, ARM, linux-next,
linux-kernel, Jerome Brunet
In-Reply-To: <20160920101938.5d46a0ab@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
> arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>
> between commit:
>
> 8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
> d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.
Cleaned up.
I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.
Kevin
^ 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