* linux-next: build warnings after merge of the drm tree
From: Stephen Rothwell @ 2017-02-19 23:48 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Vincent Abriou, Fabien Dessenne
Hi Dave,
After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) produced these warnings:
drivers/gpu/drm/sti/sti_vtg.c: In function 'vtg_probe':
drivers/gpu/drm/sti/sti_vtg.c:392:22: warning: unused variable 'np' [-Wunused-variable]
struct device_node *np;
^
Introduced by commit
0c7ff84f7f9d ("drm/sti: remove deprecated legacy vtg slave")
drivers/gpu/drm/sti/sti_drv.c:120:13: warning: 'sti_drm_dbg_cleanup' defined but not used [-Wunused-function]
static void sti_drm_dbg_cleanup(struct drm_minor *minor)
^
Introduced by commit
5e60f595d6ca ("drm/sti: use atomic_helper for commit")
[BTW, this latter commit has no Signed-off-by from its committer :-(]
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: error fetching the ipmi tree
From: Stephen Rothwell @ 2017-02-19 23:33 UTC (permalink / raw)
To: Corey Minyard; +Cc: Corey Minyard, linux-next, linux-kernel
In-Reply-To: <1d5ff522-7a88-ff61-bc0c-fff28d6882ae@acm.org>
Hi Corey,
On Sun, 19 Feb 2017 16:26:18 -0600 Corey Minyard <minyard@acm.org> wrote:
>
> Dang, I was hoping SourceForge had cleaned up their act. I can ask for
> an account on
> kernel.org, but I'm not sure I will be able to get one.
Yeah, you need a well signed GPG key ...
> I'm in the process of moving userland things I support to github, which
> seems more
> stable than SourceForge. Would that be better?
Probably better than SourceForge :-) Keep in mind that Linus requires
signed tags for pulls from basically anywhere besides kernel.org.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the pci tree.
From: Stephen Rothwell @ 2017-02-19 22:40 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-next, linux-kernel
Hi Bjorn,
Today's linux-next merge of the pci tree got conflicts in:
drivers/pci/dwc/pcie-designware-host.c
I have no idea why? I see this file has been split out from another that
was itself moved from another directory, but that all happened in the
pci tree.
I fixed it up (I just used the pci 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.
OK, I checked again ... it may be conflicting with commit
a782b5f986c3 ("PCI: designware: Check for iATU unroll only on platforms that use ATU")
from Linus' tree (merged into v4.10-rc5), so my resolution above may be
incorrect.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: error fetching the ipmi tree
From: Corey Minyard @ 2017-02-19 22:26 UTC (permalink / raw)
To: Stephen Rothwell, Corey Minyard; +Cc: linux-next, linux-kernel
In-Reply-To: <20170220080019.7972746b@canb.auug.org.au>
On 02/19/2017 03:00 PM, Stephen Rothwell wrote:
> Hi Corey,
>
> On Wed, 22 Jul 2015 11:03:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> On Tue, 21 Jul 2015 18:45:33 -0500 Corey Minyard <cminyard@mvista.com> wrote:
>>> On 07/21/2015 05:29 PM, Stephen Rothwell wrote:
>>>> While fetching the ipmi tree
>>>> (git://git.code.sf.net/p/openipmi/linux-ipmi#for-next), I get this
>>>> error:
>>>>
>>>> fatal: unable to connect to git.code.sf.net:
>>>> git.code.sf.net[0: 216.34.181.155]: errno=Connection refused
>>>>
>>>> I have been getting this for a few days now. The http and https URLs
>>>> don't work either (for me in Firefox).
>>> Looks like sourceforge had a serious outage on the 18th and are still
>>> working on restoring it. http://sourceforge.net/blog/category/sitestatus/
>>>
>>> Would you like me to move this someplace else?
>> Its not a real problem as long as you don't have any updates for the
>> tree before SF restore things.
> OK, it looks like SourceForge is out again:
>
> $ git fetch ipmi
> fatal: unable to connect to git.code.sf.net:
> git.code.sf.net[0: 216.34.181.155]: errno=Connection refused
>
> It might be worth considering moving to git.kernel.org if possible and
> not too much effort.
>
Dang, I was hoping SourceForge had cleaned up their act. I can ask for
an account on
kernel.org, but I'm not sure I will be able to get one.
I'm in the process of moving userland things I support to github, which
seems more
stable than SourceForge. Would that be better?
-corey
^ permalink raw reply
* Re: linux-next: error fetching the ipmi tree
From: Stephen Rothwell @ 2017-02-19 21:00 UTC (permalink / raw)
To: Corey Minyard; +Cc: linux-next, linux-kernel
In-Reply-To: <20150722110331.2ed76955@canb.auug.org.au>
Hi Corey,
On Wed, 22 Jul 2015 11:03:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 21 Jul 2015 18:45:33 -0500 Corey Minyard <cminyard@mvista.com> wrote:
> >
> > On 07/21/2015 05:29 PM, Stephen Rothwell wrote:
> > >
> > > While fetching the ipmi tree
> > > (git://git.code.sf.net/p/openipmi/linux-ipmi#for-next), I get this
> > > error:
> > >
> > > fatal: unable to connect to git.code.sf.net:
> > > git.code.sf.net[0: 216.34.181.155]: errno=Connection refused
> > >
> > > I have been getting this for a few days now. The http and https URLs
> > > don't work either (for me in Firefox).
> >
> > Looks like sourceforge had a serious outage on the 18th and are still
> > working on restoring it. http://sourceforge.net/blog/category/sitestatus/
> >
> > Would you like me to move this someplace else?
>
> Its not a real problem as long as you don't have any updates for the
> tree before SF restore things.
OK, it looks like SourceForge is out again:
$ git fetch ipmi
fatal: unable to connect to git.code.sf.net:
git.code.sf.net[0: 216.34.181.155]: errno=Connection refused
It might be worth considering moving to git.kernel.org if possible and
not too much effort.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* [next-20170217] WARN @/arch/powerpc/include/asm/xics.h:124 .icp_hv_eoi+0x40/0x140
From: Sachin Sant @ 2017-02-19 15:09 UTC (permalink / raw)
To: linux-next; +Cc: linuxppc-dev, Michael Ellerman
While booting next-20170217 on a POWER6 box, I ran into following
warning. This is a full system lpar. Previous next tree was good.
I will try a bisect tomorrow.
ipr: IBM Power RAID SCSI Device Driver version: 2.6.3 (October 17, 2015)
ipr 0200:00:01.0: Found IOA with IRQ: 305
------------[ cut here ]------------
WARNING: CPU: 12 PID: 1 at ./arch/powerpc/include/asm/xics.h:124 .icp_hv_eoi+0x40/0x140
Modules linked in:
CPU: 12 PID: 1 Comm: swapper/14 Not tainted 4.10.0-rc8-next-20170217-autotest #1
task: c0000002b2a4a580 task.stack: c0000002b2a5c000
NIP: c0000000000731b0 LR: c0000000001389f8 CTR: c000000000073170
REGS: c0000002b2a5f050 TRAP: 0700 Not tainted (4.10.0-rc8-next-20170217-autotest)
MSR: 8000000000029032 <SF,EE,ME,IR,DR,RI>
CR: 28004082 XER: 20000004
CFAR: c0000000001389e0 SOFTE: 0
GPR00: c0000000001389f8 c0000002b2a5f2d0 c000000001025800 c0000002b203f498
GPR04: 0000000000000000 0000000000000000 0000000000000064 0000000000000131
GPR08: 0000000000000001 c0000000d3104cb8 ffffffffffffffff 000000000009b1f8
GPR12: 0000000048004082 c00000000edc2400 c00000000000dad0 0000000000000000
GPR16: 0000000000000000 00003c007efc0000 c000000000a9e848 0000000000000000
GPR20: d000080080080000 c0000002af4d47f0 c0000000011efda8 c000000000a9ea10
GPR24: c000000000a9e848 0000000000000000 c0000002af4d4fb8 0000000000000000
GPR28: 0000000000000000 c0000002b203f498 c000000000ef8928 c0000002b203f400
NIP [c0000000000731b0] .icp_hv_eoi+0x40/0x140
LR [c0000000001389f8] .handle_fasteoi_irq+0x1e8/0x270
Call Trace:
[c0000002b2a5f2d0] [c0000002b2a5f360] 0xc0000002b2a5f360 (unreliable)
[c0000002b2a5f360] [c0000000001389f8] .handle_fasteoi_irq+0x1e8/0x270
[c0000002b2a5f3e0] [c000000000136a08] .request_threaded_irq+0x298/0x370
[c0000002b2a5f490] [c0000000005895c0] .ipr_probe_ioa+0x1110/0x1390
[c0000002b2a5f5c0] [c00000000058d030] .ipr_probe+0x30/0x3e0
[c0000002b2a5f670] [c000000000466860] .local_pci_probe+0x60/0x130
[c0000002b2a5f710] [c000000000467658] .pci_device_probe+0x148/0x1e0
[c0000002b2a5f7c0] [c000000000527524] .driver_probe_device+0x2d4/0x5b0
[c0000002b2a5f860] [c00000000052796c] .__driver_attach+0x16c/0x190
[c0000002b2a5f8f0] [c0000000005242c4] .bus_for_each_dev+0x84/0xf0
[c0000002b2a5f990] [c000000000526af4] .driver_attach+0x24/0x40
[c0000002b2a5fa00] [c000000000526318] .bus_add_driver+0x2a8/0x370
[c0000002b2a5faa0] [c000000000528a5c] .driver_register+0x8c/0x170
[c0000002b2a5fb20] [c000000000465a54] .__pci_register_driver+0x44/0x60
[c0000002b2a5fb90] [c000000000b8efc8] .ipr_init+0x58/0x70
[c0000002b2a5fc10] [c00000000000d20c] .do_one_initcall+0x5c/0x1c0
[c0000002b2a5fce0] [c000000000b44738] .kernel_init_freeable+0x280/0x360
[c0000002b2a5fdb0] [c00000000000daec] .kernel_init+0x1c/0x130
[c0000002b2a5fe30] [c00000000000baa0] .ret_from_kernel_thread+0x58/0xb8
Instruction dump:
f8010010 f821ff71 80e3000c 7c0004ac e94d0030 3d02ffbc 3928f4b8 7d295214
81090004 3948ffff 7d484378 79080fe2 <0b080000> 2fa80000 40de0050 91490004
---[ end trace 5e18ae409f46392c ]---
ipr 0200:00:01.0: Initializing IOA.
Thanks
-Sachin
^ permalink raw reply
* next-20170217 boot on POWER8 LPAR : WARNING @kernel/jump_label.c:287
From: Sachin Sant @ 2017-02-19 14:07 UTC (permalink / raw)
To: linux-next; +Cc: linuxppc-dev, jbaron, LKML
[-- Attachment #1: Type: text/plain, Size: 2573 bytes --]
While booting next-20170217 on a POWER8 LPAR following
warning is displayed.
Reverting the following commit helps boot cleanly.
commit 3821fd35b5 : jump_label: Reduce the size of struct static_key
[ 11.393008] ------------[ cut here ]------------
[ 11.393031] WARNING: CPU: 5 PID: 2890 at kernel/jump_label.c:287 static_key_set_entries.isra.10+0x3c/0x50
[ 11.393035] Modules linked in: nfsd(+) ip_tables x_tables autofs4
[ 11.393043] CPU: 5 PID: 2890 Comm: modprobe Not tainted 4.10.0-rc8-next-20170217-autotest #1
[ 11.393047] task: c0000003a5692500 task.stack: c0000003a7774000
[ 11.393051] NIP: c0000000017bcffc LR: c0000000017bd46c CTR: 0000000000000000
[ 11.393054] REGS: c0000003a7777800 TRAP: 0700 Not tainted (4.10.0-rc8-next-20170217-autotest)
[ 11.393058] MSR: 800000000282b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE>
[ 11.393065] CR: 48248282 XER: 00000001
[ 11.393070] CFAR: c0000000017bcfcc SOFTE: 1
GPR00: c0000000017bd42c c0000003a7777a80 c00000000262ce00 d000000003fdd580
GPR04: d000000003fe07df 0000000100000017 c0000000017bcd50 0000000000000000
GPR08: 0000000000053a09 0000000000000001 c00000000254ce00 0000000000000001
GPR12: c000000001b56c40 c00000000ea81400 0000000000000020 d000000005081098
GPR16: c0000003a7777da0 c0000003a7777dec 0000000000000000 00000000000084a8
GPR20: d000000003fef000 d000000003fe2b28 c00000000252dc90 0000000000000001
GPR24: c00000000254d314 0000000000000000 c0000000025338f8 d000000003fe089f
GPR28: 0000000000000000 d000000003fe1400 d000000003fdd578 d000000003fe07df
[ 11.393115] NIP [c0000000017bcffc] static_key_set_entries.isra.10+0x3c/0x50
[ 11.393119] LR [c0000000017bd46c] jump_label_module_notify+0x20c/0x420
[ 11.393122] Call Trace:
[ 11.393125] [c0000003a7777a80] [c0000000017bd42c] jump_label_module_notify+0x1cc/0x420 (unreliable)
[ 11.393132] [c0000003a7777b40] [c0000000016b38e0] notifier_call_chain+0x90/0x100
[ 11.393137] [c0000003a7777b90] [c0000000016b3db0] __blocking_notifier_call_chain+0x60/0x90
[ 11.393142] [c0000003a7777be0] [c0000000017357bc] load_module+0x1c1c/0x2750
[ 11.393147] [c0000003a7777d70] [c000000001736550] SyS_finit_module+0xc0/0xf0
[ 11.393152] [c0000003a7777e30] [c0000000015cb8e0] system_call+0x38/0xfc
[ 11.393156] Instruction dump:
[ 11.393158] 40c20018 e9230000 792907a0 7c844b78 f8830000 4e800020 3d42fff2 892a0514
[ 11.393166] 2f890000 40feffe0 39200001 992a0514 <0fe00000> 4bffffd0 60000000 60000000
[ 11.393173] ---[ end trace a5f8fbc5d8226aec ]---
Have attached boot log.
Thanks
-Sachin
[-- Attachment #2: dmesg_next_20170217.log --]
[-- Type: application/octet-stream, Size: 28924 bytes --]
[ 0.000000] Allocated 2097152 bytes for 2048 pacas at c00000000ea80000
[ 0.000000] Page sizes from device-tree:
[ 0.000000] base_shift=12: shift=12, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=0
[ 0.000000] base_shift=12: shift=16, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=7
[ 0.000000] base_shift=12: shift=24, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=56
[ 0.000000] base_shift=16: shift=16, sllp=0x0110, avpnm=0x00000000, tlbiel=1, penc=1
[ 0.000000] base_shift=16: shift=24, sllp=0x0110, avpnm=0x00000000, tlbiel=1, penc=8
[ 0.000000] base_shift=24: shift=24, sllp=0x0100, avpnm=0x00000001, tlbiel=0, penc=0
[ 0.000000] base_shift=34: shift=34, sllp=0x0120, avpnm=0x000007ff, tlbiel=0, penc=3
[ 0.000000] Page orders: linear mapping = 24, virtual = 12, io = 12, vmemmap = 24
[ 0.000000] Using 1TB segments
[ 0.000000] Initializing hash mmu with SLB
[ 0.000000] Linux version 4.10.0-rc8-next-20170217-autotest (root@alp12.pok.stglabs.ibm.com) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-11) (GCC) ) #1 SMP Sun Feb 19 05:16:03 PST 2017
[ 0.000000] Found initrd at 0xc0000000027a0000:0xc000000003ac253f
[ 0.000000] Using pSeries machine description
[ 0.000000] bootconsole [udbg0] enabled
[ 0.000000] Partition configured for 16 cpus.
[ 0.000000] CPU maps initialized for 8 threads per core
[ 0.000000] (thread shift is 3)
[ 0.000000] Freed 2080768 bytes for unused pacas
[ 0.000000] -----------------------------------------------------
[ 0.000000] ppc64_pft_size = 0x1d
[ 0.000000] phys_mem_size = 0x3c0000000
[ 0.000000] dcache_bsize = 0x80
[ 0.000000] icache_bsize = 0x80
[ 0.000000] cpu_features = 0x27fc7aec18500249
[ 0.000000] possible = 0x7fffffff18500649
[ 0.000000] always = 0x0000000018100040
[ 0.000000] cpu_user_features = 0xdc0065c2 0xef000000
[ 0.000000] mmu_features = 0x7c004001
[ 0.000000] firmware_features = 0x00000001c45ffc5f
[ 0.000000] htab_hash_mask = 0x3fffff
[ 0.000000] physical_start = 0x15c0000
[ 0.000000] -----------------------------------------------------
[ 0.000000] numa: Initmem setup node 0
[ 0.000000] numa: NODE_DATA [mem 0x3bff61c80-0x3bff6bfff]
[ 0.000000] numa: NODE_DATA(0) on node 1
[ 0.000000] numa: Initmem setup node 1 [mem 0x00000000-0x3bfffffff]
[ 0.000000] numa: NODE_DATA [mem 0x3bff57900-0x3bff61c7f]
[ 0.000000] Section 957 and 959 (node 1) have a circular dependency on usemap and pgdat allocations
[ 0.000000] PPC64 nvram contains 15360 bytes
[ 0.000000] Top of RAM: 0x3c0000000, Total RAM: 0x3c0000000
[ 0.000000] Memory hole size: 0MB
[ 0.000000] Zone ranges:
[ 0.000000] DMA [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] DMA32 empty
[ 0.000000] Normal empty
[ 0.000000] Movable zone start for each node
[ 0.000000] Early memory node ranges
[ 0.000000] node 1: [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] Could not find start_pfn for node 0
[ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x0000000000000000]
[ 0.000000] On node 0 totalpages: 0
[ 0.000000] Initmem setup node 1 [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] On node 1 totalpages: 3932160
[ 0.000000] DMA zone: 61440 pages used for memmap
[ 0.000000] DMA zone: 0 pages reserved
[ 0.000000] DMA zone: 3932160 pages, LIFO batch:31
[ 0.000000] percpu: Embedded 32 pages/cpu @c0000003bfd00000 s93736 r0 d37336 u131072
[ 0.000000] pcpu-alloc: s93736 r0 d37336 u131072 alloc=1*1048576
[ 0.000000] pcpu-alloc: [0] 00 01 02 03 04 05 06 07 [0] 08 09 10 11 12 13 14 15
[ 0.000000] Built 2 zonelists in Node order, mobility grouping on. Total pages: 3870720
[ 0.000000] Policy zone: DMA
[ 0.000000] Kernel command line: root=/dev/mapper/rhel_alp12-root
[ 0.000000] PID hash table entries: 4096 (order: 3, 32768 bytes)
[ 0.000000] Memory: 15421408K/15728640K available (10212K kernel code, 1276K rwdata, 2844K rodata, 2608K init, 1262K bss, 307232K reserved, 0K cma-reserved)
[ 0.000000] SLUB: HWalign=128, Order=0-3, MinObjects=0, CPUs=16, Nodes=2
[ 0.000000] Hierarchical RCU implementation.
[ 0.000000] Build-time adjustment of leaf fanout to 64.
[ 0.000000] RCU restricting CPUs from NR_CPUS=2048 to nr_cpu_ids=16.
[ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=64, nr_cpu_ids=16
[ 0.000000] NR_IRQS:512 nr_irqs:512 16
[ 0.000000] pic: no ISA interrupt controller
[ 0.000000] time_init: decrementer frequency = 512.000000 MHz
[ 0.000000] time_init: processor frequency = 3724.000000 MHz
[ 0.000003] clocksource: timebase: mask: 0xffffffffffffffff max_cycles: 0x761537d007, max_idle_ns: 440795202126 ns
[ 0.000066] clocksource: timebase mult[1f40000] shift[24] registered
[ 0.000106] clockevent: decrementer mult[83126e98] shift[32] cpu[1]
[ 0.000206] Console: colour dummy device 80x25
[ 0.000239] console [hvc0] enabled
[ 0.000264] bootconsole [udbg0] disabled
[ 0.000294] ------------------------
[ 0.000299] | Locking API testsuite:
[ 0.000303] ----------------------------------------------------------------------------
[ 0.000310] | spin |wlock |rlock |mutex | wsem | rsem |
[ 0.000317] --------------------------------------------------------------------------
[ 0.000325] A-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000349] A-B-B-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000372] A-B-B-C-C-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000396] A-B-C-A-B-C deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000419] A-B-B-C-C-D-D-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000443] A-B-C-D-B-D-D-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000467] A-B-C-D-B-C-D-A deadlock:failed|failed| ok |failed|failed|failed|
[ 0.000492] double unlock: ok | ok |failed| ok |failed|failed|
[ 0.000514] initialize held:failed|failed|failed|failed|failed|failed|
[ 0.000534] bad unlock order: ok | ok | ok | ok | ok | ok |
[ 0.000555] --------------------------------------------------------------------------
[ 0.000562] recursive read-lock: | ok | |failed|
[ 0.000576] recursive read-lock #2: | ok | |failed|
[ 0.000590] mixed read-write-lock: |failed| |failed|
[ 0.000604] mixed write-read-lock: |failed| |failed|
[ 0.000637] --------------------------------------------------------------------------
[ 0.000644] hard-irqs-on + irq-safe-A/12:failed|failed| ok |
[ 0.000659] soft-irqs-on + irq-safe-A/12:failed|failed| ok |
[ 0.000674] hard-irqs-on + irq-safe-A/21:failed|failed| ok |
[ 0.000688] soft-irqs-on + irq-safe-A/21:failed|failed| ok |
[ 0.000702] sirq-safe-A => hirqs-on/12:failed|failed| ok |
[ 0.000715] sirq-safe-A => hirqs-on/21:failed|failed| ok |
[ 0.000730] hard-safe-A + irqs-on/12:failed|failed| ok |
[ 0.000744] soft-safe-A + irqs-on/12:failed|failed| ok |
[ 0.000758] hard-safe-A + irqs-on/21:failed|failed| ok |
[ 0.000772] soft-safe-A + irqs-on/21:failed|failed| ok |
[ 0.000786] hard-safe-A + unsafe-B #1/123:failed|failed| ok |
[ 0.000801] soft-safe-A + unsafe-B #1/123:failed|failed| ok |
[ 0.000816] hard-safe-A + unsafe-B #1/132:failed|failed| ok |
[ 0.000831] soft-safe-A + unsafe-B #1/132:failed|failed| ok |
[ 0.000845] hard-safe-A + unsafe-B #1/213:failed|failed| ok |
[ 0.000860] soft-safe-A + unsafe-B #1/213:failed|failed| ok |
[ 0.000875] hard-safe-A + unsafe-B #1/231:failed|failed| ok |
[ 0.000890] soft-safe-A + unsafe-B #1/231:failed|failed| ok |
[ 0.000904] hard-safe-A + unsafe-B #1/312:failed|failed| ok |
[ 0.000919] soft-safe-A + unsafe-B #1/312:failed|failed| ok |
[ 0.000933] hard-safe-A + unsafe-B #1/321:failed|failed| ok |
[ 0.000948] soft-safe-A + unsafe-B #1/321:failed|failed| ok |
[ 0.000963] hard-safe-A + unsafe-B #2/123:failed|failed| ok |
[ 0.000977] soft-safe-A + unsafe-B #2/123:failed|failed| ok |
[ 0.000992] hard-safe-A + unsafe-B #2/132:failed|failed| ok |
[ 0.001007] soft-safe-A + unsafe-B #2/132:failed|failed| ok |
[ 0.001022] hard-safe-A + unsafe-B #2/213:failed|failed| ok |
[ 0.001037] soft-safe-A + unsafe-B #2/213:failed|failed| ok |
[ 0.001052] hard-safe-A + unsafe-B #2/231:failed|failed| ok |
[ 0.001067] soft-safe-A + unsafe-B #2/231:failed|failed| ok |
[ 0.001082] hard-safe-A + unsafe-B #2/312:failed|failed| ok |
[ 0.001097] soft-safe-A + unsafe-B #2/312:failed|failed| ok |
[ 0.001111] hard-safe-A + unsafe-B #2/321:failed|failed| ok |
[ 0.001127] soft-safe-A + unsafe-B #2/321:failed|failed| ok |
[ 0.001142] hard-irq lock-inversion/123:failed|failed| ok |
[ 0.001157] soft-irq lock-inversion/123:failed|failed| ok |
[ 0.001172] hard-irq lock-inversion/132:failed|failed| ok |
[ 0.001186] soft-irq lock-inversion/132:failed|failed| ok |
[ 0.001201] hard-irq lock-inversion/213:failed|failed| ok |
[ 0.001216] soft-irq lock-inversion/213:failed|failed| ok |
[ 0.001230] hard-irq lock-inversion/231:failed|failed| ok |
[ 0.001245] soft-irq lock-inversion/231:failed|failed| ok |
[ 0.001260] hard-irq lock-inversion/312:failed|failed| ok |
[ 0.001275] soft-irq lock-inversion/312:failed|failed| ok |
[ 0.001290] hard-irq lock-inversion/321:failed|failed| ok |
[ 0.001305] soft-irq lock-inversion/321:failed|failed| ok |
[ 0.001320] hard-irq read-recursion/123: ok |
[ 0.001329] soft-irq read-recursion/123: ok |
[ 0.001338] hard-irq read-recursion/132: ok |
[ 0.001347] soft-irq read-recursion/132: ok |
[ 0.001356] hard-irq read-recursion/213: ok |
[ 0.001365] soft-irq read-recursion/213: ok |
[ 0.001374] hard-irq read-recursion/231: ok |
[ 0.001383] soft-irq read-recursion/231: ok |
[ 0.001392] hard-irq read-recursion/312: ok |
[ 0.001401] soft-irq read-recursion/312: ok |
[ 0.001410] hard-irq read-recursion/321: ok |
[ 0.001419] soft-irq read-recursion/321: ok |
[ 0.001428] --------------------------------------------------------------------------
[ 0.001434] | Wound/wait tests |
[ 0.001439] ---------------------
[ 0.001443] ww api failures: ok | ok | ok |
[ 0.001464] ww contexts mixing:failed| ok |
[ 0.001475] finishing ww context: ok | ok | ok | ok |
[ 0.001492] locking mismatches: ok | ok | ok |
[ 0.001506] EDEADLK handling: ok | ok | ok | ok | ok | ok | ok | ok | ok | ok |
[ 0.001548] spinlock nest unlocked:failed|
[ 0.001556] -----------------------------------------------------
[ 0.001562] |block | try |context|
[ 0.001568] -----------------------------------------------------
[ 0.001574] context:failed| ok | ok |
[ 0.001588] try:failed| ok |failed|
[ 0.001602] block:failed| ok |failed|
[ 0.001615] spinlock:failed| ok |failed|
[ 0.001630] --------------------------------------------------------
[ 0.001636] 151 out of 253 testcases failed, as expected. |
[ 0.001641] ----------------------------------------------------
[ 0.001671] mempolicy: Enabling automatic NUMA balancing. Configure with numa_balancing= or the kernel.numa_balancing sysctl
[ 0.001683] pid_max: default: 32768 minimum: 301
[ 0.004308] Dentry cache hash table entries: 2097152 (order: 12, 16777216 bytes)
[ 0.022131] Inode-cache hash table entries: 1048576 (order: 11, 8388608 bytes)
[ 0.030824] Mount-cache hash table entries: 32768 (order: 6, 262144 bytes)
[ 0.030882] Mountpoint-cache hash table entries: 32768 (order: 6, 262144 bytes)
[ 0.032050] EEH: pSeries platform initialized
[ 0.032059] POWER8 performance monitor hardware support registered
[ 0.032532] smp: Bringing up secondary CPUs ...
[ 0.280439] smp: Brought up 2 nodes, 8 CPUs
[ 0.280459] numa: Node 0 CPUs:
[ 0.280461] numa: Node 1 CPUs: 0-7
[ 0.280758] devtmpfs: initialized
[ 0.289441] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
[ 0.289465] kworker/u33:0 (59) used greatest stack depth: 12384 bytes left
[ 0.289486] futex hash table entries: 4096 (order: 7, 524288 bytes)
[ 0.289727] NET: Registered protocol family 16
[ 0.289761] EEH: No capable adapters found
[ 0.290047] cpuidle: using governor menu
[ 0.290072] RTAS daemon started
[ 0.290138] pstore: using zlib compression
[ 0.290142] pstore: Registered nvram as persistent store backend
[ 0.291723] PCI: Probing PCI hardware
[ 0.291727] PCI: Probing PCI hardware done
[ 0.291814] pseries-rng: Registering arch random hook.
[ 0.295171] HugeTLB registered 64 KB page size, pre-allocated 0 pages
[ 0.295177] HugeTLB registered 16 MB page size, pre-allocated 0 pages
[ 0.295180] HugeTLB registered 16 GB page size, pre-allocated 0 pages
[ 0.295452] vgaarb: loaded
[ 0.295511] SCSI subsystem initialized
[ 0.295581] libata version 3.00 loaded.
[ 0.295678] usbcore: registered new interface driver usbfs
[ 0.295699] usbcore: registered new interface driver hub
[ 0.295747] usbcore: registered new device driver usb
[ 0.295789] pps_core: LinuxPPS API ver. 1 registered
[ 0.295796] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
[ 0.295811] PTP clock support registered
[ 0.296047] clocksource: Switched to clocksource timebase
[ 0.307839] NET: Registered protocol family 2
[ 0.308002] TCP established hash table entries: 131072 (order: 8, 1048576 bytes)
[ 0.308459] TCP bind hash table entries: 65536 (order: 9, 2097152 bytes)
[ 0.309020] TCP: Hash tables configured (established 131072 bind 65536)
[ 0.309074] UDP hash table entries: 8192 (order: 7, 786432 bytes)
[ 0.309302] UDP-Lite hash table entries: 8192 (order: 7, 786432 bytes)
[ 0.309544] NET: Registered protocol family 1
[ 0.309660] RPC: Registered named UNIX socket transport module.
[ 0.309663] RPC: Registered udp transport module.
[ 0.309665] RPC: Registered tcp transport module.
[ 0.309667] RPC: Registered tcp NFSv4.1 backchannel transport module.
[ 0.309671] PCI: CLS 0 bytes, default 128
[ 0.309709] Trying to unpack rootfs image as initramfs...
[ 0.560132] Freeing initrd memory: 19592K
[ 0.560913] IOMMU table initialized, virtual merging enabled
[ 0.571171] hv-24x7: read 1330 catalog entries, created 337 event attrs (0 failures), 169 descs
[ 0.571692] ====[ backtrace testing ]===========
[ 0.571696] Testing a backtrace from process context.
[ 0.571700] The following trace is a kernel self test and not a bug!
[ 0.571707] CPU: 2 PID: 1 Comm: swapper/1 Not tainted 4.10.0-rc8-next-20170217-autotest #1
[ 0.571711] Call Trace:
[ 0.571717] [c0000003ac9ebb30] [c000000001fb0720] dump_stack+0xb0/0xf0 (unreliable)
[ 0.571722] [c0000003ac9ebb70] [c00000000173b76c] backtrace_regression_test+0x5c/0x170
[ 0.571726] [c0000003ac9ebc40] [c0000000015cd660] do_one_initcall+0x60/0x1c0
[ 0.571731] [c0000003ac9ebd00] [c0000000022881b8] kernel_init_freeable+0x26c/0x344
[ 0.571735] [c0000003ac9ebdc0] [c0000000015cdf74] kernel_init+0x24/0x150
[ 0.571739] [c0000003ac9ebe30] [c0000000015cbc60] ret_from_kernel_thread+0x5c/0x7c
[ 0.571742] Testing a backtrace from irq context.
[ 0.571744] The following trace is a kernel self test and not a bug!
[ 0.571749] CPU: 2 PID: 23 Comm: ksoftirqd/2 Not tainted 4.10.0-rc8-next-20170217-autotest #1
[ 0.571752] Call Trace:
[ 0.571754] [c0000003acb33b80] [c000000001fb0720] dump_stack+0xb0/0xf0 (unreliable)
[ 0.571759] [c0000003acb33bc0] [c00000000173b6e8] backtrace_test_irq_callback+0x18/0x40
[ 0.571762] [c0000003acb33be0] [c000000001690148] tasklet_action+0xc8/0x1b0
[ 0.571766] [c0000003acb33c40] [c00000000168f344] __do_softirq+0x164/0x3d0
[ 0.571769] [c0000003acb33d30] [c00000000168f5f0] run_ksoftirqd+0x40/0xc0
[ 0.571773] [c0000003acb33d60] [c0000000016b70e0] smpboot_thread_fn+0x290/0x2a0
[ 0.571777] [c0000003acb33dc0] [c0000000016b17ac] kthread+0x14c/0x190
[ 0.571780] [c0000003acb33e30] [c0000000015cbc60] ret_from_kernel_thread+0x5c/0x7c
[ 0.571787] Testing a saved backtrace.
[ 0.571789] The following trace is a kernel self test and not a bug!
[ 0.571793] backtrace_regression_test+0x124/0x170
[ 0.571796] do_one_initcall+0x60/0x1c0
[ 0.571799] kernel_init_freeable+0x26c/0x344
[ 0.571801] kernel_init+0x24/0x150
[ 0.571804] ret_from_kernel_thread+0x5c/0x7c
[ 0.571806] ====[ end of backtrace testing ]====
[ 0.571815] audit: initializing netlink subsys (disabled)
[ 0.571856] audit: type=2000 audit(1487510438.560:1): state=initialized audit_enabled=0 res=1
[ 0.575125] workingset: timestamp_bits=38 max_order=22 bucket_order=0
[ 0.577647] NFS: Registering the id_resolver key type
[ 0.577658] Key type id_resolver registered
[ 0.577661] Key type id_legacy registered
[ 0.577669] SGI XFS with ACLs, security attributes, no debug enabled
[ 0.578342] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 251)
[ 0.578350] io scheduler noop registered
[ 0.578355] io scheduler deadline registered
[ 0.578384] io scheduler cfq registered (default)
[ 0.578389] io scheduler mq-deadline registered
[ 0.592648] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
[ 0.595321] brd: module loaded
[ 0.596859] loop: module loaded
[ 0.596928] ipr: IBM Power RAID SCSI Device Driver version: 2.6.3 (October 17, 2015)
[ 0.597059] ibmvscsi 30000070: SRP_VERSION: 16.a
[ 7.196098] ibmvscsi 30000070: SRP_VERSION: 16.a
[ 7.196270] ibmvscsi 30000070: Maximum ID: 64 Maximum LUN: 32 Maximum Channel: 3
[ 7.196274] scsi host0: IBM POWER Virtual SCSI Adapter 1.5.9
[ 7.196425] ibmvscsi 30000070: partner initialization complete
[ 7.196464] ibmvscsi 30000070: host srp version: 16.a, host partition alp18-VIOS (100), OS 3, max io 1048576
[ 7.196520] ibmvscsi 30000070: Client reserve enabled
[ 7.196532] ibmvscsi 30000070: sent SRP login
[ 7.201569] ibmvscsi 30000070: SRP_LOGIN succeeded
[ 7.226344] scsi 0:0:1:0: Direct-Access AIX VDASD 0001 PQ: 0 ANSI: 3
[ 7.231609] scsi 0:0:2:0: CD-ROM AIX VOPTA PQ: 0 ANSI: 4
[ 7.263909] random: fast init done
[ 7.265371] sd 0:0:1:0: [sda] 62914560 512-byte logical blocks: (32.2 GB/30.0 GiB)
[ 7.265409] sr 0:0:2:0: [sr0] scsi-1 drive
[ 7.265410] sd 0:0:1:0: [sda] Write Protect is off
[ 7.265412] sd 0:0:1:0: [sda] Mode Sense: 17 00 00 08
[ 7.265414] cdrom: Uniform CD-ROM driver Revision: 3.20
[ 7.265454] sd 0:0:1:0: [sda] Cache data unavailable
[ 7.265460] sd 0:0:1:0: [sda] Assuming drive cache: write through
[ 7.265572] sr 0:0:2:0: Attached scsi CD-ROM sr0
[ 7.265681] sd 0:0:1:0: Attached scsi generic sg0 type 0
[ 7.265728] sr 0:0:2:0: Attached scsi generic sg1 type 5
[ 7.265854] libphy: Fixed MDIO Bus: probed
[ 7.265874] ibmveth: IBM Power Virtual Ethernet Driver 1.06
[ 7.266024] e100: Intel(R) PRO/100 Network Driver, 3.5.24-k2-NAPI
[ 7.266041] e100: Copyright(c) 1999-2006 Intel Corporation
[ 7.266060] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
[ 7.266066] e1000: Copyright (c) 1999-2006 Intel Corporation.
[ 7.266082] e1000e: Intel(R) PRO/1000 Network Driver - 3.2.6-k
[ 7.266087] e1000e: Copyright(c) 1999 - 2015 Intel Corporation.
[ 7.266102] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 7.266108] ehci-pci: EHCI PCI platform driver
[ 7.266124] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
[ 7.266131] ohci-pci: OHCI PCI platform driver
[ 7.266196] mousedev: PS/2 mouse device common for all mice
[ 7.266317] rtc-generic rtc-generic: rtc core: registered rtc-generic as rtc0
[ 7.266382] device-mapper: uevent: version 1.0.3
[ 7.266453] device-mapper: ioctl: 4.35.0-ioctl (2016-06-23) initialised: dm-devel@redhat.com
[ 7.266587] pseries_idle_driver registered
[ 7.266604] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sync_size new:4096 old:0
[ 7.266609] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sync_sg new:510 old:0
[ 7.266613] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sg_len new:4080 old:0
[ 7.266931] usbcore: registered new interface driver usbhid
[ 7.266937] usbhid: USB HID core driver
[ 7.266942] oprofile: using timer interrupt.
[ 7.267036] ipip: IPv4 and MPLS over IPv4 tunneling driver
[ 7.267188] NET: Registered protocol family 17
[ 7.267211] Key type dns_resolver registered
[ 7.267241] Running code patching self-tests ...
[ 7.269269] Running feature fixup self-tests ...
[ 7.269272] Running MSI bitmap self-tests ...
[ 7.269438] registered taskstats version 1
[ 7.269472] console [netcon0] enabled
[ 7.269475] netconsole: network logging started
[ 7.269520] rtc-generic rtc-generic: setting system clock to 2017-02-19 13:20:45 UTC (1487510445)
[ 7.272124] sda: sda1 sda2 sda3
[ 7.272495] sd 0:0:1:0: [sda] Attached SCSI disk
[ 7.272797] Freeing unused kernel memory: 2608K
[ 7.272800] This architecture does not have kernel memory protection.
[ 7.275174] systemd[1]: Failed to insert module 'autofs4'
[ 7.279477] systemd[1]: systemd 219 running in system mode. (+PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ -LZ4 -SECCOMP +BLKID +ELFUTILS +KMOD +IDN)
[ 7.279582] systemd[1]: Detected architecture ppc64-le.
[ 7.279586] systemd[1]: Running in initial RAM disk.
[ 7.279824] systemd[1]: Set hostname to <localhost.localdomain>.
[ 7.297261] dracut-rootfs-g (1563) used greatest stack depth: 12080 bytes left
[ 7.329741] systemd[1]: Reached target Timers.
[ 7.329752] systemd[1]: Starting Timers.
[ 7.330103] systemd[1]: Created slice Root Slice.
[ 7.330111] systemd[1]: Starting Root Slice.
[ 7.330311] systemd[1]: Reached target Swap.
[ 7.330319] systemd[1]: Starting Swap.
[ 7.342871] gzip (1583) used greatest stack depth: 11680 bytes left
[ 7.625443] scsi_id (2457) used greatest stack depth: 11488 bytes left
[ 8.969488] XFS (dm-1): Mounting V5 Filesystem
[ 9.056680] XFS (dm-1): Starting recovery (logdev: internal)
[ 9.244298] XFS (dm-1): Ending recovery (logdev: internal)
[ 9.245046] mount (2793) used greatest stack depth: 10448 bytes left
[ 9.592037] systemd-journald[1580]: Received SIGTERM from PID 1 (systemd).
[ 9.658626] systemd: 24 output lines suppressed due to ratelimiting
[ 9.985230] systemd[1]: Inserted module 'autofs4'
[ 10.004289] ip_tables: (C) 2000-2006 Netfilter Core Team
[ 10.004300] systemd[1]: Inserted module 'ip_tables'
[ 11.062710] systemd-readahead[2878]: Failed to create fanotify object: Function not implemented
[ 11.393008] ------------[ cut here ]------------
[ 11.393031] WARNING: CPU: 5 PID: 2890 at kernel/jump_label.c:287 static_key_set_entries.isra.10+0x3c/0x50
[ 11.393035] Modules linked in: nfsd(+) ip_tables x_tables autofs4
[ 11.393043] CPU: 5 PID: 2890 Comm: modprobe Not tainted 4.10.0-rc8-next-20170217-autotest #1
[ 11.393047] task: c0000003a5692500 task.stack: c0000003a7774000
[ 11.393051] NIP: c0000000017bcffc LR: c0000000017bd46c CTR: 0000000000000000
[ 11.393054] REGS: c0000003a7777800 TRAP: 0700 Not tainted (4.10.0-rc8-next-20170217-autotest)
[ 11.393058] MSR: 800000000282b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE>
[ 11.393065] CR: 48248282 XER: 00000001
[ 11.393070] CFAR: c0000000017bcfcc SOFTE: 1
GPR00: c0000000017bd42c c0000003a7777a80 c00000000262ce00 d000000003fdd580
GPR04: d000000003fe07df 0000000100000017 c0000000017bcd50 0000000000000000
GPR08: 0000000000053a09 0000000000000001 c00000000254ce00 0000000000000001
GPR12: c000000001b56c40 c00000000ea81400 0000000000000020 d000000005081098
GPR16: c0000003a7777da0 c0000003a7777dec 0000000000000000 00000000000084a8
GPR20: d000000003fef000 d000000003fe2b28 c00000000252dc90 0000000000000001
GPR24: c00000000254d314 0000000000000000 c0000000025338f8 d000000003fe089f
GPR28: 0000000000000000 d000000003fe1400 d000000003fdd578 d000000003fe07df
[ 11.393115] NIP [c0000000017bcffc] static_key_set_entries.isra.10+0x3c/0x50
[ 11.393119] LR [c0000000017bd46c] jump_label_module_notify+0x20c/0x420
[ 11.393122] Call Trace:
[ 11.393125] [c0000003a7777a80] [c0000000017bd42c] jump_label_module_notify+0x1cc/0x420 (unreliable)
[ 11.393132] [c0000003a7777b40] [c0000000016b38e0] notifier_call_chain+0x90/0x100
[ 11.393137] [c0000003a7777b90] [c0000000016b3db0] __blocking_notifier_call_chain+0x60/0x90
[ 11.393142] [c0000003a7777be0] [c0000000017357bc] load_module+0x1c1c/0x2750
[ 11.393147] [c0000003a7777d70] [c000000001736550] SyS_finit_module+0xc0/0xf0
[ 11.393152] [c0000003a7777e30] [c0000000015cb8e0] system_call+0x38/0xfc
[ 11.393156] Instruction dump:
[ 11.393158] 40c20018 e9230000 792907a0 7c844b78 f8830000 4e800020 3d42fff2 892a0514
[ 11.393166] 2f890000 40feffe0 39200001 992a0514 <0fe00000> 4bffffd0 60000000 60000000
[ 11.393173] ---[ end trace a5f8fbc5d8226aec ]---
[ 11.393501] Installing knfsd (copyright (C) 1996 okir@monad.swb.de).
[ 11.605959] systemd-journald[2881]: Received request to flush runtime journal from PID 1
[ 12.293572] pseries_rng: Registering IBM pSeries RNG driver
[ 12.421674] crypto_register_alg 'aes' = 0
[ 12.421771] crypto_register_alg 'cbc(aes)' = 0
[ 12.421856] crypto_register_alg 'ctr(aes)' = 0
[ 12.422056] crypto_register_alg 'xts(aes)' = 0
[ 12.653090] ibmveth 30000002 net0: renamed from eth0
[ 13.457900] XFS (sda2): Mounting V5 Filesystem
[ 13.854657] Unable to find swap-space signature
[ 14.303079] XFS (sda2): Starting recovery (logdev: internal)
[ 14.861448] XFS (sda2): Ending recovery (logdev: internal)
[ 15.231960] random: crng init done
[ 16.410256] polkitd[4821]: unhandled signal 11 at 0000000000000000 nip 00003fff8e3308a4 lr 00003fff8e33087c code 30001
[ 16.617885] systemd-readahe (2885) used greatest stack depth: 10320 bytes left
[ 17.311086] nf_conntrack version 0.5.0 (65536 buckets, 262144 max)
[ 17.447515] Netfilter messages via NETLINK v0.30.
[ 17.494712] polkitd[4965]: unhandled signal 11 at 0000000000000000 nip 00003fff898418a4 lr 00003fff8984187c code 30001
[ 38.806749] modprobe (5496) used greatest stack depth: 10224 bytes left
[ 42.497511] polkitd[6584]: unhandled signal 11 at 0000000000000000 nip 00003fffa6fe38a4 lr 00003fffa6fe387c code 30001
[ 68.110279] polkitd[6589]: unhandled signal 11 at 0000000000000000 nip 00003fff91a228a4 lr 00003fff91a2287c code 30001
[ 71.885459] tun: Universal TUN/TAP device driver, 1.6
[ 71.885482] tun: (C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>
[ 72.019145] virbr0: port 1(virbr0-nic) entered blocking state
[ 72.019162] virbr0: port 1(virbr0-nic) entered disabled state
[ 72.019203] device virbr0-nic entered promiscuous mode
[ 93.133347] polkitd[6642]: unhandled signal 11 at 0000000000000000 nip 00003fff901458a4 lr 00003fff9014587c code 30001
[ 118.151747] polkitd[6646]: unhandled signal 11 at 0000000000000000 nip 00003fff7ec8c8a4 lr 00003fff7ec8c87c code 30001
[ 143.169733] polkitd[6651]: unhandled signal 11 at 0000000000000000 nip 00003fff7f4158a4 lr 00003fff7f41587c code 30001
[ 168.177191] polkitd[6657]: unhandled signal 11 at 0000000000000000 nip 00003fffaa1f88a4 lr 00003fffaa1f887c code 30001
[ 193.185874] polkitd[6662]: unhandled signal 11 at 0000000000000000 nip 00003fffa9fbd8a4 lr 00003fffa9fbd87c code 30001
[ 218.211230] polkitd[6666]: unhandled signal 11 at 0000000000000000 nip 00003fffb6fdd8a4 lr 00003fffb6fdd87c code 30001
[ 243.238575] polkitd[6691]: unhandled signal 11 at 0000000000000000 nip 00003fffa11938a4 lr 00003fffa119387c code 30001
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the openrisc tree
From: Stafford Horne @ 2017-02-19 7:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Frederic Weisbecker,
Stefan Kristiansson
In-Reply-To: <20170217124321.7b4b394d@canb.auug.org.au>
On Fri, Feb 17, 2017 at 12:43:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/openrisc/include/asm/Kbuild
>
> between commit:
>
> 157e82f58007 ("openrisc: add cmpxchg and xchg implementations")
>
> from the openrisc tree and commit:
>
> b672592f0221 ("sched/cputime: Remove generic asm headers")
>
> from the tip 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.
Thank you, the below looks good. I dont think there is much that can be
done other than sorting the conflict during merge.
I will mention this to linus. Hopefully this will be next week.
-Stafford
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/openrisc/include/asm/Kbuild
> index a669c141436e,ef8d1ccc3e45..000000000000
> --- a/arch/openrisc/include/asm/Kbuild
> +++ b/arch/openrisc/include/asm/Kbuild
> @@@ -9,7 -10,8 +9,6 @@@ generic-y += bugs.
> generic-y += cacheflush.h
> generic-y += checksum.h
> generic-y += clkdev.h
> - generic-y += cputime.h
> -generic-y += cmpxchg-local.h
> -generic-y += cmpxchg.h
> generic-y += current.h
> generic-y += device.h
> generic-y += div64.h
^ permalink raw reply
* mmotm 2017-02-17-15-31 uploaded
From: akpm @ 2017-02-17 23:31 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-02-17-15-31 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.10-rc8:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* printk-use-rcuidle-console-tracepoint.patch
* scatterlist-dont-overflow-length-field.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* cris-use-generic-currenth.patch
* tracing-add-__print_flags_u64.patch
* dax-add-tracepoint-infrastructure-pmd-tracing.patch
* dax-update-maintainers-entries-for-fs-dax.patch
* dax-add-tracepoints-to-dax_pmd_load_hole.patch
* dax-add-tracepoints-to-dax_pmd_insert_mapping.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault-v7.patch
* mm-dax-move-pmd_fault-to-take-only-vmf-parameter.patch
* dma-debug-add-comment-for-failed-to-check-map-error.patch
* tools-vm-add-missing-makefile-rules.patch
* scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
* scripts-spellingtxt-fix-incorrect-typo-words.patch
* scripts-spellingtxt-fix-incorrect-typo-words-fix.patch
* scripts-lindent-clean-up-and-optimize.patch
* scripts-checkstackpl-add-support-for-nios2.patch
* scripts-checkincludes-add-exit-message-for-no-duplicates-found.patch
* scripts-tagssh-include-arch-kconfig-for-tags-generation.patch
* m32r-use-generic-currenth.patch
* m32r-fix-build-warning.patch
* score-remove-asm-currenth.patch
* ocfs2-dlmglue-prepare-tracking-logic-to-avoid-recursive-cluster-lock.patch
* ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-vfs-entry-points.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* parisc-use-generic-currenth.patch
* block-use-for_each_thread-in-sys_ioprio_set-sys_ioprio_get.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* 9p-fix-a-potential-acl-leak.patch
* kernel-watchdogc-do-not-hardcode-cpu-0-as-the-initial-thread.patch
mm.patch
* slub-do-not-merge-cache-if-slub_debug-contains-a-never-merge-flag.patch
* mm-slub-add-a-dump_stack-to-the-unexpected-gfp-check.patch
* mm-slab-rename-kmalloc-node-cache-to-kmalloc-size.patch
* mm-slab-rename-kmalloc-node-cache-to-kmalloc-size-fix-fix.patch
* revert-slub-move-synchronize_sched-out-of-slab_mutex-on-shrink.patch
* slub-separate-out-sysfs_slab_release-from-sysfs_slab_remove.patch
* slab-remove-synchronous-rcu_barrier-call-in-memcg-cache-release-path.patch
* slab-reorganize-memcg_cache_params.patch
* slab-link-memcg-kmem_caches-on-their-associated-memory-cgroup.patch
* slab-implement-slab_root_caches-list.patch
* slab-introduce-__kmemcg_cache_deactivate.patch
* slab-remove-synchronous-synchronize_sched-from-memcg-cache-deactivation-path.patch
* slab-remove-slub-sysfs-interface-files-early-for-empty-memcg-caches.patch
* slab-use-memcg_kmem_cache_wq-for-slab-destruction-operations.patch
* slub-make-sysfs-directories-for-memcg-sub-caches-optional.patch
* slub-make-sysfs-directories-for-memcg-sub-caches-optional-fix.patch
* tmpfs-change-shmem_mapping-to-test-shmem_aops.patch
* mm-throttle-show_mem-from-warn_alloc.patch
* mm-throttle-show_mem-from-warn_alloc-fix.patch
* mm-page_alloc-dont-convert-pfn-to-idx-when-merging.patch
* mm-page_alloc-avoid-page_to_pfn-when-merging-buddies.patch
* mm-vmallocc-use-rb_entry_safe.patch
* mm-trace-extract-compaction_status-and-zone_type-to-a-common-header.patch
* oom-trace-add-oom-detection-tracepoints.patch
* oom-trace-add-compaction-retry-tracepoint.patch
* userfaultfd-document-_ior-_iow.patch
* userfaultfd-correct-comment-about-uffd_feature_pagefault_flag_wp.patch
* userfaultfd-convert-bug-to-warn_on_once.patch
* userfaultfd-use-vma_is_anonymous.patch
* userfaultfd-non-cooperative-split-the-find_userfault-routine.patch
* userfaultfd-non-cooperative-add-ability-to-report-non-pf-events-from-uffd-descriptor.patch
* userfaultfd-non-cooperative-report-all-available-features-to-userland.patch
* userfaultfd-non-cooperative-add-fork-event.patch
* userfaultfd-non-cooperative-add-fork-event-build-warning-fix.patch
* userfaultfd-non-cooperative-dup_userfaultfd-use-mm_count-instead-of-mm_users.patch
* userfaultfd-non-cooperative-add-mremap-event.patch
* userfaultfd-non-cooperative-optimize-mremap_userfaultfd_complete.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_dontneed-request.patch
* userfaultfd-non-cooperative-avoid-madv_dontneed-race-condition.patch
* userfaultfd-non-cooperative-wake-userfaults-after-uffdio_unregister.patch
* userfaultfd-hugetlbfs-add-copy_huge_page_from_user-for-hugetlb-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-hugetlb_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-__mcopy_atomic_hugetlb-for-huge-page-uffdio_copy.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
* userfaultfd-hugetlbfs-add-userfaultfd-hugetlb-hook.patch
* userfaultfd-hugetlbfs-allow-registration-of-ranges-containing-huge-pages.patch
* userfaultfd-hugetlbfs-add-userfaultfd_hugetlb-test.patch
* userfaultfd-hugetlbfs-userfaultfd_huge_must_wait-for-hugepmd-ranges.patch
* userfaultfd-hugetlbfs-gup-support-vm_fault_retry.patch
* userfaultfd-hugetlbfs-reserve-count-on-error-in-__mcopy_atomic_hugetlb.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_hugetlbfs.patch
* userfaultfd-introduce-vma_can_userfault.patch
* userfaultfd-shmem-add-shmem_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-shmem-introduce-vma_is_shmem.patch
* userfaultfd-shmem-add-tlbflushh-header-for-microblaze.patch
* userfaultfd-shmem-use-shmem_mcopy_atomic_pte-for-shared-memory.patch
* userfaultfd-shmem-add-userfaultfd-hook-for-shared-memory-faults.patch
* userfaultfd-shmem-allow-registration-of-shared-memory-ranges.patch
* userfaultfd-hugetlbfs-add-uffdio_copy-support-for-shared-mappings.patch
* userfaultfd-hugetlbfs-add-uffdio_copy-support-for-shared-mappings-update.patch
* userfaultfd-shmem-add-userfaultfd_shmem-test.patch
* userfaultfd-shmem-lock-the-page-before-adding-it-to-pagecache.patch
* userfaultfd-shmem-avoid-a-lockup-resulting-from-corrupted-page-flags.patch
* userfaultfd-shmem-avoid-leaking-blocks-and-used-blocks-in-uffdio_copy.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_shmem.patch
* userfaultfd-non-cooperative-selftest-introduce-userfaultfd_open.patch
* userfaultfd-non-cooperative-selftest-add-ufd-parameter-to-copy_page.patch
* userfaultfd-non-cooperative-selftest-add-test-for-fork-madvdontneed-and-remap-events.patch
* userfaultfd-selftest-test-uffdio_zeropage-on-all-memory-types.patch
* mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock.patch
* mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock-fix.patch
* mm-vmscan-remove-unused-mm_vmscan_memcg_isolate.patch
* mm-vmscan-add-active-list-aging-tracepoint.patch
* mm-vmscan-add-active-list-aging-tracepoint-update.patch
* mm-vmscan-show-the-number-of-skipped-pages-in-mm_vmscan_lru_isolate.patch
* mm-vmscan-show-lru-name-in-mm_vmscan_lru_isolate-tracepoint.patch
* mm-vmscan-extract-shrink_page_list-reclaim-counters-into-a-struct.patch
* mm-vmscan-enhance-mm_vmscan_lru_shrink_inactive-tracepoint.patch
* mm-vmscan-add-mm_vmscan_inactive_list_is_low-tracepoint.patch
* trace-vmscan-postprocess-sync-with-tracepoints-updates.patch
* nfs-no-pg_private-waiters-remain-remove-waker.patch
* mm-un-export-wake_up_page-functions.patch
* mm-fix-filemapc-kernel-doc-warnings.patch
* mm-page_alloc-swap-likely-to-unlikely-as-code-logic-is-different-for-next_zones_zonelist.patch
* mm-compaction-add-vmstats-for-kcompactd-work.patch
* mm-page_alloc-skip-over-regions-of-invalid-pfns-where-possible.patch
* mmcompaction-serialize-waitqueue_active-checks.patch
* mm-bootmemc-cosmetic-improvement-of-code-readability.patch
* mm-fix-some-typos-in-mm-zsmallocc.patch
* mm-memblockc-trivial-code-refine-in-memblock_is_region_memory.patch
* mm-memblockc-check-return-value-of-memblock_reserve-in-memblock_virt_alloc_internal.patch
* mm-sparse-use-page_private-to-get-page-private-value.patch
* mm-memory_hotplug-set-magic-number-to-page-freelsit-instead-of-page-lrunext.patch
* mm-memory_hotplug-set-magic-number-to-page-freelsit-instead-of-page-lrunext-fix.patch
* powerpc-do-not-make-the-entire-heap-executable.patch
* mm-swap-fix-kernel-message-in-swap_info_get.patch
* mm-swap-add-cluster-lock.patch
* mm-swap-add-cluster-lock-v5.patch
* mm-swap-add-cluster-lock-v5-fix.patch
* mm-swap-add-cluster-lock-v5-fix-2.patch
* mm-swap-split-swap-cache-into-64mb-trunks.patch
* mm-swap-skip-read-ahead-for-unreferenced-swap-slots.patch
* mm-swap-allocate-swap-slots-in-batches.patch
* mm-swap-free-swap-slots-in-batch.patch
* mm-swap-add-cache-for-swap-slots-allocation.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix-2.patch
* mm-swap-enable-swap-slots-cache-usage.patch
* mm-swap-skip-readahead-only-when-swap-slot-cache-is-enabled.patch
* mm-swap-skip-readahead-only-when-swap-slot-cache-is-enabled-fix.patch
* mm-thp-add-new-defermadvise-defrag-option.patch
* writeback-use-rb_entry.patch
* mm-vmscan-do-not-count-freed-pages-as-pgdeactivate.patch
* mm-vmscan-cleanup-lru-size-claculations.patch
* mm-vmscan-consider-eligible-zones-in-get_scan_count.patch
* revert-mm-bail-out-in-shrink_inactive_list.patch
* mm-page_alloc-do-not-report-all-nodes-in-show_mem.patch
* mm-page_alloc-warn_alloc-print-nodemask.patch
* arch-mm-remove-arch-specific-show_mem.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
* mm-oom-do-not-enfore-oom-killer-for-__gfp_nofail-automatically.patch
* mm-help-__gfp_nofail-allocations-which-do-not-trigger-oom-killer.patch
* mm-page_alloc-warn_alloc-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-drop-zap_details-ignore_dirty.patch
* mm-drop-zap_details-check_swap_entries.patch
* mm-drop-unused-argument-of-zap_page_range.patch
* oom-reaper-use-madvise_dontneed-logic-to-decide-if-unmap-the-vma.patch
* mm-memblockc-remove-unnecessary-log-and-clean-up.patch
* zram-remove-obsolete-sysfs-attrs.patch
* mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix-2.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled-fix.patch
* mm-devm_memremap_pages-hold-device_hotplug-lock-over-mem_hotplug_begin-done.patch
* mm-devm_memremap_pages-hold-device_hotplug-lock-over-mem_hotplug_begin-done-v2.patch
* mm-validate-device_hotplug-is-held-for-memory-hotplug.patch
* mm-memory_hotplugc-unexport-__remove_pages.patch
* memblock-let-memblock_type_name-know-about-physmem-type.patch
* memblock-also-dump-physmem-list-within-__memblock_dump_all.patch
* memblock-embed-memblock-type-name-within-struct-memblock_type.patch
* userfaultfd-non-cooperative-rename-event_madvdontneed-to-event_remove.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_remove-request.patch
* userfaultfd-non-cooperative-selftest-enable-remove-event-test-for-shmem.patch
* mm-vmscan-scan-dirty-pages-even-in-laptop-mode.patch
* mm-vmscan-kick-flushers-when-we-encounter-dirty-pages-on-the-lru.patch
* mm-vmscan-kick-flushers-when-we-encounter-dirty-pages-on-the-lru-fix.patch
* mm-vmscan-remove-old-flusher-wakeup-from-direct-reclaim-path.patch
* mm-vmscan-only-write-dirty-pages-that-the-scanner-has-seen-twice.patch
* mm-vmscan-move-dirty-pages-out-of-the-way-until-theyre-flushed.patch
* mm-vmscan-move-dirty-pages-out-of-the-way-until-theyre-flushed-fix.patch
* mm-page_alloc-split-buffered_rmqueue.patch
* mm-page_alloc-split-buffered_rmqueue-fix.patch
* mm-page_alloc-split-alloc_pages_nodemask.patch
* mm-page_alloc-drain-per-cpu-pages-from-workqueue-context.patch
* mm-page_alloc-do-not-depend-on-cpu-hotplug-locks-inside-the-allocator.patch
* mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests.patch
* mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix.patch
* mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf.patch
* mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf-fix.patch
* mm-fix-comments-for-mmap_init.patch
* zram-remove-waitqueue-for-io-done.patch
* zswap-allow-initialization-at-boot-without-pool.patch
* zswap-clear-compressor-or-zpool-param-if-invalid-at-init.patch
* mm-page_alloc-remove-redundant-checks-from-alloc-fastpath.patch
* mm-page_alloc-dont-check-cpuset-allowed-twice-in-fast-path.patch
* mm-page_alloc-use-static-global-work_struct-for-draining-per-cpu-pages.patch
* zswap-dont-param_set_charp-while-holding-spinlock.patch
* mmfsdax-change-pmd_fault-to-huge_fault.patch
* mmfsdax-change-pmd_fault-to-huge_fault-fix.patch
* mmfsdax-change-pmd_fault-to-huge_fault-fix-2.patch
* mm-x86-add-support-for-pud-sized-transparent-hugepages.patch
* mm-x86-add-support-for-pud-sized-transparent-hugepages-fix.patch
* mm-x86-add-support-for-pud-sized-transparent-hugepages-fix-fix.patch
* dax-support-for-transparent-pud-pages-for-device-dax.patch
* mm-replace-fault_flag_size-with-parameter-to-huge_fault.patch
* mm-fix-get_user_pages-vs-device-dax-pud-mappings.patch
* z3fold-make-pages_nr-atomic.patch
* z3fold-fix-header-size-related-issues.patch
* z3fold-extend-compaction-function.patch
* z3fold-use-per-page-spinlock.patch
* z3fold-add-kref-refcounting.patch
* z3fold-add-kref-refcounting-checkpatch-fixes.patch
* mm-migration-make-isolate_movable_page-return-int-type.patch
* mm-migration-make-isolate_movable_page-return-int-type-v6.patch
* mm-migration-make-isolate_movable_page-always-defined.patch
* hwpoison-soft-offlining-for-non-lru-movable-page.patch
* mm-hotplug-enable-memory-hotplug-for-non-lru-movable-pages.patch
* uprobes-split-thps-before-trying-replace-them.patch
* mm-introduce-page_vma_mapped_walk.patch
* mm-fix-handling-pte-mapped-thps-in-page_referenced.patch
* mm-fix-handling-pte-mapped-thps-in-page_idle_clear_pte_refs.patch
* mm-rmap-check-all-vmas-that-pte-mapped-thp-can-be-part-of.patch
* mm-convert-page_mkclean_one-to-use-page_vma_mapped_walk.patch
* mm-convert-try_to_unmap_one-to-use-page_vma_mapped_walk.patch
* mm-ksm-convert-write_protect_page-to-use-page_vma_mapped_walk.patch
* mm-uprobes-convert-__replace_page-to-use-page_vma_mapped_walk.patch
* mm-convert-page_mapped_in_vma-to-use-page_vma_mapped_walk.patch
* mm-drop-page_check_address_transhuge.patch
* mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk.patch
* mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch
* mm-call-vm_munmap-in-munmap-syscall-instead-of-using-open-coded-version.patch
* userfaultfd-non-cooperative-add-event-for-memory-unmaps.patch
* userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix.patch
* userfaultfd-non-cooperative-add-event-for-memory-unmaps-fix-2.patch
* userfaultfd-non-cooperative-add-event-for-exit-notification.patch
* userfaultfd-non-cooperative-add-event-for-exit-notification-fix.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found-fix.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found-fix-2.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found-fix-2-fix.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found-fix-2-fix-fix.patch
* userfaultfd_copy-return-enospc-in-case-mm-has-gone.patch
* mm-alloc_contig_range-allow-to-specify-gfp-mask.patch
* mm-cma_alloc-allow-to-specify-gfp-mask.patch
* mm-wire-up-gfp-flag-passing-in-dma_alloc_from_contiguous.patch
* mm-madvise-fail-with-enomem-when-splitting-vma-will-hit-max_map_count.patch
* mm-cma-print-allocation-failure-reason-and-bitmap-status.patch
* vmalloc-back-of-when-the-current-is-killed.patch
* mm-page_alloc-remove-duplicate-page_exth.patch
* mm-fix-sparse-use-plain-integer-as-null-pointer.patch
* mm-fix-checkpatch-warnings-whitespace.patch
* drm-remove-unnecessary-fault-wrappers.patch
* mm-vmscan-clear-pgdat_writeback-when-zone-is-balanced.patch
* shm-fix-unlikely-test-of-info-seals-to-test-only-for-write-and-grow.patch
* mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes.patch
* mm-autonuma-dont-use-set_pte_at-when-updating-protnone-ptes-fix.patch
* mm-autonuma-let-architecture-override-how-the-write-bit-should-be-stashed-in-a-protnone-pte.patch
* powerpc-mm-autonuma-switch-ppc64-to-its-own-implementeation-of-saved-write.patch
* mm-place-not-inside-of-unlikely-statement-in-wb_domain_writeout_inc.patch
* mm-page_alloc-return-0-in-case-this-node-has-no-page-within-the-zone.patch
* zram-extend-zero-pages-to-same-element-pages.patch
* zram-extend-zero-pages-to-same-element-pages-fix.patch
* mm-fix-a-overflow-in-test_pages_in_a_zone.patch
* mm-fix-a-overflow-in-test_pages_in_a_zone-fix.patch
* mm-page_alloc-fix-nodes-for-reclaim-in-fast-path.patch
* mm-remove-shmem_mapping-shmem_zero_setup-duplicates.patch
* mm-vmpressure-fix-sending-wrong-events-on-underflow.patch
* mm-vmscan-do-not-pass-reclaimed-slab-to-vmpressure.patch
* mm-zsmalloc-remove-redundant-setpageprivate2-in-create_page_chain.patch
* mm-page_alloc-remove-redundant-init-code-for-zone_movable.patch
* mm-zsmalloc-fix-comment-in-zsmalloc.patch
* mm-cleanups-for-printing-phys_addr_t-and-dma_addr_t.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-drain-quarantine-of-memcg-slab-objects.patch
* kasan-add-memcg-kmem_cache-test.patch
* frv-pci-frv-fix-build-warning.patch
* alpha-use-generic-currenth.patch
* proc-use-rb_entry.patch
* proc-less-code-duplication-in-proc-cmdline.patch
* procfs-use-an-enum-for-possible-hidepid-values.patch
* uapi-mqueueh-add-missing-linux-typesh-include.patch
* iopoll-include-linux-ktimeh-instead-of-linux-hrtimerh.patch
* compiler-gcch-added-a-new-macro-to-wrap-gcc-attribute.patch
* m68k-replaced-gcc-specific-macros-with-ones-from-compilerh.patch
* bug-switch-data-corruption-check-to-__must_check.patch
* mm-balloon-umount-balloon_mnt-when-remove-vb-device.patch
* notifier-simplify-expression.patch
* kernel-ksysfs-add-__ro_after_init-to-bin_attribute-structure.patch
* lib-add-module-support-to-crc32-tests.patch
* lib-add-module-support-to-glob-tests.patch
* lib-add-module-support-to-atomic64-tests.patch
* find_bit-micro-optimise-find_next__bit.patch
* find_bit-micro-optimise-find_next__bit-v2.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
* rbtree-use-designated-initializers.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort-fix.patch
* lib-test_sort-make-it-explicitly-non-modular.patch
* lib-update-lz4-compressor-module.patch
* lib-update-lz4-compressor-module-fix.patch
* lib-update-lz4-compressor-module-fix-fix.patch
* lib-update-lz4-compressor-module-fix-fix-fix.patch
* lib-update-lz4-compressor-module-fix-fix-fix-fix.patch
* lib-update-lz4-compressor-module-v8.patch
* lib-decompress_unlz4-change-module-to-work-with-new-lz4-module-version.patch
* crypto-change-lz4-modules-to-work-with-new-lz4-module-version.patch
* fs-pstore-fs-squashfs-change-usage-of-lz4-to-work-with-new-lz4-version.patch
* lib-lz4-remove-back-compat-wrappers.patch
* checkpatch-warn-on-embedded-function-names.patch
* checkpatch-warn-on-logging-continuations.patch
* checkpatch-update-logfunctions.patch
* checkpatch-add-another-old-address-for-the-fsf.patch
* checkpatch-notice-unbalanced-else-braces-in-a-patch.patch
* kprobes-move-kprobe-declarations-to-asm-generic-kprobesh.patch
* kprobes-move-kprobe-declarations-to-asm-generic-kprobesh-fix.patch
* kprobes-move-kprobe-declarations-to-asm-generic-kprobesh-fix-2.patch
* autofs-remove-wrong-comment.patch
* autofs-fix-typo-in-documentation.patch
* autofs-fix-wrong-ioctl-documentation-regarding-devid.patch
* autofs-update-ioctl-documentation-regarding-struct-autofs_dev_ioctl.patch
* autofs-add-command-enum-macros-for-root-dir-ioctls.patch
* autofs-remove-duplicated-autofs_dev_ioctl_size-definition.patch
* autofs-take-more-care-to-not-update-last_used-on-path-walk.patch
* hfs-fix-fix-hfs_readdir.patch
* hfs-atomically-read-inode-size.patch
* hfsplus-atomically-read-inode-size.patch
* fs-reiserfs-atomically-read-inode-size.patch
* sigaltstack-support-ss_autodisarm-for-config_compat.patch
* tests-improve-output-of-sigaltstack-testcase.patch
* proc-kcore-update-physical-address-for-kcore-ram-and-text.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-use-get_user_pages_unlocked.patch
* pid-use-for_each_thread-in-do_each_pid_thread.patch
* fseventpoll-dont-test-for-bitfield-with-stack-value.patch
* fs-affs-remove-reference-to-affs_parent_ino.patch
* fs-affs-add-validation-block-function.patch
* fs-affs-make-affs-exportable.patch
* fs-affs-use-octal-for-permissions.patch
* fs-affs-add-prefix-to-some-functions.patch
* fs-affs-nameic-forward-declarations-clean-up.patch
* fs-affs-make-export-work-with-cold-dcache.patch
* fs-affs-make-export-work-with-cold-dcache-fix.patch
* config-android-recommended-disable-aio-support.patch
* config-android-base-enable-hardened-usercopy-and-kernel-aslr.patch
* fonts-keep-non-sparc-fonts-listed-together.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* initramfs-finish-fput-before-accessing-any-binary-from-initramfs.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
* ipc-mqueue-add-missing-sparse-annotation.patch
* ipc-shm-fix-shmat-mmap-nil-page-protection.patch
* scatterlist-reorder-compound-boolean-expression.patch
* scatterlist-do-not-disable-irqs-in-sg_copy_buffer.patch
linux-next.patch
linux-next-rejects.patch
* fs-add-i_blocksize.patch
* fs-add-i_blocksize-fix.patch
* nilfs2-use-nilfs_btree_node_size.patch
* nilfs2-use-i_blocksize.patch
* scripts-spellingtxt-add-swith-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-swithc-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-user-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-union-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-one-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-partiton-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-aligment-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-algined-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-efective-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-varible-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-embeded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-againt-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-neded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-unneded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialization-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-initialiazation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialised-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-comsumer-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disbled-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overide-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overrided-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-configuartion-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-applys-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-explictely-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-omited-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disassocation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-deintialized-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwritting-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwriten-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-therfore-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-followings-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-some-typo-words.patch
* lib-vsprintfc-remove-%z-support.patch
* checkpatchpl-warn-against-using-%z.patch
* checkpatchpl-warn-against-using-%z-fix.patch
* mm-add-new-mmgrab-helper.patch
* mm-add-new-mmget-helper.patch
* mm-use-mmget_not_zero-helper.patch
* mm-clarify-mm_structmm_userscount-documentation.patch
* mm-add-arch-independent-testcases-for-rodata.patch
* mm-add-arch-independent-testcases-for-rodata-fix.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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: next-20170217 build: 2 failures 7 warnings (next-20170217)
From: Mark Brown @ 2017-02-17 11:21 UTC (permalink / raw)
To: Ingo Molnar
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1ceeuE-0004r2-HY@optimist>
[-- Attachment #1: Type: text/plain, Size: 979 bytes --]
On Fri, Feb 17, 2017 at 09:32:46AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build at least arm and arm64 allmodconfig due to:
> arm64-allmodconfig
> ../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
> ../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
>
> arm-allmodconfig
> ../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
> ../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
due to 004172bdad64432 (sched/core: Remove unnecessary #include
headers). asm/paravirt.h was one of the removed headers, it must be
included implicitly on x86 but clearly isn't on at least the two ARM
architectures and definitions from it are used directly. I've sent a
patch.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* next-20170217 build: 2 failures 7 warnings (next-20170217)
From: Build bot for Mark Brown @ 2017-02-17 9:32 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170217
Git describe: next-20170217
Commit: 4ce4a759a3 Add linux-next specific files for 20170217
Build Time: 99 min 16 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 7
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
arm-allmodconfig
../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
7 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
2 ../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
Warnings Summary: 7
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 2 errors, 0 warnings, 0 section mismatches
Errors:
../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 7 warnings, 0 section mismatches
Errors:
../kernel/sched/core.c:198:25: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function)
../kernel/sched/core.c:199:11: error: implicit declaration of function 'paravirt_steal_clock' [-Werror=implicit-function-declaration]
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* linux-next: Tree for Feb 17
From: Stephen Rothwell @ 2017-02-17 5:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170216:
The powerpc tree gained a conflict against Linus' tree.
The tip tree gained conflicts against the drm, kspp, openrisc and
powerpc trees.
The akpm-current tree gained conflicts against the kspp and tip trees.
I dropped 3 patches from the akpm tree that turned up elsewhere.
Non-merge commits (relative to Linus' tree): 9514
10319 files changed, 435470 insertions(+), 200187 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 254 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (558e8e27e73f Revert "nohz: Fix collision between tick and other hrtimers")
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (3f91a89d424a powerpc/64: Disable use of radix under a hypervisor)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (4695daefba8d Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.)
Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (0c8ef291d976 Merge branch 'rhashtable-allocation-failure-during-insertion')
Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver)
Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging input-current/for-linus (722c5ac708b4 Input: elan_i2c - add ELAN0605 to the ACPI table)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9c85ee67164 [media] siano: make it work again with CONFIG_VMAP_STACK)
Merging drm-intel-fixes/for-linux-next-fixes (7089db84e356 Linux 4.10-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (bb08c04dc867 drm/dp/mst: fix kernel oops when turning off secondary monitor)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (0d6cc838f520 Merge branches 'fixes', 'kuser', 'misc' and 'sa1100-base' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (519275df7864 Merge branch 'next/late' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (2452b94d227c Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (e8ba6e4b2558 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (44741fc83094 Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR)
Merging clk/clk-next (6ff8ec98e12f clk: qcom: Do not drop device node twice)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (dd5b674a1b96 Merge branch 'mips-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (f84775c2d5d9 powerpc/pseries: Fix build break when MEMORY_HOTREMOVE=n)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/asm-offsets.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (57d7f939e7bd s390: add no-execute support)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (b14c8e6afd87 fscrypt: properly declare on-stack completion)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (816d15aff46f Merge branch 'for-next-current-v4.10-20170216' into for-next-20170216)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge)
Merging ext4/dev (17fcb47c6eda ext4: fix fencepost in s_first_meta_bg validation)
Merging f2fs/dev (aacf533a90a7 f2fs: super: constify fscrypt_operations structure)
CONFLICT (content): Merge conflict in fs/f2fs/super.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (84588a93d097 fuse: fix uninitialized flags in pipe_buffer)
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging nfsd/nfsd-next (d6fc8821c2d2 SUNRPC/Cache: Always treat the invalid cache as unexpired)
Merging orangefs/for-next (eb68d0324dc4 orangefs: fix buffer size mis-match between kernel space and user space.)
Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (566e4f015305 xfs: don't reserve blocks for right shift transactions)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (bfe219d373ca vfs: wrap write f_ops with file_{start,end}_write())
Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
Merging pci/next (0cfe009e2b72 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files)
Merging hid/for-next (aaffe2b03d64 Merge branch 'for-4.11/intel-ish' into for-next)
Merging i2c/i2c/for-next (ef886d769611 Merge branch 'i2c/for-current' 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 (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (2f1736ff0664 hwmon: (sht15) Add device tree support)
Merging jc_docs/docs-next (62924fd789c6 Add a target to check broken external links in the Documentation)
Merging v4l-dvb/master (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (0704916a4b24 video: fbdev: fsl-diu-fb: remove impossible condition)
Merging pm/linux-next (4e628fac3887 Merge branches 'pm-domains', 'pm-qos', 'pm-core' and 'pm-tools' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (761bb99d2d44 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc' and 'ida-conversion' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (f3caf8618bce cxgb4: Remove redundant code in t4_uld_clean_up())
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (7785bba299a8 esp: Add a software GRO codepath)
CONFLICT (content): Merge conflict in net/xfrm/xfrm_policy.c
Merging netfilter-next/master (8f9000a565d0 net:ethernet:aquantia: Add 2500/5000 mbit link modes support.)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (b065d3f59ff1 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (27d1c469a5d3 Bluetooth: fix spelling mistake: "advetising" -> "advertising")
Merging mac80211-next/master (272019c74d8c wireless: Set NL80211_EXT_FEATURE_CQM_RSSI_LIST in multiple drivers)
Merging rdma/for-next (592e8b3226a2 RDMA/bnxt_re: Add bnxt_re driver build support)
Applying: RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (dcd36c436c9c crypto: brcm - Avoid double free in ahash_finup())
Merging drm/drm-next (13f62f54d174 Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (998d75730b40 drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (2220fc1ab363 uapi: add missing install of dma-buf.h)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging kspp/for-next/kspp (5fe5cb271594 usercopy: Add tests for all get_user() sizes)
CONFLICT (content): Merge conflict in include/asm-generic/asm-prototypes.h
CONFLICT (content): Merge conflict in arch/s390/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/configs/aspeed_g5_defconfig
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (b1ef30e5ed17 ALSA: x86: Don't bail out from PCM ops when disconnected)
Merging sound-asoc/for-next (51d0a223278a Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (91168dd66096 module: fix memory leak on early load_module() failures)
Merging input/next (b0c9d043d4ae Merge tag 'ib-mfd-input-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next)
CONFLICT (content): Merge conflict in drivers/input/rmi4/Kconfig
Merging block/for-next (3fdb235081c4 Merge branch 'for-4.11/block' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (cb9df511100d dm: flush queued bios when process blocks to avoid deadlock)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (8c7cdbf9272c mmc: core: add mmc prefix for blk_fixups)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (eae8263fb1f4 md/raid5: Don't reinvent the wheel but use existing llist API)
Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH)
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (877fe823a0ad Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (52176603795c KEYS: Use memzero_explicit() for secret data)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (1ea0ce40690d selinux: allow changing labels for cgroupfs)
Merging tpmdd/next (51b0be640cf6 tpm: Fix expected number of response bytes of TPM1.2 PCR Extend)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (0ca582fd0463 vfio: Replace module request with softdep)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (bd0096d7467f of: Add missing space at end of pr_fmt().)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (0c4e5789749c Merge remote-tracking branch 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (1098ea741fc4 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in include/linux/kref.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig.debug
CONFLICT (content): Merge conflict in arch/powerpc/kernel/asm-offsets.c
CONFLICT (content): Merge conflict in arch/openrisc/include/asm/Kbuild
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (75bf2f6478ca EDAC, mce_amd: Print IPID and Syndrome on a separate line)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (3962d9226404 Merge branch 'for-next/ftrace/core' into temp)
Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD)
Merging kvm/linux-next (b95234c84004 kvm: x86: do not use KVM_REQ_EVENT for APICv interrupt injection)
Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (5982f0849e08 KVM: PPC: Book 3S: Fix error return in kvm_vm_ioctl_create_spapr_tce())
Merging kvms390/next (260a1d6afe2e KVM: s390: log runtime instrumentation enablement)
Merging xen-tip/linux-next (4610d240d691 xen/privcmd: add IOCTL_PRIVCMD_RESTRICT)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (b193d56a3561 platform/x86: intel_mid_powerbtn: Use SCU IPC directly)
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 (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (db3b7e134185 char: ipmi: constify ipmi_smi_handlers structures)
Merging driver-core/driver-core-next (17627157cda1 kernfs: handle null pointers while printing node name and path)
CONFLICT (content): Merge conflict in include/linux/kref.h
Merging usb/usb-next (0df8a3dbacb5 Merge tag 'usb-serial-4.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (beabdc3cd3e3 USB: serial: keyspan: drop header file)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (d8a4995bcea1 tty: pl011: Work around QDF2400 E44 stuck BUSY bit)
Merging char-misc/char-misc-next (6cf18e6927c0 goldfish: Sanitize the broken interrupt handler)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (3573d97d840c extcon: palmas: Don't miss GPIO events during suspend/resume)
Merging staging/staging-next (0a441275018b Staging: vc04_services: Fix the "space prohibited" code style errors)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging slave-dma/next (298115af3450 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (ebb0de3d1240 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (d1da522fb8a7 scsi: megaraid_sas: handle dma_addr_t right on 32-bit)
Merging target-updates/for-next (b2c9652eba6c target: Remove command flag CMD_T_DEV_ACTIVE)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (d022785b1acc qla2xxx: Fix a warning reported by the "smatch" static checker)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (96e3485759b7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (9202ba2397d1 gpio: mockup: implement event injecting over debugfs)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Applying: serial: st-asc: Use new GPIOD API to obtain RTS pin
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (fea6d2a610c8 vfs: Use upper filesystem inode in bprm_fill_uid())
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (68bd42d97c30 selftests/powerpc: Fix remaining fallout from recent changes)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (bfbe02e3e1ba coresight: etm3x: Correctly output counter values in sysfs node)
Merging rtc/rtc-next (b180cf8b0bce rtc: m48t86: add NVRAM support)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (90858794c960 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (768dd325a382 radix tree test suite: Run iteration tests for longer)
Merging akpm-current/current (1224d22e9f1c scatterlist: do not disable IRQs in sg_copy_buffer)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in include/linux/kprobes.h
CONFLICT (content): Merge conflict in include/linux/iomap.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/iomap.c
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
CONFLICT (content): Merge conflict in arch/x86/Kconfig.debug
CONFLICT (content): Merge conflict in arch/score/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
Applying: powerpc/kprobes: fixup for kprobes declarations moving
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (171cef6d6ec6 mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the kspp tree
From: Stephen Rothwell @ 2017-02-17 4:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Jinbum Park, Laura Abbott
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
between commits:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common")
3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")
from the kspp tree and commit:
ae4aea38de49 ("mm: add arch-independent testcases for RODATA")
from the akpm-current 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/Kconfig.debug
index c4cba00dbdee,3fa469c82707..000000000000
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
diff --cc arch/x86/kernel/Makefile
index bdcdb3b3a219,f6caf829085a..000000000000
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -100,7 -100,7 +100,6 @@@ obj-$(CONFIG_HPET_TIMER) += hpet.
obj-$(CONFIG_APB_TIMER) += apb_timer.o
obj-$(CONFIG_AMD_NB) += amd_nb.o
- obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o
-obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.o
obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o
obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the tip tree
From: Stephen Rothwell @ 2017-02-17 4:40 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Frederic Weisbecker, Davidlohr Bueso
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
arch/cris/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/parisc/include/asm/Kbuild
arch/score/include/asm/Kbuild
between commit:
b672592f0221 ("sched/cputime: Remove generic asm headers")
from the tip tree and commits:
ccbd143eeee3 ("cris: use generic current.h")
103c58f13b54 ("m32r: use generic current.h")
35a25dde31aa ("score: remove asm/current.h")
c6b552bc22c7 ("parisc: use generic current.h")
from the akpm-current 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/cris/include/asm/Kbuild
index 9f19e19bff9d,5e320f660c3c..000000000000
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@@ -4,6 -4,8 +4,7 @@@ generic-y += barrier.
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cmpxchg.h
-generic-y += cputime.h
+ generic-y += current.h
generic-y += device.h
generic-y += div64.h
generic-y += errno.h
diff --cc arch/m32r/include/asm/Kbuild
index 652100b64a71,30ee92ff0244..000000000000
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@@ -1,5 -1,7 +1,6 @@@
generic-y += clkdev.h
-generic-y += cputime.h
+ generic-y += current.h
generic-y += exec.h
generic-y += irq_work.h
generic-y += kvm_para.h
diff --cc arch/parisc/include/asm/Kbuild
index 4e179d770d69,7ac070267672..000000000000
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@@ -2,6 -2,8 +2,7 @@@
generic-y += auxvec.h
generic-y += barrier.h
generic-y += clkdev.h
-generic-y += cputime.h
+ generic-y += current.h
generic-y += device.h
generic-y += div64.h
generic-y += emergency-restart.h
diff --cc arch/score/include/asm/Kbuild
index 51970bb6c4fe,620970f837bc..000000000000
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@@ -4,6 -4,8 +4,7 @@@ header-y +
generic-y += barrier.h
generic-y += clkdev.h
-generic-y += cputime.h
+ generic-y += current.h
generic-y += irq_work.h
generic-y += mcs_spinlock.h
generic-y += mm-arch-hooks.h
^ permalink raw reply
* linux-next: manual merge of the tip tree with the drm tree
From: Stephen Rothwell @ 2017-02-17 1:56 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Dave Airlie
Cc: linux-next, linux-kernel, Jason A. Donenfeld, Daniel Vetter
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/kref.h
between commit:
56e3d1cd05cc ("kref: prefer atomic_inc_not_zero to atomic_add_unless")
from the drm tree and commit:
10383aea2f44 ("kref: Implement 'struct kref' using refcount_t")
from the tip tree.
I fixed it up (I just used the tip tree version of kref_get_unless_zero())
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 tip tree with the kspp tree
From: Stephen Rothwell @ 2017-02-17 1:51 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Kees Cook
Cc: linux-next, linux-kernel, Laura Abbott
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Kconfig.debug
between commit:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common")
from the kspp tree and commit:
3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")
from the tip 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/Kconfig.debug
index 69cdd0b2176b,783099f2ac72..000000000000
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@@ -109,14 -109,17 +109,6 @@@ config DEBUG_W
If in doubt, say "Y".
- config DEBUG_NX_TEST
- tristate "Testcase for the NX non-executable stack feature"
- depends on DEBUG_KERNEL && m
-config DEBUG_SET_MODULE_RONX
- bool "Set loadable kernel module data as NX and text as RO"
- depends on MODULES
-- ---help---
- This option enables a testcase for the CPU NX capability
- and the software setup of this feature.
- If in doubt, say "N"
- This option helps catch unintended modifications to loadable
- kernel module's text and read-only data. It also prevents execution
- of module data. Such protection may interfere with run-time code
- patching and dynamic kernel tracing - and they might also protect
- against certain classes of kernel exploits.
- If in doubt, say "N".
--
config DOUBLEFAULT
default y
bool "Enable doublefault exception handler" if EXPERT
^ permalink raw reply
* linux-next: manual merge of the tip tree with the powerpc tree
From: Stephen Rothwell @ 2017-02-17 1:48 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Michael Ellerman, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Rashmica Gupta, Frederic Weisbecker
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/powerpc/kernel/asm-offsets.c
between commit:
454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c")
from the powerpc tree and commit:
8c8b73c4811f ("sched/cputime, powerpc: Prepare accounting structure for cputime flush on tick")
from the tip 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/powerpc/kernel/asm-offsets.c
index d918338b54b0,9e8e771f8acb..000000000000
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -208,48 -213,58 +208,48 @@@ int main(void
#endif /* CONFIG_PPC_BOOK3E */
#ifdef CONFIG_PPC_STD_MMU_64
- DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
- DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
- DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
+ OFFSET(PACASLBCACHE, paca_struct, slb_cache);
+ OFFSET(PACASLBCACHEPTR, paca_struct, slb_cache_ptr);
+ OFFSET(PACAVMALLOCSLLP, paca_struct, vmalloc_sllp);
#ifdef CONFIG_PPC_MM_SLICES
- DEFINE(MMUPSIZESLLP, offsetof(struct mmu_psize_def, sllp));
+ OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp);
#else
- DEFINE(PACACONTEXTSLLP, offsetof(struct paca_struct, mm_ctx_sllp));
+ OFFSET(PACACONTEXTSLLP, paca_struct, mm_ctx_sllp);
#endif /* CONFIG_PPC_MM_SLICES */
- DEFINE(PACA_EXGEN, offsetof(struct paca_struct, exgen));
- DEFINE(PACA_EXMC, offsetof(struct paca_struct, exmc));
- DEFINE(PACA_EXSLB, offsetof(struct paca_struct, exslb));
- DEFINE(PACALPPACAPTR, offsetof(struct paca_struct, lppaca_ptr));
- DEFINE(PACA_SLBSHADOWPTR, offsetof(struct paca_struct, slb_shadow_ptr));
- DEFINE(SLBSHADOW_STACKVSID,
- offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid));
- DEFINE(SLBSHADOW_STACKESID,
- offsetof(struct slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid));
- DEFINE(SLBSHADOW_SAVEAREA, offsetof(struct slb_shadow, save_area));
- DEFINE(LPPACA_PMCINUSE, offsetof(struct lppaca, pmcregs_in_use));
- DEFINE(LPPACA_DTLIDX, offsetof(struct lppaca, dtl_idx));
- DEFINE(LPPACA_YIELDCOUNT, offsetof(struct lppaca, yield_count));
- DEFINE(PACA_DTL_RIDX, offsetof(struct paca_struct, dtl_ridx));
+ OFFSET(PACA_EXGEN, paca_struct, exgen);
+ OFFSET(PACA_EXMC, paca_struct, exmc);
+ OFFSET(PACA_EXSLB, paca_struct, exslb);
+ OFFSET(PACALPPACAPTR, paca_struct, lppaca_ptr);
+ OFFSET(PACA_SLBSHADOWPTR, paca_struct, slb_shadow_ptr);
+ OFFSET(SLBSHADOW_STACKVSID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].vsid);
+ OFFSET(SLBSHADOW_STACKESID, slb_shadow, save_area[SLB_NUM_BOLTED - 1].esid);
+ OFFSET(SLBSHADOW_SAVEAREA, slb_shadow, save_area);
+ OFFSET(LPPACA_PMCINUSE, lppaca, pmcregs_in_use);
+ OFFSET(LPPACA_DTLIDX, lppaca, dtl_idx);
+ OFFSET(LPPACA_YIELDCOUNT, lppaca, yield_count);
+ OFFSET(PACA_DTL_RIDX, paca_struct, dtl_ridx);
#endif /* CONFIG_PPC_STD_MMU_64 */
- DEFINE(PACAEMERGSP, offsetof(struct paca_struct, emergency_sp));
+ OFFSET(PACAEMERGSP, paca_struct, emergency_sp);
#ifdef CONFIG_PPC_BOOK3S_64
- DEFINE(PACAMCEMERGSP, offsetof(struct paca_struct, mc_emergency_sp));
- DEFINE(PACA_IN_MCE, offsetof(struct paca_struct, in_mce));
-#endif
- DEFINE(PACAHWCPUID, offsetof(struct paca_struct, hw_cpu_id));
- DEFINE(PACAKEXECSTATE, offsetof(struct paca_struct, kexec_state));
- DEFINE(PACA_DSCR_DEFAULT, offsetof(struct paca_struct, dscr_default));
- DEFINE(ACCOUNT_STARTTIME,
- offsetof(struct paca_struct, accounting.starttime));
- DEFINE(ACCOUNT_STARTTIME_USER,
- offsetof(struct paca_struct, accounting.starttime_user));
- DEFINE(ACCOUNT_USER_TIME,
- offsetof(struct paca_struct, accounting.utime));
- DEFINE(ACCOUNT_SYSTEM_TIME,
- offsetof(struct paca_struct, accounting.stime));
- DEFINE(PACA_TRAP_SAVE, offsetof(struct paca_struct, trap_save));
- DEFINE(PACA_NAPSTATELOST, offsetof(struct paca_struct, nap_state_lost));
- DEFINE(PACA_SPRG_VDSO, offsetof(struct paca_struct, sprg_vdso));
+ OFFSET(PACAMCEMERGSP, paca_struct, mc_emergency_sp);
+ OFFSET(PACA_IN_MCE, paca_struct, in_mce);
+#endif
+ OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id);
+ OFFSET(PACAKEXECSTATE, paca_struct, kexec_state);
+ OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default);
+ OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime);
+ OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user);
- OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.user_time);
- OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.system_time);
++ OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime);
++ OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime);
+ OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save);
+ OFFSET(PACA_NAPSTATELOST, paca_struct, nap_state_lost);
+ OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso);
#else /* CONFIG_PPC64 */
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
- DEFINE(ACCOUNT_STARTTIME,
- offsetof(struct thread_info, accounting.starttime));
- DEFINE(ACCOUNT_STARTTIME_USER,
- offsetof(struct thread_info, accounting.starttime_user));
- DEFINE(ACCOUNT_USER_TIME,
- offsetof(struct thread_info, accounting.utime));
- DEFINE(ACCOUNT_SYSTEM_TIME,
- offsetof(struct thread_info, accounting.stime));
+ OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime);
+ OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user);
- OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.user_time);
- OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.system_time);
++ OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime);
++ OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime);
#endif
#endif /* CONFIG_PPC64 */
^ permalink raw reply
* linux-next: manual merge of the tip tree with the openrisc tree
From: Stephen Rothwell @ 2017-02-17 1:43 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Stafford Horne
Cc: linux-next, linux-kernel, Frederic Weisbecker,
Stefan Kristiansson
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/openrisc/include/asm/Kbuild
between commit:
157e82f58007 ("openrisc: add cmpxchg and xchg implementations")
from the openrisc tree and commit:
b672592f0221 ("sched/cputime: Remove generic asm headers")
from the tip 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/openrisc/include/asm/Kbuild
index a669c141436e,ef8d1ccc3e45..000000000000
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@@ -9,7 -10,8 +9,6 @@@ generic-y += bugs.
generic-y += cacheflush.h
generic-y += checksum.h
generic-y += clkdev.h
- generic-y += cputime.h
-generic-y += cmpxchg-local.h
-generic-y += cmpxchg.h
generic-y += current.h
generic-y += device.h
generic-y += div64.h
^ permalink raw reply
* linux-next: manual merge of the powerpc tree with Linus' tree
From: Stephen Rothwell @ 2017-02-16 22:06 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Rashmica Gupta
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/kernel/asm-offsets.c
between commit:
f2574030b0e3 ("powerpc: Revert the initial stack protector support")
from Linus' tree and commit:
454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c")
from the powerpc 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/powerpc/kernel/asm-offsets.c
index 195a9fc8f81c,b6709021fee5..000000000000
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@@ -88,39 -91,42 +91,39 @@@ int main(void
#endif /* CONFIG_PPC64 */
#ifdef CONFIG_LIVEPATCH
- DEFINE(TI_livepatch_sp, offsetof(struct thread_info, livepatch_sp));
+ OFFSET(TI_livepatch_sp, thread_info, livepatch_sp);
#endif
- DEFINE(KSP, offsetof(struct thread_struct, ksp));
- DEFINE(PT_REGS, offsetof(struct thread_struct, regs));
-#ifdef CONFIG_CC_STACKPROTECTOR
- DEFINE(TSK_STACK_CANARY, offsetof(struct task_struct, stack_canary));
-#endif
+ OFFSET(KSP, thread_struct, ksp);
+ OFFSET(PT_REGS, thread_struct, regs);
#ifdef CONFIG_BOOKE
- DEFINE(THREAD_NORMSAVES, offsetof(struct thread_struct, normsave[0]));
+ OFFSET(THREAD_NORMSAVES, thread_struct, normsave[0]);
#endif
- DEFINE(THREAD_FPEXC_MODE, offsetof(struct thread_struct, fpexc_mode));
- DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fp_state));
- DEFINE(THREAD_FPSAVEAREA, offsetof(struct thread_struct, fp_save_area));
- DEFINE(FPSTATE_FPSCR, offsetof(struct thread_fp_state, fpscr));
- DEFINE(THREAD_LOAD_FP, offsetof(struct thread_struct, load_fp));
+ OFFSET(THREAD_FPEXC_MODE, thread_struct, fpexc_mode);
+ OFFSET(THREAD_FPSTATE, thread_struct, fp_state);
+ OFFSET(THREAD_FPSAVEAREA, thread_struct, fp_save_area);
+ OFFSET(FPSTATE_FPSCR, thread_fp_state, fpscr);
+ OFFSET(THREAD_LOAD_FP, thread_struct, load_fp);
#ifdef CONFIG_ALTIVEC
- DEFINE(THREAD_VRSTATE, offsetof(struct thread_struct, vr_state));
- DEFINE(THREAD_VRSAVEAREA, offsetof(struct thread_struct, vr_save_area));
- DEFINE(THREAD_VRSAVE, offsetof(struct thread_struct, vrsave));
- DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
- DEFINE(VRSTATE_VSCR, offsetof(struct thread_vr_state, vscr));
- DEFINE(THREAD_LOAD_VEC, offsetof(struct thread_struct, load_vec));
+ OFFSET(THREAD_VRSTATE, thread_struct, vr_state);
+ OFFSET(THREAD_VRSAVEAREA, thread_struct, vr_save_area);
+ OFFSET(THREAD_VRSAVE, thread_struct, vrsave);
+ OFFSET(THREAD_USED_VR, thread_struct, used_vr);
+ OFFSET(VRSTATE_VSCR, thread_vr_state, vscr);
+ OFFSET(THREAD_LOAD_VEC, thread_struct, load_vec);
#endif /* CONFIG_ALTIVEC */
#ifdef CONFIG_VSX
- DEFINE(THREAD_USED_VSR, offsetof(struct thread_struct, used_vsr));
+ OFFSET(THREAD_USED_VSR, thread_struct, used_vsr);
#endif /* CONFIG_VSX */
#ifdef CONFIG_PPC64
- DEFINE(KSP_VSID, offsetof(struct thread_struct, ksp_vsid));
+ OFFSET(KSP_VSID, thread_struct, ksp_vsid);
#else /* CONFIG_PPC64 */
- DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
+ OFFSET(PGDIR, thread_struct, pgdir);
#ifdef CONFIG_SPE
- DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
- DEFINE(THREAD_ACC, offsetof(struct thread_struct, acc));
- DEFINE(THREAD_SPEFSCR, offsetof(struct thread_struct, spefscr));
- DEFINE(THREAD_USED_SPE, offsetof(struct thread_struct, used_spe));
+ OFFSET(THREAD_EVR0, thread_struct, evr[0]);
+ OFFSET(THREAD_ACC, thread_struct, acc);
+ OFFSET(THREAD_SPEFSCR, thread_struct, spefscr);
+ OFFSET(THREAD_USED_SPE, thread_struct, used_spe);
#endif /* CONFIG_SPE */
#endif /* CONFIG_PPC64 */
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
^ permalink raw reply
* next-20170216 build: 0 failures 7 warnings (next-20170216)
From: Build bot for Mark Brown @ 2017-02-16 8:23 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170216
Git describe: next-20170216
Commit: 38161d2f17 Add linux-next specific files for 20170216
Build Time: 110 min 49 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
7 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/device.h:1472:20: warning: passing argument 1 of '__platform_driver_register' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/device.h:1477:15: warning: passing argument 1 of 'platform_driver_unregister' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* linux-next: Tree for Feb 16
From: Stephen Rothwell @ 2017-02-16 4:46 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170215:
The net tree lost its build failure.
The kselftest tree gained a conflict against the net-next tree.
Non-merge commits (relative to Linus' tree): 9166
10048 files changed, 415301 insertions(+), 189762 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 254 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (747ae0a96f1a Merge tag 'media/v4.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (f83e6862047e powerpc/powernv: Properly set "host-ipi" on IPIs)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (75224c93fa98 ibmvnic: Fix endian errors in error reporting output)
Merging ipsec/master (4c86d77743a5 xfrm: Don't use sk_family for socket policy lookups)
Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (0c8ef291d976 Merge branch 'rhashtable-allocation-failure-during-insertion')
Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver)
Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging input-current/for-linus (722c5ac708b4 Input: elan_i2c - add ELAN0605 to the ACPI table)
Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (f9c85ee67164 [media] siano: make it work again with CONFIG_VMAP_STACK)
Merging drm-intel-fixes/for-linux-next-fixes (7089db84e356 Linux 4.10-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (bb08c04dc867 drm/dp/mst: fix kernel oops when turning off secondary monitor)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (0d6cc838f520 Merge branches 'fixes', 'kuser', 'misc' and 'sa1100-base' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (3461b12aebf5 Merge branches 'next/arm64' and 'next/dt64' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (2452b94d227c Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (e8ba6e4b2558 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (44741fc83094 Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR)
Merging clk/clk-next (337072604224 clk: mvebu: Expand mv98dx3236-core-clock support)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (dd5b674a1b96 Merge branch 'mips-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (07d7c4560b7a openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (da0e7e627696 Merge branch 'topic/ppc-kvm' into next)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (57d7f939e7bd s390: add no-execute support)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (b14c8e6afd87 fscrypt: properly declare on-stack completion)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (f0ce4dcacb4e Merge branch 'for-next-next-v4.11-20170214' into for-next-20170214)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge)
Merging ext4/dev (17fcb47c6eda ext4: fix fencepost in s_first_meta_bg validation)
Merging f2fs/dev (aacf533a90a7 f2fs: super: constify fscrypt_operations structure)
CONFLICT (content): Merge conflict in fs/f2fs/super.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (6ba4d2722d06 fuse: fix use after free issue in fuse_dev_do_read())
Merging gfs2/for-next (c548a1c17560 gfs2: Make gfs2_write_full_page static)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging nfsd/nfsd-next (d6fc8821c2d2 SUNRPC/Cache: Always treat the invalid cache as unexpired)
Merging orangefs/for-next (eb68d0324dc4 orangefs: fix buffer size mis-match between kernel space and user space.)
Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (c15accad518c xfs: fix len comparison in xfs_extent_busy_trim)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (bfe219d373ca vfs: wrap write f_ops with file_{start,end}_write())
Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
Merging pci/next (0cfe009e2b72 Merge branch 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files)
Merging hid/for-next (aaffe2b03d64 Merge branch 'for-4.11/intel-ish' into for-next)
Merging i2c/i2c/for-next (ef886d769611 Merge branch 'i2c/for-current' 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 (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (87d08b11b161 devicetree: add lm90 thermal_zone sensor support)
Merging jc_docs/docs-next (62924fd789c6 Add a target to check broken external links in the Documentation)
Merging v4l-dvb/master (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (0704916a4b24 video: fbdev: fsl-diu-fb: remove impossible condition)
Merging pm/linux-next (98032088d80f Merge branches 'pm-domains', 'pm-qos' and 'pm-tools' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (761bb99d2d44 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc' and 'ida-conversion' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (b973154a2278 atm: idt77252, use setup_timer and mod_timer)
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (7785bba299a8 esp: Add a software GRO codepath)
CONFLICT (content): Merge conflict in net/xfrm/xfrm_policy.c
Merging netfilter-next/master (8f9000a565d0 net:ethernet:aquantia: Add 2500/5000 mbit link modes support.)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (b065d3f59ff1 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (272019c74d8c wireless: Set NL80211_EXT_FEATURE_CQM_RSSI_LIST in multiple drivers)
Merging rdma/for-next (592e8b3226a2 RDMA/bnxt_re: Add bnxt_re driver build support)
Applying: RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (dcd36c436c9c crypto: brcm - Avoid double free in ahash_finup())
Merging drm/drm-next (13f62f54d174 Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (0d148cc991e6 drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (1592364de391 drm: Resurrect atomic rmfb code, v3)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging kspp/for-next/kspp (b512bf439c35 usercopy: Add tests for all get_user() sizes)
CONFLICT (content): Merge conflict in include/asm-generic/asm-prototypes.h
CONFLICT (content): Merge conflict in arch/s390/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/configs/aspeed_g5_defconfig
CONFLICT (content): Merge conflict in arch/Kconfig
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (df56c3dbae0e ALSA: hda - add sanity check to force the separate stream tags)
Merging sound-asoc/for-next (2f3cd7c95623 Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (91168dd66096 module: fix memory leak on early load_module() failures)
Merging input/next (b0c9d043d4ae Merge tag 'ib-mfd-input-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next)
CONFLICT (content): Merge conflict in drivers/input/rmi4/Kconfig
Merging block/for-next (3fdb235081c4 Merge branch 'for-4.11/block' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Applying: scsi: mpt3sas: fix up for "block: fold cmd_type into the REQ_OP_ space"
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (f5b0cba8f239 dm crypt: replace RCU read-side section with rwsem)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (8c7cdbf9272c mmc: core: add mmc prefix for blk_fixups)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (d7a1030839d3 md: fast clone bio in bio_clone_mddev())
Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH)
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (ef246c9f7041 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (52176603795c KEYS: Use memzero_explicit() for secret data)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (1ea0ce40690d selinux: allow changing labels for cgroupfs)
Merging tpmdd/next (51b0be640cf6 tpm: Fix expected number of response bytes of TPM1.2 PCR Extend)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (0ca582fd0463 vfio: Replace module request with softdep)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (bd0096d7467f of: Add missing space at end of pr_fmt().)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (6a9f69e5b86d Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (e62d2ca9d05c EDAC, amd64: Bump driver version)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (3962d9226404 Merge branch 'for-next/ftrace/core' into temp)
Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD)
Merging kvm/linux-next (ee10689117c0 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (5982f0849e08 KVM: PPC: Book 3S: Fix error return in kvm_vm_ioctl_create_spapr_tce())
Merging kvms390/next (260a1d6afe2e KVM: s390: log runtime instrumentation enablement)
Merging xen-tip/linux-next (4610d240d691 xen/privcmd: add IOCTL_PRIVCMD_RESTRICT)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (b193d56a3561 platform/x86: intel_mid_powerbtn: Use SCU IPC directly)
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 (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (db3b7e134185 char: ipmi: constify ipmi_smi_handlers structures)
Merging driver-core/driver-core-next (17627157cda1 kernfs: handle null pointers while printing node name and path)
Merging usb/usb-next (53b7f7b53d83 usb: cdc-wdm: remove logically dead code)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (beabdc3cd3e3 USB: serial: keyspan: drop header file)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (2867af2dcf40 atmel_serial: Use the fractional divider when possible)
Merging char-misc/char-misc-next (6cf18e6927c0 goldfish: Sanitize the broken interrupt handler)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (3573d97d840c extcon: palmas: Don't miss GPIO events during suspend/resume)
Merging staging/staging-next (e3f75db14d4b staging: comedi: fixed multiple line dereference)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_parallel.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_parallel.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_parallel.c
Merging slave-dma/next (539f9c4de1b2 Merge branch 'for-linus' into next)
Merging cgroup/for-next (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (ebb0de3d1240 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (156f8759bb70 scsi: megaraid_sas: driver version upgrade)
Merging target-updates/for-next (b2c9652eba6c target: Remove command flag CMD_T_DEV_ACTIVE)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (3d88460dbd28 Merge tag 'drm-fixes-for-v4.10-rc8' of git://people.freedesktop.org/~airlied/linux)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (96e3485759b7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (9202ba2397d1 gpio: mockup: implement event injecting over debugfs)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Applying: serial: st-asc: Use new GPIOD API to obtain RTS pin
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (fea6d2a610c8 vfs: Use upper filesystem inode in bprm_fill_uid())
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (68bd42d97c30 selftests/powerpc: Fix remaining fallout from recent changes)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (bfbe02e3e1ba coresight: etm3x: Correctly output counter values in sysfs node)
Merging rtc/rtc-next (b180cf8b0bce rtc: m48t86: add NVRAM support)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (90858794c960 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (768dd325a382 radix tree test suite: Run iteration tests for longer)
Merging akpm-current/current (1224d22e9f1c scatterlist: do not disable IRQs in sg_copy_buffer)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in include/linux/kprobes.h
CONFLICT (content): Merge conflict in include/linux/iomap.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/iomap.c
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Applying: powerpc/kprobes: fixup for kprobes declarations moving
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Applying: debugobjects: track number of kmem_cache_alloc/kmem_cache_free done
Applying: debugobjects: scale thresholds with # of CPUs
Applying: debugobjects: reduce contention on the global pool_lock
Merging akpm/master (9f0551ddf74c debugobjects: reduce contention on the global pool_lock)
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Stephen Rothwell @ 2017-02-16 3:42 UTC (permalink / raw)
To: David Miller
Cc: ast, netdev, linux-next, linux-kernel, peterz, mingo, acme,
alexander.shishkin, joe, jolsa
In-Reply-To: <20170215.222746.1747689327951875592.davem@davemloft.net>
Hi Dave,
On Wed, 15 Feb 2017 22:27:46 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> I applied the fix that synced the two header files already.
Sorry about that, I missed it in checking your tree over breakfast :-)
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Alexei Starovoitov @ 2017-02-16 3:30 UTC (permalink / raw)
To: David Miller
Cc: sfr, netdev, linux-next, linux-kernel, peterz, mingo, acme,
alexander.shishkin, joe, jolsa
In-Reply-To: <20170215.222746.1747689327951875592.davem@davemloft.net>
On 2/15/17 7:27 PM, David Miller wrote:
> From: Alexei Starovoitov <ast@fb.com>
> Date: Wed, 15 Feb 2017 19:06:02 -0800
>
>> On 2/15/17 7:02 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> On Tue, 14 Feb 2017 09:12:50 +1100 Stephen Rothwell
>>> <sfr@canb.auug.org.au> wrote:
>>>>
>>>> After merging the net tree, today's linux-next build (powerpc64le
>>>> perf)
>>>> failed like this:
>>>>
>>>> Warning: tools/include/uapi/linux/bpf.h differs from kernel
>>>> bpf.c: In function 'bpf_prog_attach':
>>>> bpf.c:180:6: error: 'union bpf_attr' has no member named
>>>> 'attach_flags'; did you mean 'map_flags'?
>>>> attr.attach_flags = flags;
>>>> ^
>>>>
>>>> Caused by commit
>>>>
>>>> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>>>>
>>>
>>> So do we have a fix for this? I am sure that Dave would like to send
>>> his "net" tree to Linus sometime soonish ...
>>
>> Do you mind resending it to netdev with my Ack ?
>> please mention [PATCH net] in subj, so it's get caught by Dave's
>> scripts.
>
> I applied the fix that synced the two header files already.
Ahh. Thanks!
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: David Miller @ 2017-02-16 3:27 UTC (permalink / raw)
To: ast
Cc: sfr, netdev, linux-next, linux-kernel, peterz, mingo, acme,
alexander.shishkin, joe, jolsa
In-Reply-To: <58A5171A.8080604@fb.com>
From: Alexei Starovoitov <ast@fb.com>
Date: Wed, 15 Feb 2017 19:06:02 -0800
> On 2/15/17 7:02 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Tue, 14 Feb 2017 09:12:50 +1100 Stephen Rothwell
>> <sfr@canb.auug.org.au> wrote:
>>>
>>> After merging the net tree, today's linux-next build (powerpc64le
>>> perf)
>>> failed like this:
>>>
>>> Warning: tools/include/uapi/linux/bpf.h differs from kernel
>>> bpf.c: In function 'bpf_prog_attach':
>>> bpf.c:180:6: error: 'union bpf_attr' has no member named
>>> 'attach_flags'; did you mean 'map_flags'?
>>> attr.attach_flags = flags;
>>> ^
>>>
>>> Caused by commit
>>>
>>> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>>>
>>
>> So do we have a fix for this? I am sure that Dave would like to send
>> his "net" tree to Linus sometime soonish ...
>
> Do you mind resending it to netdev with my Ack ?
> please mention [PATCH net] in subj, so it's get caught by Dave's
> scripts.
I applied the fix that synced the two header files already.
^ permalink raw reply
* linux-next: manual merge of the kselftest tree with the net-next tree
From: Stephen Rothwell @ 2017-02-16 3:24 UTC (permalink / raw)
To: Shuah Khan, David Miller, Networking
Cc: linux-next, linux-kernel, bamvor.zhangjian@huawei.com,
Mickaël Salaün
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/bpf/Makefile
between commit:
d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update")
from the net-next tree and commit:
88baa78d1f31 ("selftests: remove duplicated all and clean target")
from the kselftest tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/bpf/Makefile
index c7816fe60feb,058351b0694f..000000000000
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -1,26 -1,7 +1,20 @@@
-CFLAGS += -Wall -O2 -I../../../../usr/include
+LIBDIR := ../../../lib
+BPFOBJ := $(LIBDIR)/bpf/bpf.o
-TEST_GEN_PROGS = test_verifier test_maps test_lru_map
+CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)
+
- test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
++TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map
- TEST_PROGS := $(test_objs) test_kmod.sh
- TEST_FILES := $(test_objs)
+ TEST_PROGS := test_kmod.sh
+.PHONY: all clean force
+
- all: $(test_objs)
-
+# force a rebuild of BPFOBJ when its dependencies are updated
+force:
+
+$(BPFOBJ): force
+ $(MAKE) -C $(dir $(BPFOBJ))
+
+$(test_objs): $(BPFOBJ)
+
include ../lib.mk
-
- clean:
- $(RM) $(test_objs)
^ 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