* Re: Kernel crash on startup - bisected to commit 3b24d854cb35
From: Eric Dumazet @ 2016-04-09 5:33 UTC (permalink / raw)
To: Larry Finger; +Cc: David S. Miller, linux-next, linux-netdev, LKML
In-Reply-To: <570892F9.9030700@lwfinger.net>
On Fri, Apr 8, 2016 at 10:28 PM, Larry Finger <Larry.Finger@lwfinger.net> wrote:
> Following a recent pull of the wireless-drivers-next repo. my system got a
> kernel panic on startup at native_apic_msr_write+0x27. The problem was
> bisected to commit 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
> under synflood"). I am confident of the bisection as a kernel built with the
> previous commit (3a5d1c0) boots OK.
>
> I have not yet captured the entire traceback for the crash, but I do have a
> crappy photo of the screen that I have attached. The RIP is at
> native_apic_msr_write+0x27. As this crash is likely configuration dependent,
> a copy of my .config is also attached. Note that IPv6 is turned off on my
> machine.
>
> Please let me know if any other info is needed.
Can you double check you have this fix ?
commit 8501786929de4616b10b8059ad97abd304a7dddf
Author: Eric Dumazet <edumazet@google.com>
Date: Wed Apr 6 22:07:34 2016 -0700
tcp/dccp: fix inet_reuseport_add_sock()
David Ahern reported panics in __inet_hash() caused by my recent commit.
The reason is inet_reuseport_add_sock() was still using
sk_nulls_for_each_rcu() instead of sk_for_each_rcu().
SO_REUSEPORT enabled listeners were causing an instant crash.
While chasing this bug, I found that I forgot to clear SOCK_RCU_FREE
flag, as it is inherited from the parent at clone time.
Fixes: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
under synflood")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: David Ahern <dsa@cumulusnetworks.com>
Tested-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply
* next-20160401+: ARM: DRA7: linux-next regression: mm/slab: clean-up kmem_cache_node setup
From: Nishanth Menon @ 2016-04-08 20:39 UTC (permalink / raw)
To: Joonsoo Kim, Andrew Morton, Tony Lindgren, Russell King
Cc: linux-omap, linux-arm-kernel@lists.infradead.org, lkml,
linux-next
Hi,
http://marc.info/?l=linux-omap&m=146014314115625&w=2 series works with
v4.6-rc2 kernel, however, it fails with linux-next for suspend-to-ram
(mem) on BeagleBoard-X15
next-20160327 - good
next-20160329 - good
next-20160330 - Fails to boot - I2C crashes
next-20160331- Fails to boot - USB crashes
next-20160401 -> bad
next-20160408 -> bad
Bisect log of next-20160408 vs v4.6-rc2 ->
http://pastebin.ubuntu.com/15697856/
# first bad commit: [2b629704a2b6a5b239f23750e5517a9d8c3a4e8c]
mm/slab: clean-up kmem_cache_node setup
Fail bootlog @ 2b629704a2b6a5b239f23750e5517a9d8c3a4e8c
http://pastebin.ubuntu.com/15698107/
Working bootlog @ 7a6bacb133752beacb76775797fd550417e9d3a2:
http://pastebin.ubuntu.com/15698220/
Crash Signature (from full log):
>
> rtcwake: wakeup from "mem" using /dev/rtc0 at Mon Jan 1 00:00:53 2001
> [ 51.631373] PM: Syncing filesystems ... done.
> [ 51.683927] Freezing user space processes ... (elapsed 0.003 seconds) done.
> [ 51.694960] Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done.
> [ 51.875457] PM: suspend of devices complete after 167.835 msecs
> [ 51.885396] PM: late suspend of devices complete after 3.714 msecs
> [ 51.896333] PM: noirq suspend of devices complete after 4.441 msecs
> [ 51.902972] Disabling non-boot CPUs ...
> [ 51.911312] CPU1: shutdown
> [ 51.950123] Powerdomain (l4per_pwrdm) didn't enter target state 1
> [ 51.950123] Powerdomain (l3init_pwrdm) didn't enter target state 1
> [ 51.950123] Could not enter target state in pm_suspend
> [ 51.950123] A possible cause could be an old bootloader - try u-boot >= v2012.07
> [ 51.950407] Enabling non-boot CPUs ...
> [ 52.005646] CPU1: smp_ops.cpu_die() returned, trying to resuscitate
> [ 52.006271] CPU1 is up
> [ 52.018194] PM: noirq resume of devices complete after 2.846 msecs
> [ 52.028303] PM: early resume of devices complete after 2.998 msecs
> [ 52.037132] net eth0: initializing cpsw version 1.15 (0)
> [ 52.042545] Unable to handle kernel paging request at virtual address ffffff81
> [ 52.042549] pgd = c0004000
> [ 52.042559] [ffffff81] *pgd=afffd861, *pte=00000000, *ppte=00000000
> [ 52.042566] Internal error: Oops: 837 [#1] SMP ARM
> [ 52.042642] Modules linked in: xhci_plat_hcd xhci_hcd usbcore encoder_tpd12s015 connector_hdmi omapfb cfbcopyarea
> cfbimgblt cfbfillrect dwc3 leds_gpio snd_soc_simple_card led_class evdev cpufreq_dt udc_core gpio_fan omapdss extcon_
> usb_gpio snd_soc_tlv320aic3x snd_soc_davinci_mcasp phy_omap_usb2 omap_wdt rtc_omap extcon_palmas snd_soc_omap snd_soc
> _edma ti_soc_thermal tmp102 snd_soc_core snd_pcm_dmaengine dwc3_omap rtc_palmas extcon snd_pcm snd_timer palmas_pwrbu
> tton thermal_sys snd at24 nvmem_core rtc_ds1307 hwmon soundcore
> [ 52.042649] CPU: 0 PID: 78 Comm: kworker/0:2 Not tainted 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 52.042651] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 52.042667] Workqueue: events cache_reap
> [ 52.042671] task: ee73b0c0 ti: ee73c000 task.ti: ee73c000
> [ 52.042676] PC is at free_block+0xf4/0x160
> [ 52.042680] LR is at 0xeddf51e0
> [ 52.042684] pc : [<c0276c44>] lr : [<eddf51e0>] psr: 20070093
> [ 52.042684] sp : ee73de18 ip : 00000002 fp : ee73de50
> [ 52.042687] r10: c1882280 r9 : 00000100 r8 : 00000200
> [ 52.042691] r7 : ffffff7f r6 : 00000005 r5 : 04f4a70a r4 : ee3dbd00
> [ 52.042694] r3 : ef46b674 r2 : ee484190 r1 : ee484014 r0 : ee26d980
> [ 52.042698] Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none
> [ 52.042701] Control: 10c5387d Table: acc8c06a DAC: 00000051
> [ 52.042705] Process kworker/0:2 (pid: 78, stack limit = 0xee73c218)
> [ 52.042708] Stack: (0xee73de18 to 0xee73e000)
> [ 52.042711] de00: ee3dbd20 ee3dbd30
> [ 52.042717] de20: c10035f0 ee484000 ee73de50 00000060 ee26d980 ee3dbd00 ee484010 ee73de78
> [ 52.042723] de40: c10035f0 c027779c ee73de50 c07930fc ee73de50 ee73de50 ee3dbc00 ee26d980
> [ 52.042728] de60: ee3dbd00 00000000 c1002100 c104dc68 ee73c000 c0277b10 00000000 00000000
> [ 52.042733] de80: 00000000 eed717d0 ee720580 eed717d0 ee720580 eed74100 ee73dec8 eed7aa00
> [ 52.042738] dea0: c10029cc c10c1ca0 00000001 c01537fc 00000001 00000000 c0153744 eed74100
> [ 52.042743] dec0: 00000000 00000000 c1882fd8 c12107e0 00000000 c09a8e70 ee720580 eed74100
> [ 52.042749] dee0: ee720598 00000008 eed74134 ee73c000 c1002100 eed74100 ee720580 c0153c88
> [ 52.042753] df00: 00000000 ee720580 c0153c4c 00000000 ee723000 ee720580 c0153c4c 00000000
> [ 52.042758] df20: 00000000 00000000 00000000 c0159b74 00000000 00000000 ee0ea100 ee720580
> [ 52.042764] df40: 00000000 00000000 dead4ead ffffffff ffffffff c10c7db0 00000000 00000000
> [ 52.042769] df60: c0994a18 ee73df64 ee73df64 00000000 00000000 dead4ead ffffffff ffffffff
> [ 52.042774] df80: c10c7db0 00000000 00000000 c0994a18 ee73df90 ee73df90 ee723000 ee723000
> [ 52.042779] dfa0: c0159aa4 00000000 00000000 c01078d0 00000000 00000000 00000000 00000000
> [ 52.042784] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> [ 52.042789] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000
> [ 52.042800] [<c0276c44>] (free_block) from [<c027779c>] (drain_array+0xb4/0xf4)
> [ 52.042808] [<c027779c>] (drain_array) from [<c0277b10>] (cache_reap+0xc0/0x140)
> [ 52.042820] [<c0277b10>] (cache_reap) from [<c01537fc>] (process_one_work+0x1fc/0x64c)
> [ 52.042828] [<c01537fc>] (process_one_work) from [<c0153c88>] (worker_thread+0x3c/0x544)
> [ 52.042836] [<c0153c88>] (worker_thread) from [<c0159b74>] (kthread+0xd0/0xf0)
> [ 52.042845] [<c0159b74>] (kthread) from [<c01078d0>] (ret_from_fork+0x14/0x24)
> [ 52.042852] Code: e2477001 e1a05635 0583e008 e583700c (e7cc5007)
> [ 52.042858] ---[ end trace 0ea6e7e1bbe6e428 ]---
> [ 52.042917] Unable to handle kernel paging request at virtual address ffffffd0
> [ 52.042919] pgd = c0004000
> [ 52.042927] [ffffffd0] *pgd=afffd861, *pte=00000000, *ppte=00000000
> [ 52.042932] Internal error: Oops: 37 [#2] SMP ARM
> [ 52.043001] Modules linked in: xhci_plat_hcd xhci_hcd usbcore encoder_tpd12s015 connector_hdmi omapfb cfbcopyarea
> cfbimgblt cfbfillrect dwc3 leds_gpio snd_soc_simple_card led_class evdev cpufreq_dt udc_core gpio_fan omapdss extcon_
> usb_gpio snd_soc_tlv320aic3x snd_soc_davinci_mcasp phy_omap_usb2 omap_wdt rtc_omap extcon_palmas snd_soc_omap snd_soc
> _edma ti_soc_thermal tmp102 snd_soc_core snd_pcm_dmaengine dwc3_omap rtc_palmas extcon snd_pcm snd_timer palmas_pwrbu
> tton thermal_sys snd at24 nvmem_core rtc_ds1307 hwmon soundcore
> [ 52.043006] CPU: 0 PID: 78 Comm: kworker/0:2 Tainted: G D 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 52.043008] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 52.043019] task: ee73b0c0 ti: ee73c000 task.ti: ee73c000
> [ 52.043023] PC is at kthread_data+0x4/0xc
> [ 52.043029] LR is at wq_worker_sleeping+0x8/0xcc
> [ 52.043033] pc : [<c015a33c>] lr : [<c0154b8c>] psr: 20070193
> [ 52.043033] sp : ee73dbd0 ip : eed74cc8 fp : ee73dc2c
> [ 52.043035] r10: 00000001 r9 : ee73b4fc r8 : eed74700
> [ 52.043038] r7 : eed74710 r6 : c0ffa700 r5 : ee73b0c0 r4 : eed74700
> [ 52.043040] r3 : 00000000 r2 : 00000020 r1 : 00000000 r0 : ee73b0c0
> [ 52.043044] Flags: nzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none
> [ 52.043047] Control: 10c5387d Table: acc8c06a DAC: 00000051
> [ 52.043050] Process kworker/0:2 (pid: 78, stack limit = 0xee73c218)
> [ 52.043053] Stack: (0xee73dbd0 to 0xee73e000)
> [ 52.043058] dbc0: eed74700 c0791d0c 00000000 00000000
> [ 52.043063] dbe0: 00000001 c045219c 60070193 c0451d48 ee56fd2c c0792218 ee73b4f0 60070113
> [ 52.043069] dc00: 00000000 ee26d580 ee73d88c ee73c000 00000000 ee0c4d40 ee73dc40 00000000
> [ 52.043075] dc20: ee73b458 00000001 ee73dc3c c0792218 ee73b0c0 ee73d88c c0276c46 c013c58c
> [ 52.043080] dc40: ee73dc40 ee73dc40 00000000 60070193 c0276c46 c010c554 ee73c218 0000000b
> [ 52.043086] dc60: c0276c48 ee73c000 00000000 00000008 65000000 37373432 20313030 30613165
> [ 52.043091] dc80: 35333635 38353020 30306533 35652038 30373338 28206330 63633765 37303035
> [ 52.043097] dca0: c0002029 ee73dcc4 000007ff ffffff81 ee73ddc8 00000837 00000000 00000000
> [ 52.043102] dcc0: 00000000 c1882280 ee73de50 c011d658 ffffff81 c0797f00 c10c13c9 c018c4e0
> [ 52.043108] dce0: 60070093 c018a240 00000001 ee73b660 00000000 ee73b140 eed74760 00007b45
> [ 52.043114] dd00: 00000000 c10097cc 00000837 c0797d18 ffffff81 ee73ddc8 00000100 c1882280
> [ 52.043120] dd20: ee73de50 c0101344 c11fef60 ee73b668 ffffe000 00000000 60070093 00000000
> [ 52.043126] dd40: 000001a9 ee73b140 00000072 00000001 ee73b6c8 c10808ac c1864394 ee73b0c0
> [ 52.043132] dd60: c11f16a0 c018fb14 540f0072 0000aa07 c11f8eb0 ee73b668 ee73b660 c10808ac
> [ 52.043137] dd80: c1864394 ee73b0c0 c11f16a0 c018fb14 503aa078 00000005 00000001 ee73b668
> [ 52.043143] dda0: ee73b660 ee73b668 ee73b660 c018c4e0 c0276c44 20070093 ffffffff ee73ddfc
> [ 52.043149] ddc0: 00000200 c07973ec ee26d980 ee484014 ee484190 ef46b674 ee3dbd00 04f4a70a
> [ 52.043154] dde0: 00000005 ffffff7f 00000200 00000100 c1882280 ee73de50 00000002 ee73de18
> [ 52.043160] de00: eddf51e0 c0276c44 20070093 ffffffff 00000051 ee3dbd00 ee3dbd20 ee3dbd30
> [ 52.043166] de20: c10035f0 ee484000 ee73de50 00000060 ee26d980 ee3dbd00 ee484010 ee73de78
> [ 52.043172] de40: c10035f0 c027779c ee73de50 c07930fc ee73de50 ee73de50 ee3dbc00 ee26d980
> [ 52.043177] de60: ee3dbd00 00000000 c1002100 c104dc68 ee73c000 c0277b10 00000000 00000000
> [ 52.043183] de80: 00000000 eed717d0 ee720580 eed717d0 ee720580 eed74100 ee73dec8 eed7aa00
> [ 52.043188] dea0: c10029cc c10c1ca0 00000001 c01537fc 00000001 00000000 c0153744 eed74100
> [ 52.043194] dec0: 00000000 00000000 c1882fd8 c12107e0 00000000 c09a8e70 ee720580 eed74100
> [ 52.043200] dee0: ee720598 00000008 eed74134 ee73c000 c1002100 eed74100 ee720580 c0153c88
> [ 52.043206] df00: 00000000 ee720580 c0153c4c 00000000 ee723000 ee720580 c0153c4c 00000000
> [ 52.043211] df20: 00000000 00000000 00000000 c0159b74 00000000 00000000 ee0ea100 ee720580
> [ 52.043217] df40: 00000000 00000000 dead4ead ffffffff ffffffff c10c7db0 00000000 00000000
> [ 52.043222] df60: c0994a18 ee73df64 ee73df64 00000001 00010001 dead4ead ffffffff ffffffff
> [ 52.043228] df80: c10c7db0 00000000 00000000 c0994a18 ee73df90 ee73df90 ee723000 ee723000
> [ 52.043233] dfa0: c0159aa4 00000000 00000000 c01078d0 00000000 00000000 00000000 00000000
> [ 52.043238] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
> [ 52.043243] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000
> [ 52.043251] [<c015a33c>] (kthread_data) from [<c0154b8c>] (wq_worker_sleeping+0x8/0xcc)
> [ 52.043263] [<c0154b8c>] (wq_worker_sleeping) from [<c0791d0c>] (__schedule+0x750/0xc14)
> [ 52.043270] [<c0791d0c>] (__schedule) from [<c0792218>] (schedule+0x48/0xa0)
> [ 52.043278] [<c0792218>] (schedule) from [<c013c58c>] (do_exit+0x6f4/0xaf8)
> [ 52.043283] [<c013c58c>] (do_exit) from [<c010c554>] (die+0x440/0x498)
> [ 52.043290] [<c010c554>] (die) from [<c011d658>] (__do_kernel_fault.part.0+0x54/0x1e4)
> [ 52.043298] [<c011d658>] (__do_kernel_fault.part.0) from [<c0797f00>] (do_page_fault+0x1e8/0x404)
> [ 52.043305] [<c0797f00>] (do_page_fault) from [<c0101344>] (do_DataAbort+0x34/0xb4)
> [ 52.043311] [<c0101344>] (do_DataAbort) from [<c07973ec>] (__dabt_svc+0x4c/0x80)
> [ 52.043314] Exception stack(0xee73ddc8 to 0xee73de10)
> [ 52.043319] ddc0: ee26d980 ee484014 ee484190 ef46b674 ee3dbd00 04f4a70a
> [ 52.043324] dde0: 00000005 ffffff7f 00000200 00000100 c1882280 ee73de50 00000002 ee73de18
> [ 52.043328] de00: eddf51e0 c0276c44 20070093 ffffffff
> [ 52.043336] [<c07973ec>] (__dabt_svc) from [<c0276c44>] (free_block+0xf4/0x160)
> [ 52.043344] [<c0276c44>] (free_block) from [<c027779c>] (drain_array+0xb4/0xf4)
> [ 52.043352] [<c027779c>] (drain_array) from [<c0277b10>] (cache_reap+0xc0/0x140)
> [ 52.043360] [<c0277b10>] (cache_reap) from [<c01537fc>] (process_one_work+0x1fc/0x64c)
> [ 52.043367] [<c01537fc>] (process_one_work) from [<c0153c88>] (worker_thread+0x3c/0x544)
> [ 52.043374] [<c0153c88>] (worker_thread) from [<c0159b74>] (kthread+0xd0/0xf0)
> [ 52.043381] [<c0159b74>] (kthread) from [<c01078d0>] (ret_from_fork+0x14/0x24)
> [ 52.043386] Code: c01597c4 c10c7db0 c0994a18 e59033f0 (e5130030)
> [ 52.043390] ---[ end trace 0ea6e7e1bbe6e429 ]---
> [ 52.043393] Fixing recursive fault but reboot is needed!
> [ 53.046293] Generic PHY 48485000.mdio:01: attached PHY driver [Generic PHY] (mii_bus:phy_addr=48485000.mdio:01, ir
> q=-1)
> [ 53.428374] BUG: spinlock lockup suspected on CPU#0, kworker/0:2/78
> [ 53.434953] lock: 0xeed74700, .magic: dead4ead, .owner: kworker/0:2/78, .owner_cpu: 0
> [ 53.443263] CPU: 0 PID: 78 Comm: kworker/0:2 Tainted: G D 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 53.453209] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 53.459619] [<c010feec>] (unwind_backtrace) from [<c010c110>] (show_stack+0x10/0x14)
> [ 53.467748] [<c010c110>] (show_stack) from [<c0471024>] (dump_stack+0xac/0xe0)
> [ 53.475335] [<c0471024>] (dump_stack) from [<c0194bc0>] (do_raw_spin_lock+0xec/0x1e8)
> [ 53.483556] [<c0194bc0>] (do_raw_spin_lock) from [<c07916b8>] (__schedule+0xfc/0xc14)
> [ 53.491774] [<c07916b8>] (__schedule) from [<c0792218>] (schedule+0x48/0xa0)
> [ 53.499170] [<c0792218>] (schedule) from [<c013c7ec>] (do_exit+0x954/0xaf8)
> [ 53.506473] [<c013c7ec>] (do_exit) from [<c010c554>] (die+0x440/0x498)
> [ 53.513321] [<c010c554>] (die) from [<c011d658>] (__do_kernel_fault.part.0+0x54/0x1e4)
> [ 53.521631] [<c011d658>] (__do_kernel_fault.part.0) from [<c0797f00>] (do_page_fault+0x1e8/0x404)
> [ 53.530946] [<c0797f00>] (do_page_fault) from [<c0101344>] (do_DataAbort+0x34/0xb4)
> [ 53.538979] [<c0101344>] (do_DataAbort) from [<c07973ec>] (__dabt_svc+0x4c/0x80)
> [ 53.546740] Exception stack(0xee73db80 to 0xee73dbc8)
> [ 53.552043] db80: ee73b0c0 00000000 00000020 00000000 eed74700 ee73b0c0 c0ffa700 eed74710
> [ 53.560623] dba0: eed74700 ee73b4fc 00000001 ee73dc2c eed74cc8 ee73dbd0 c0154b8c c015a33c
> [ 53.569199] dbc0: 20070193 ffffffff
> [ 53.572862] [<c07973ec>] (__dabt_svc) from [<c015a33c>] (kthread_data+0x4/0xc)
> [ 53.580439] [<c015a33c>] (kthread_data) from [<c0154b8c>] (wq_worker_sleeping+0x8/0xcc)
> [ 53.588834] [<c0154b8c>] (wq_worker_sleeping) from [<c0791d0c>] (__schedule+0x750/0xc14)
> [ 53.597328] [<c0791d0c>] (__schedule) from [<c0792218>] (schedule+0x48/0xa0)
> [ 53.604728] [<c0792218>] (schedule) from [<c013c58c>] (do_exit+0x6f4/0xaf8)
> [ 53.612034] [<c013c58c>] (do_exit) from [<c010c554>] (die+0x440/0x498)
> [ 53.618886] [<c010c554>] (die) from [<c011d658>] (__do_kernel_fault.part.0+0x54/0x1e4)
> [ 53.627198] [<c011d658>] (__do_kernel_fault.part.0) from [<c0797f00>] (do_page_fault+0x1e8/0x404)
> [ 53.636511] [<c0797f00>] (do_page_fault) from [<c0101344>] (do_DataAbort+0x34/0xb4)
> [ 53.644543] [<c0101344>] (do_DataAbort) from [<c07973ec>] (__dabt_svc+0x4c/0x80)
> [ 53.652299] Exception stack(0xee73ddc8 to 0xee73de10)
> [ 53.657600] ddc0: ee26d980 ee484014 ee484190 ef46b674 ee3dbd00 04f4a70a
> [ 53.666180] dde0: 00000005 ffffff7f 00000200 00000100 c1882280 ee73de50 00000002 ee73de18
> [ 53.674759] de00: eddf51e0 c0276c44 20070093 ffffffff
> [ 53.680063] [<c07973ec>] (__dabt_svc) from [<c0276c44>] (free_block+0xf4/0x160)
> [ 53.687732] [<c0276c44>] (free_block) from [<c027779c>] (drain_array+0xb4/0xf4)
> [ 53.695406] [<c027779c>] (drain_array) from [<c0277b10>] (cache_reap+0xc0/0x140)
> [ 53.703169] [<c0277b10>] (cache_reap) from [<c01537fc>] (process_one_work+0x1fc/0x64c)
> [ 53.711483] [<c01537fc>] (process_one_work) from [<c0153c88>] (worker_thread+0x3c/0x544)
> [ 53.719980] [<c0153c88>] (worker_thread) from [<c0159b74>] (kthread+0xd0/0xf0)
> [ 53.727553] [<c0159b74>] (kthread) from [<c01078d0>] (ret_from_fork+0x14/0x24)
> [ 53.735129] Sending NMI to all CPUs:
> [ 53.740082] NMI backtrace for cpu 0
> [ 53.743743] CPU: 0 PID: 78 Comm: kworker/0:2 Tainted: G D 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 53.753683] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 53.760071] [<c010feec>] (unwind_backtrace) from [<c010c110>] (show_stack+0x10/0x14)
> [ 53.768193] [<c010c110>] (show_stack) from [<c0471024>] (dump_stack+0xac/0xe0)
> [ 53.775765] [<c0471024>] (dump_stack) from [<c0474b38>] (nmi_cpu_backtrace+0xe0/0xfc)
> [ 53.783983] [<c0474b38>] (nmi_cpu_backtrace) from [<c010dab4>] (raise_nmi+0x60/0x70)
> [ 53.792102] [<c010dab4>] (raise_nmi) from [<c0474dd8>] (nmi_trigger_all_cpu_backtrace+0x220/0x264)
> [ 53.801497] [<c0474dd8>] (nmi_trigger_all_cpu_backtrace) from [<c0194bcc>] (do_raw_spin_lock+0xf8/0x1e8)
> [ 53.811446] [<c0194bcc>] (do_raw_spin_lock) from [<c07916b8>] (__schedule+0xfc/0xc14)
> [ 53.819659] [<c07916b8>] (__schedule) from [<c0792218>] (schedule+0x48/0xa0)
> [ 53.827054] [<c0792218>] (schedule) from [<c013c7ec>] (do_exit+0x954/0xaf8)
> [ 53.834355] [<c013c7ec>] (do_exit) from [<c010c554>] (die+0x440/0x498)
> [ 53.841201] [<c010c554>] (die) from [<c011d658>] (__do_kernel_fault.part.0+0x54/0x1e4)
> [ 53.849505] [<c011d658>] (__do_kernel_fault.part.0) from [<c0797f00>] (do_page_fault+0x1e8/0x404)
> [ 53.858815] [<c0797f00>] (do_page_fault) from [<c0101344>] (do_DataAbort+0x34/0xb4)
> [ 53.866843] [<c0101344>] (do_DataAbort) from [<c07973ec>] (__dabt_svc+0x4c/0x80)
> [ 53.874601] Exception stack(0xee73db80 to 0xee73dbc8)
> [ 53.879895] db80: ee73b0c0 00000000 00000020 00000000 eed74700 ee73b0c0 c0ffa700 eed74710
> [ 53.888472] dba0: eed74700 ee73b4fc 00000001 ee73dc2c eed74cc8 ee73dbd0 c0154b8c c015a33c
> [ 53.897047] dbc0: 20070193 ffffffff
> [ 53.900706] [<c07973ec>] (__dabt_svc) from [<c015a33c>] (kthread_data+0x4/0xc)
> [ 53.908282] [<c015a33c>] (kthread_data) from [<c0154b8c>] (wq_worker_sleeping+0x8/0xcc)
> [ 53.916679] [<c0154b8c>] (wq_worker_sleeping) from [<c0791d0c>] (__schedule+0x750/0xc14)
> [ 53.925161] [<c0791d0c>] (__schedule) from [<c0792218>] (schedule+0x48/0xa0)
> [ 53.932554] [<c0792218>] (schedule) from [<c013c58c>] (do_exit+0x6f4/0xaf8)
> [ 53.939852] [<c013c58c>] (do_exit) from [<c010c554>] (die+0x440/0x498)
> [ 53.946697] [<c010c554>] (die) from [<c011d658>] (__do_kernel_fault.part.0+0x54/0x1e4)
> [ 53.955006] [<c011d658>] (__do_kernel_fault.part.0) from [<c0797f00>] (do_page_fault+0x1e8/0x404)
> [ 53.964317] [<c0797f00>] (do_page_fault) from [<c0101344>] (do_DataAbort+0x34/0xb4)
> [ 53.972346] [<c0101344>] (do_DataAbort) from [<c07973ec>] (__dabt_svc+0x4c/0x80)
> [ 53.980105] Exception stack(0xee73ddc8 to 0xee73de10)
> [ 53.985404] ddc0: ee26d980 ee484014 ee484190 ef46b674 ee3dbd00 04f4a70a
> [ 53.993990] dde0: 00000005 ffffff7f 00000200 00000100 c1882280 ee73de50 00000002 ee73de18
> [ 54.002573] de00: eddf51e0 c0276c44 20070093 ffffffff
> [ 54.007868] [<c07973ec>] (__dabt_svc) from [<c0276c44>] (free_block+0xf4/0x160)
> [ 54.015533] [<c0276c44>] (free_block) from [<c027779c>] (drain_array+0xb4/0xf4)
> [ 54.023196] [<c027779c>] (drain_array) from [<c0277b10>] (cache_reap+0xc0/0x140)
> [ 54.030953] [<c0277b10>] (cache_reap) from [<c01537fc>] (process_one_work+0x1fc/0x64c)
> [ 54.039256] [<c01537fc>] (process_one_work) from [<c0153c88>] (worker_thread+0x3c/0x544)
> [ 54.047778] [<c0153c88>] (worker_thread) from [<c0159b74>] (kthread+0xd0/0xf0)
> [ 54.055352] [<c0159b74>] (kthread) from [<c01078d0>] (ret_from_fork+0x14/0x24)
> [ 54.062920] NMI backtrace for cpu 1
> [ 54.066576] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G D 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 54.076246] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 54.082636] task: ee0ea100 ti: ee0ee000 task.ti: ee0ee000
> [ 54.088295] PC is at cpu_startup_entry+0xc0/0x328
> [ 54.093226] LR is at cpu_startup_entry+0xa8/0x328
> [ 54.098159] pc : [<c0183a4c>] lr : [<c0183a34>] psr: 200c0013
> [ 54.104725] sp : ee0effe0 ip : 00000000 fp : 00000000
> [ 54.110203] r10: 00000000 r9 : c10029cc r8 : c10c2218
> [ 54.115680] r7 : 00000000 r6 : c1002a34 r5 : 00000000 r4 : ee0ee000
> [ 54.122531] r3 : 00000001 r2 : ee0ea100 r1 : 00000000 r0 : c0183a34
> [ 54.129375] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
> [ 54.136861] Control: 10c5387d Table: acc8c06a DAC: 00000051
> [ 54.142884] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G D 4.6.0-rc2-00128-g1f5f5556aac5 #40
> [ 54.152555] Hardware name: Generic DRA74X (Flattened Device Tree)
> [ 54.158945] [<c010feec>] (unwind_backtrace) from [<c010c110>] (show_stack+0x10/0x14)
> [ 54.167064] [<c010c110>] (show_stack) from [<c0471024>] (dump_stack+0xac/0xe0)
> [ 54.174630] [<c0471024>] (dump_stack) from [<c0474af8>] (nmi_cpu_backtrace+0xa0/0xfc)
> [ 54.182849] [<c0474af8>] (nmi_cpu_backtrace) from [<c010e38c>] (handle_IPI+0xe4/0x2b8)
> [ 54.191151] [<c010e38c>] (handle_IPI) from [<c0101580>] (gic_handle_irq+0x94/0xb0)
> [ 54.199092] [<c0101580>] (gic_handle_irq) from [<c0797478>] (__irq_svc+0x58/0x78)
> [ 54.206940] Exception stack(0xee0eff90 to 0xee0effd8)
> [ 54.212240] ff80: c0183a34 00000000 ee0ea100 00000001
> [ 54.220824] ffa0: ee0ee000 00000000 c1002a34 00000000 c10c2218 c10029cc 00000000 00000000
> [ 54.229403] ffc0: 00000000 ee0effe0 c0183a34 c0183a4c 200c0013 ffffffff
> [ 54.236345] [<c0797478>] (__irq_svc) from [<c0183a4c>] (cpu_startup_entry+0xc0/0x328)
> [ 54.244560] [<c0183a4c>] (cpu_startup_entry) from [<c010df40>] (arch_cpu_idle_dead+0x60/0x9c)
> [ 55.049340] cpsw 48484000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx
--
Regards,
Nishanth Menon
^ permalink raw reply
* next-20160408 build: 0 failures 17 warnings (next-20160408)
From: Build bot for Mark Brown @ 2016-04-08 9:13 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160408
Git describe: next-20160408
Commit: 6e5921edae Add linux-next specific files for 20160408
Build Time: 92 min 27 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 17
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
14 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 17
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 14 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 8
From: Stephen Rothwell @ 2016-04-08 4:16 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160407:
The akpm-current tree still had its build failure for which I applied
a patch.
Non-merge commits (relative to Linus' tree): 3002
2806 files changed, 114490 insertions(+), 69528 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (c4004b02f8e5 x86: remove the kernel code/data/bss resources from /proc/iomem)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (b5cd46412eaa Revert "ARC: [plat-axs10x] add Ethernet PHY description in .dts")
Merging arm-current/fixes (208fae5c3b94 ARM: 8550/1: protect idiv patching against undefined gcc behavior)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (579ba855524c RDS: fix congestion map corruption for PAGE_SIZE > 4k)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (76e6abb5798a nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (b4203ff5464d ALSA: usb-audio: Add a quirk for Plantronics BT300)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()")
Merging usb.current/usb-linus (39ec5cbed0bb Merge tag 'fixes-for-v4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask configuration)
Merging usb-serial-fixes/usb-linus (d48d5691ebf8 USB: option: add "D-Link DWM-221 B1" device id)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver")
Merging char-misc.current/char-misc-linus (053f78d35995 Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want BTN_TOOL_<name> on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (42bf7b46a5de drm/i915: fix deadlock on lid open)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (2a8ffcb18371 ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (2c94ffb62d6b Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f11671bc57fb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (6de37509e43d Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register)
Merging qcom/for-next (faaa41613dc8 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e7d47ca61c33 Merge branches 'heads/arm64-dt-for-v4.7' and 'heads/dt-for-v4.7' into next)
Merging rockchip/for-next (29254cec05b2 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c673f2334187 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (87e090966759 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (275b0835d7d8 m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (131251a1fba8 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (4fb4e4aecb76 Merge branch 'for-next-4.6-20160407' into for-next-20160407)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (c325a67c7290 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (611526756a3d gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read())
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (4cba34656482 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (ab99ccb59bc1 Merge branch 'for-4.7/upstream' into for-next)
Merging i2c/i2c/for-next (34cf2acdafaa i2c: jz4780: prevent potential division by zero)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d8829bb60521 hwmon: (fam15h_power) Add platform check function)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (171912fdeb21 Merge branch 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61ca65df0313 Merge branch 'topic/xilinx' into next)
Merging net-next/master (f8711655f862 Merge branch 'bpf-tracepoints')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (20ac1b325d8d Merge ath-next from ath.git)
Merging bluetooth/master (9ef280c6c28f irda: sh_irda: remove driver)
Merging mac80211-next/master (fcfeed737254 cfg80211: Improve Connect/Associate command documentation)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (5d887e003de2 mtd: nand: Remove BUG() abuse in nand_scan_tail)
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (6f0e7535e7e1 drm/i915/BXT: Get pipe conf from the port registers)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (4926c8046549 ALSA: intel8x0: Drop superfluous VM checks)
Merging sound-asoc/for-next (1df1dcbf92e1 Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (dfa4e82a05c3 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (f6bc639ccf6c mmc: tmio: Remove redundant runtime PM calls)
Merging md/for-next (f9a67b1182e5 md/bitmap: clear bitmap if bitmap_create failed)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (824e23e95487 Merge remote-tracking branches 'regulator/topic/s2mps11' and 'regulator/topic/twl' into regulator-next)
Merging security/next (9735a22799b9 Linux 4.6-rc2)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (c9bfa8286167 Merge remote-tracking branches 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (3d8e15dd6de6 KVM: new maintainer on the block)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-gadget/next (9735a22799b9 Linux 4.6-rc2)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (148e45dc87cb staging: vme: fix bare use of 'unsigned')
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c
CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c
$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
Applying: lustre: fix ups for PAGE_CACHE_... removal
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (90b1907f4f28 extcon: usb-gpio: switch to use pm wakeirq apis)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (1a3583e425fb Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (186030f636a8 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (c0553d04f8d3 dt-bindings: arm: add DT binding for Marvell AP806 system controller)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (0ee930b57e0c Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (2e3d64c02e54 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: Tree for Apr 7
From: Ralf Baechle @ 2016-04-07 12:58 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: Stephen Rothwell, linux-next, linux-kernel, linux-mips
In-Reply-To: <57063E5B.2080206@gmail.com>
On Thu, Apr 07, 2016 at 04:32:51PM +0530, Sudip Mukherjee wrote:
> My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for
> defconfig and allmodconfig. I have not checked the patch with other builds.
This is fixed locally; I just haven't pushed a fresh branch, sorry ...
Ralf
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2016-04-07 12:03 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160407084833.GA2288@gmail.com>
Hi Ingo,
On Thu, 7 Apr 2016 10:48:33 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> Indeed - and this only triggers on HAVE_GENERIC_RCU_GUP.
>
> I've amended the commit.
Thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Apr 7
From: Sudip Mukherjee @ 2016-04-07 11:02 UTC (permalink / raw)
To: Stephen Rothwell, linux-next; +Cc: linux-kernel, Ralf Baechle, linux-mips
In-Reply-To: <20160407152922.73d85ce6@canb.auug.org.au>
On Thursday 07 April 2016 10:59 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160406:
All the mips builds are failing since last few days.
My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for
defconfig and allmodconfig. I have not checked the patch with other builds.
regards
sudip
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Ingo Molnar @ 2016-04-07 8:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160407152603.173426e5@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (powerpc ppc44x_defconfig)
> produced this warning:
>
> mm/gup.c: In function 'get_user_pages_fast':
> mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
> struct mm_struct *mm = current->mm;
> ^
>
> Introduced by commit
>
> dc8cfd957d85 ("mm/gup: Remove the macro overload API migration helpers from the get_user*() APIs")
Indeed - and this only triggers on HAVE_GENERIC_RCU_GUP.
I've amended the commit.
Thanks,
Ingo
^ permalink raw reply
* next-20160407 build: 0 failures 15 warnings (next-20160407)
From: Build bot for Mark Brown @ 2016-04-07 8:41 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160407
Git describe: next-20160407
Commit: 295ef6ab95 Add linux-next specific files for 20160407
Build Time: 86 min 6 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 15
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 15
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 7
From: Stephen Rothwell @ 2016-04-07 5:29 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160406:
The akpm-current tree gained a build failure for which I applied a patch.
Non-merge commits (relative to Linus' tree): 2722
2566 files changed, 106575 insertions(+), 66077 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (c4004b02f8e5 x86: remove the kernel code/data/bss resources from /proc/iomem)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (b5cd46412eaa Revert "ARC: [plat-axs10x] add Ethernet PHY description in .dts")
Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence broadcast)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (0a1a37b6d62e net: add the AF_KCM entries to family name tables)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b4201cc4fc6e mac80211: fix "warning: ‘target_metric’ may be used uninitialized")
Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()")
Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity checking for the number of ports)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask configuration)
Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver")
Merging char-misc.current/char-misc-linus (1bb025f6db78 Merge tag 'extcon-fixes-for-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want BTN_TOOL_<name> on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (9dbaab56ac09 drm/i915: Exit cherryview_irq_handler() after one pass)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (2a8ffcb18371 ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (7150fbc6a7ec Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f11671bc57fb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (6de37509e43d Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register)
Merging qcom/for-next (faaa41613dc8 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e7d47ca61c33 Merge branches 'heads/arm64-dt-for-v4.7' and 'heads/dt-for-v4.7' into next)
Merging rockchip/for-next (29254cec05b2 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c673f2334187 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (87e090966759 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (275b0835d7d8 m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (24fead1eb323 Merge branch '4.6-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/mips/ath79/clock.c
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eb2b7a82d42e Merge branch 'for-next-4.6-20160404' into for-next-20160404)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (dd018b1f64c1 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (611526756a3d gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read())
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (45996492e5c8 orangefs: fix orangefs_superblock locking)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (76f0199a2afb Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8dcf32175b4e i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (c528f2aae571 hwmon: (max31722) Add support for MAX31722/MAX31723 temperature sensors)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (684a7979b723 Merge branch 'acpica' into linux-next)
Merging idle/next (b318c60f942c intel_idle: Clean up all registered devices on exit.)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61ca65df0313 Merge branch 'topic/xilinx' into next)
Merging net-next/master (58a01d4dc43e Merge branch 'mlxsw-dcb')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (d9f5725fb00b mwifiex: advertise low priority scan feature)
Merging bluetooth/master (9ef280c6c28f irda: sh_irda: remove driver)
Merging mac80211-next/master (4ce2bd9c4c1d cfg80211: Allow reassociation to be requested with internal SME)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (5d887e003de2 mtd: nand: Remove BUG() abuse in nand_scan_tail)
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (281c114f8e80 drm/i915/bxt: Set max cdclk frequency properly)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (4926c8046549 ALSA: intel8x0: Drop superfluous VM checks)
Merging sound-asoc/for-next (57696d5d83fa Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (ef6e0d57417a dm raid1: do not error successfully written bios during suspend)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (8a755fbe8258 ARM: davinci: remove mmc dma resources)
Merging md/for-next (f9a67b1182e5 md/bitmap: clear bitmap if bitmap_create failed)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (824e23e95487 Merge remote-tracking branches 'regulator/topic/s2mps11' and 'regulator/topic/twl' into regulator-next)
Merging security/next (9735a22799b9 Linux 4.6-rc2)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (c9bfa8286167 Merge remote-tracking branches 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (abd56b3c8483 Documentation: dt: socfpga: Add Altera Arria10 OCRAM binding)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (95272c29378e compiler-gcc: disable -ftracer for __noclone functions)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-gadget/next (9735a22799b9 Linux 4.6-rc2)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (148e45dc87cb staging: vme: fix bare use of 'unsigned')
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c
CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c
$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
Applying: lustre: fix ups for PAGE_CACHE_... removal
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (f75587b8ca69 extcon: palmas: Drop stray IRQF_EARLY_RESUME flag)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (1a3583e425fb Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (f0ea7fd7a7d3 intel-iommu: fix up comment)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (d75868496ca0 MAINTAINERS: Add mailing list for remote processor subsystems)
Merging gpio/for-next (186030f636a8 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (c0553d04f8d3 dt-bindings: arm: add DT binding for Marvell AP806 system controller)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (222d586ca829 Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (fc0c2028135c x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem())
Merging akpm-current/current (75b48d8a838f ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Applying: huge tmpfs: fix build problem on arm
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (bbe44b9dd5c5 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2016-04-07 5:26 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel
Hi all,
After merging the tip tree, today's linux-next build (powerpc ppc44x_defconfig)
produced this warning:
mm/gup.c: In function 'get_user_pages_fast':
mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
struct mm_struct *mm = current->mm;
^
Introduced by commit
dc8cfd957d85 ("mm/gup: Remove the macro overload API migration helpers from the get_user*() APIs")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Hugh Dickins @ 2016-04-07 5:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Hugh Dickins
In-Reply-To: <20160407151201.0afc790f@canb.auug.org.au>
On Thu, 7 Apr 2016, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from include/linux/linkage.h:4:0,
> from include/linux/fs.h:4,
> from mm/shmem.c:24:
> In function 'shmem_disband_hugeteam',
> inlined from 'shmem_getpage_gfp' at mm/shmem.c:3075:3:
> include/linux/compiler.h:510:38: error: call to '__compiletime_assert_1747' declared with attribute error: BUILD_BUG failed
> _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
> ^
> include/linux/compiler.h:493:4: note: in definition of macro '__compiletime_assert'
> prefix ## suffix(); \
> ^
> include/linux/compiler.h:510:2: note: in expansion of macro '_compiletime_assert'
> _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
> ^
> include/linux/bug.h:51:37: note: in expansion of macro 'compiletime_assert'
> #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
> ^
> include/linux/bug.h:85:21: note: in expansion of macro 'BUILD_BUG_ON_MSG'
> #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
> ^
> mm/shmem.c:1747:2: note: in expansion of macro 'BUILD_BUG'
> BUILD_BUG();
> ^
>
> Caused by commit
>
> ab61a0a665d8 ("huge tmpfs: try to allocate huge pages, split into a team")
>
> I added the following (hacky, but builds for my compiler at least)
> patch for today:
Sorry about that, thanks a lot Stephen, your patch will do fine (though
what I'll do is simply delete that BUILD_BUG(), which isn't really
serving any useful purpose). It certainly has been compiled before
on arm and without CONFIG_TRANSPARENT_HUGEPAGE, but I guess different
compiler versions make different optimizations, so I never noticed I
was unwittingly relying on too sophisticated an optimization there.
Hugh
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 7 Apr 2016 14:57:45 +1000
> Subject: [PATCH] huge tmpfs: fix build problem on arm
>
> allocated_huge will never be non-NULL if CONFIG_TRANSPARENT_HUGEPAGE is not.
>
> Fixes: ab61a0a665d8 ("huge tmpfs: try to allocate huge pages, split into a team")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> mm/shmem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 5b9fecc9ce72..f2307d9630aa 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -3071,7 +3071,7 @@ unlock:
> unlock_page(page);
> put_page(page);
> }
> - if (alloced_huge) {
> + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && alloced_huge) {
> shmem_disband_hugeteam(alloced_huge);
> alloced_huge = NULL;
> }
> --
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-04-07 5:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Hugh Dickins
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from include/linux/linkage.h:4:0,
from include/linux/fs.h:4,
from mm/shmem.c:24:
In function 'shmem_disband_hugeteam',
inlined from 'shmem_getpage_gfp' at mm/shmem.c:3075:3:
include/linux/compiler.h:510:38: error: call to '__compiletime_assert_1747' declared with attribute error: BUILD_BUG failed
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^
include/linux/compiler.h:493:4: note: in definition of macro '__compiletime_assert'
prefix ## suffix(); \
^
include/linux/compiler.h:510:2: note: in expansion of macro '_compiletime_assert'
_compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
^
include/linux/bug.h:51:37: note: in expansion of macro 'compiletime_assert'
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
^
include/linux/bug.h:85:21: note: in expansion of macro 'BUILD_BUG_ON_MSG'
#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
^
mm/shmem.c:1747:2: note: in expansion of macro 'BUILD_BUG'
BUILD_BUG();
^
Caused by commit
ab61a0a665d8 ("huge tmpfs: try to allocate huge pages, split into a team")
I added the following (hacky, but builds for my compiler at least)
patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 7 Apr 2016 14:57:45 +1000
Subject: [PATCH] huge tmpfs: fix build problem on arm
allocated_huge will never be non-NULL if CONFIG_TRANSPARENT_HUGEPAGE is not.
Fixes: ab61a0a665d8 ("huge tmpfs: try to allocate huge pages, split into a team")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
mm/shmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 5b9fecc9ce72..f2307d9630aa 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3071,7 +3071,7 @@ unlock:
unlock_page(page);
put_page(page);
}
- if (alloced_huge) {
+ if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && alloced_huge) {
shmem_disband_hugeteam(alloced_huge);
alloced_huge = NULL;
}
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* mmotm 2016-04-06-20-40 uploaded
From: akpm @ 2016-04-07 3:41 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-04-06-20-40 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.6-rc2:
(patches marked "*" will be included in linux-next)
origin.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* kexec-update-vmcoreinfo-for-compound_order-dtor.patch
* kexec-export-offsetpagecompound_head-to-find-out-compound-tail-page.patch
* mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch
* thp-keep-huge-zero-page-pinned-until-tlb-flush.patch
* mailmap-fix-krzysztof-kozlowskis-misspelled-name.patch
* mm-huge_memory-replace-vm_no_thp-vm_bug_on-with-actual-vma-check.patch
* numa-fix-proc-pid-numa_maps-for-thp.patch
* mm-vmscan-reclaim-highmem-zone-if-buffer_heads-is-over-limit.patch
* mm-call-swap_slot_free_notify-with-holding-page-lock.patch
* mm-hwpoison-fix-wrong-num_poisoned_pages-account.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-error-code-comments-and-amendments-the-comment-of-ocfs2_extended_slot-should-be-0x08.patch
* ocfs2-clean-up-an-unused-variable-wants_rotate-in-ocfs2_truncate_rec.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-negotiate-timer-v2.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-nego_timeout-message-v2.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-negotiate_approve-message-v2.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-add-some-user-debug-log-v2.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* padata-removed-unused-code.patch
mm.patch
* mm-slab-hold-a-slab_mutex-when-calling-__kmem_cache_shrink.patch
* mm-slab-remove-bad_alien_magic-again.patch
* mm-slab-drain-the-free-slab-as-much-as-possible.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code.patch
* mm-slab-clean-up-kmem_cache_node-setup.patch
* mm-slab-dont-keep-free-slabs-if-free_objects-exceeds-free_limit.patch
* mm-slab-racy-access-modify-the-slab-color.patch
* mm-slab-make-cache_grow-handle-the-page-allocated-on-arbitrary-node.patch
* mm-slab-separate-cache_grow-to-two-parts.patch
* mm-slab-refill-cpu-cache-through-a-new-slab-without-holding-a-node-lock.patch
* mm-slab-lockless-decision-to-grow-cache.patch
* mm-slub-replace-kick_all_cpus_sync-with-synchronize_sched-in-kmem_cache_shrink.patch
* mm-page_ref-use-page_ref-helper-instead-of-direct-modification-of-_count.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix-fix.patch
* compilerh-add-support-for-malloc-attribute.patch
* include-linux-apply-__malloc-attribute.patch
* include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
* include-linux-nodemaskh-create-next_node_in-helper.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
* mm-hugetlb-optimize-minimum-size-min_size-accounting.patch
* mm-hugetlb-introduce-hugetlb_bad_size.patch
* arm64-mm-use-hugetlb_bad_size.patch
* metag-mm-use-hugetlb_bad_size.patch
* powerpc-mm-use-hugetlb_bad_size.patch
* tile-mm-use-hugetlb_bad_size.patch
* x86-mm-use-hugetlb_bad_size.patch
* mm-hugetlb-is_vm_hugetlb_page-can-be-boolean.patch
* mm-memory_hotplug-is_mem_section_removable-can-be-boolean.patch
* mm-vmalloc-is_vmalloc_addr-can-be-boolean.patch
* mm-mempolicy-vma_migratable-can-be-boolean.patch
* mm-memcontrolc-mem_cgroup_select_victim_node-clarify-comment.patch
* mm-page_alloc-remove-useless-parameter-of-__free_pages_boot_core.patch
* zsmalloc-use-first_page-rather-than-page.patch
* zsmalloc-clean-up-many-bug_on.patch
* zsmalloc-reordering-function-parameter.patch
* zsmalloc-remove-unused-pool-param-in-obj_free.patch
* mm-hugetlbc-use-first_memory_node.patch
* mm-mempolicyc-offset_il_node-document-and-clarify.patch
* mm-rmap-replace-bug_onanon_vma-degree-with-vm_warn_on.patch
* mm-compaction-wrap-calculating-first-and-last-pfn-of-pageblock.patch
* mm-compaction-reduce-spurious-pcplist-drains.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction.patch
* mm-compaction-direct-freepage-allocation-for-async-direct-compaction.patch
* mm-compaction-direct-freepage-allocation-for-async-direct-compaction-checkpatch-fixes.patch
* mm-highmem-simplify-is_highmem.patch
* mm-uninline-page_mapped.patch
* mm-uninline-page_mapped-checkpatch-fixes.patch
* mm-hugetlb-add-same-zone-check-in-pfn_range_valid_gigantic.patch
* mm-memory_hotplug-add-comment-to-some-functions-related-to-memory-hotplug.patch
* mm-vmstat-add-zone-range-overlapping-check.patch
* mm-page_owner-add-zone-range-overlapping-check.patch
* power-add-zone-range-overlapping-check.patch
* mm-workingset-only-do-workingset-activations-on-reads.patch
* mm-filemap-only-do-access-activations-on-reads.patch
* mm-vmscan-reduce-size-of-inactive-file-list.patch
* mm-writeback-correct-dirty-page-calculation-for-highmem.patch
* mm-page_alloc-correct-highmem-memory-statistics.patch
* mm-highmem-make-nr_free_highpages-handles-all-highmem-zones-by-itself.patch
* mm-vmstat-make-node_page_state-handles-all-zones-by-itself.patch
* mm-mmap-kill-hook-arch_rebalance_pgtables.patch
* mm-update_lru_size-warn-and-reset-bad-lru_size.patch
* mm-update_lru_size-do-the-__mod_zone_page_state.patch
* mm-use-__setpageswapbacked-and-dont-clearpageswapbacked.patch
* tmpfs-preliminary-minor-tidyups.patch
* tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
* mm-proc-sys-vm-stat_refresh-to-force-vmstat-update.patch
* huge-mm-move_huge_pmd-does-not-need-new_vma.patch
* huge-pagecache-extend-mremap-pmd-rmap-lockout-to-files.patch
* huge-pagecache-mmap_sem-is-unlocked-when-truncation-splits-pmd.patch
* arch-fix-has_transparent_hugepage.patch
* huge-tmpfs-prepare-counts-in-meminfo-vmstat-and-sysrq-m.patch
* huge-tmpfs-include-shmem-freeholes-in-available-memory.patch
* huge-tmpfs-huge=n-mount-option-and-proc-sys-vm-shmem_huge.patch
* huge-tmpfs-try-to-allocate-huge-pages-split-into-a-team.patch
* huge-tmpfs-avoid-team-pages-in-a-few-places.patch
* huge-tmpfs-shrinker-to-migrate-and-free-underused-holes.patch
* huge-tmpfs-get_unmapped_area-align-fault-supply-huge-page.patch
* huge-tmpfs-get_unmapped_area-align-fault-supply-huge-page-fix.patch
* huge-tmpfs-get_unmapped_area-align-fault-supply-huge-page-fix-fix-2.patch
* huge-tmpfs-try_to_unmap_one-use-page_check_address_transhuge.patch
* huge-tmpfs-avoid-premature-exposure-of-new-pagetable.patch
* huge-tmpfs-map-shmem-by-huge-page-pmd-or-by-page-team-ptes.patch
* huge-tmpfs-disband-split-huge-pmds-on-race-or-memory-failure.patch
* huge-tmpfs-extend-get_user_pages_fast-to-shmem-pmd.patch
* huge-tmpfs-use-unevictable-lru-with-variable-hpage_nr_pages.patch
* huge-tmpfs-fix-mlocked-meminfo-track-huge-unhuge-mlocks.patch
* huge-tmpfs-fix-mapped-meminfo-track-huge-unhuge-mappings.patch
* kvm-plumb-return-of-hva-when-resolving-page-fault.patch
* kvm-teach-kvm-to-map-page-teams-as-huge-pages.patch
* huge-tmpfs-mem_cgroup-move-charge-on-shmem-huge-pages.patch
* huge-tmpfs-mem_cgroup-shmem_pmdmapped-accounting.patch
* huge-tmpfs-mem_cgroup-shmem_hugepages-accounting.patch
* huge-tmpfs-show-page-team-flag-in-pageflags.patch
* huge-tmpfs-proc-pid-smaps-show-shmemhugepages.patch
* huge-tmpfs-recovery-framework-for-reconstituting-huge-pages.patch
* huge-tmpfs-recovery-shmem_recovery_populate-to-fill-huge-page.patch
* huge-tmpfs-recovery-shmem_recovery_remap-remap_team_by_pmd.patch
* huge-tmpfs-recovery-shmem_recovery_swapin-to-read-from-swap.patch
* huge-tmpfs-recovery-tweak-shmem_getpage_gfp-to-fill-team.patch
* huge-tmpfs-recovery-debugfs-stats-to-complete-this-phase.patch
* huge-tmpfs-recovery-page-migration-call-back-into-shmem.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
* memory_hotplug-introduce-memhp_default_state=-command-line-parameter.patch
* mm-oom-move-gfp_nofs-check-to-out_of_memory.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-kasan-initial-memory-quarantine-implementation.patch
* mm-kasan-initial-memory-quarantine-implementation-v8.patch
* mm-oom-rework-oom-detection.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-compaction-change-compact_-constants-into-enum.patch
* mm-compaction-cover-all-compaction-mode-in-compact_zone.patch
* mm-compaction-distinguish-compact_deferred-from-compact_skipped.patch
* mm-compaction-distinguish-between-full-and-partial-compact_complete.patch
* mm-compaction-update-compaction_result-ordering.patch
* mm-compaction-simplify-__alloc_pages_direct_compact-feedback-interface.patch
* mm-compaction-abstract-compaction-feedback-to-helpers.patch
* mm-oom-protect-costly-allocations-some-more.patch
* mm-consider-compaction-feedback-also-for-costly-allocation.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mn10300-let-exit_fpu-accept-a-task.patch
* exit_thread-remove-empty-bodies.patch
* exit_thread-remove-empty-bodies-fix.patch
* exit_thread-accept-a-task-parameter-to-be-exited.patch
* exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
* fork-free-thread-in-copy_process-on-failure.patch
* maintainers-remove-linux-listsopenriscnet.patch
* lib-vsprintf-simplify-uuid-printing.patch
* ima-use-%pu-to-output-uuid-in-printable-format.patch
* lib-uuid-move-generate_random_uuid-to-uuidc.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid-fix.patch
* lib-uuid-remove-fsf-address.patch
* sysctl-use-generic-uuid-library.patch
* efi-redefine-type-constant-macro-from-generic-code.patch
* efivars-use-generic-uuid-library.patch
* genhd-move-to-use-generic-uuid-library.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-add-prefer_is_enabled-test.patch
* checkpatch-improve-constant_comparison-test-for-structure-members.patch
* init-mainc-simplify-initcall_blacklisted.patch
* wait-ptrace-assume-__wall-if-the-child-is-traced.patch
* wait-allow-sys_waitid-to-accept-__wnothread-__wclone-__wall.patch
* signal-make-oom_flags-a-bool.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.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
* next-20160406 build: 1 failures 15 warnings (next-20160406)
From: Build bot for Mark Brown @ 2016-04-06 7:30 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160406
Git describe: next-20160406
Commit: 4c8df6e455 Add linux-next specific files for 20160406
Build Time: 76 min 0 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 15
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
../drivers/acpi/processor_core.c:316:2: error: implicit declaration of function 'acpi_map_cpu2node' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
10 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ../drivers/acpi/processor_core.c:316:2: error: implicit declaration of function 'acpi_map_cpu2node' [-Werror=implicit-function-declaration]
Warnings Summary: 15
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
4 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
4 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
3 ../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 10 warnings, 0 section mismatches
Errors:
../drivers/acpi/processor_core.c:316:2: error: implicit declaration of function 'acpi_map_cpu2node' [-Werror=implicit-function-declaration]
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 6
From: Stephen Rothwell @ 2016-04-06 4:29 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160405:
Non-merge commits (relative to Linus' tree): 2369
2200 files changed, 93285 insertions(+), 58570 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (541d8f4d59d7 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (f86b8892a1b7 ARC: Don't source drivers/pci/pcie/Kconfig ourselves)
Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence broadcast)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (b6ee376cb0b7 ip6_tunnel: set rtnl_link_ops before calling register_netdevice)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (f6d4671a0881 mac80211: close the SP when we enqueue frames during the SP)
Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()")
Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity checking for the number of ports)
Merging usb-gadget-fixes/fixes (7e8ac87a4474 usb: phy: qcom-8x16: fix regulator API abuse)
Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver")
Merging char-misc.current/char-misc-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging input-current/for-linus (d63b0f0c0f19 Input: xpad - add Mad Catz FightStick TE 2 VID/PID)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (9dbaab56ac09 drm/i915: Exit cherryview_irq_handler() after one pass)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging arm/for-next (7150fbc6a7ec Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (00cb3ac4afaa Merge branch 'imx/dt64' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (6de37509e43d Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register)
Merging qcom/for-next (faaa41613dc8 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (301c9ed92b8f Merge branches 'heads/arm64-cleanup-for-v4.7', 'heads/arm64-dt-for-v4.7', 'heads/cleanup-for-v4.7', 'heads/defconfig-for-v4.7', 'heads/drivers-for-v4.7', 'heads/dt-for-v4.7' and 'heads/simple-pm-bus-for-v4.7' into next)
Merging rockchip/for-next (0b4b91b4c9b2 Merge branch 'v4.6-armsoc/dts64-fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c673f2334187 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (87e090966759 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (24fead1eb323 Merge branch '4.6-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/mips/ath79/clock.c
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eb2b7a82d42e Merge branch 'for-next-4.6-20160404' into for-next-20160404)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (dd018b1f64c1 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (611526756a3d gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read())
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (45996492e5c8 orangefs: fix orangefs_superblock locking)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (76f0199a2afb Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8dcf32175b4e i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (c528f2aae571 hwmon: (max31722) Add support for MAX31722/MAX31723 temperature sensors)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (87678985c9fe Merge branch 'acpi-processor' into linux-next)
Merging idle/next (b318c60f942c intel_idle: Clean up all registered devices on exit.)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (742c044f44af Merge branch 'topic/pl08x' into next)
Merging net-next/master (4da46cebbd3b net/core/dev: Warn on a too-short GRO frame)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (e46b4e2b46e1 Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging bluetooth/master (9ef280c6c28f irda: sh_irda: remove driver)
Merging mac80211-next/master (04f23cc3a21d mac80211: minstrel_ht: set A-MSDU tx limits based on selected max_prob_rate)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (5d887e003de2 mtd: nand: Remove BUG() abuse in nand_scan_tail)
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (5fd9f5238493 drm/i915: Set GPU freq to idle_freq initially)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (44fde3b89ba1 ALSA: hda - Update chmap tlv to report sink's capability)
Merging sound-asoc/for-next (e6d145f56701 Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (20aa787e453f Input: ti_am335x_tsc - use SIMPLE_DEV_PM_OPS)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (ef6e0d57417a dm raid1: do not error successfully written bios during suspend)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (49f6c1ea8c8e Merge branch 'fixes' into next)
Merging md/for-next (f9a67b1182e5 md/bitmap: clear bitmap if bitmap_create failed)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (b9df756ffe46 Merge remote-tracking branch 'regulator/topic/twl' into regulator-next)
Merging security/next (9735a22799b9 Linux 4.6-rc2)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (bb161dab340a Merge remote-tracking branches 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (abd56b3c8483 Documentation: dt: socfpga: Add Altera Arria10 OCRAM binding)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (95272c29378e compiler-gcc: disable -ftracer for __noclone functions)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (148e45dc87cb staging: vme: fix bare use of 'unsigned')
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c
CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c
$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
Applying: lustre: fix ups for PAGE_CACHE_... removal
Merging char-misc/char-misc-next (f55532a0c0b8 Linux 4.6-rc1)
Merging extcon/extcon-next (f55532a0c0b8 Linux 4.6-rc1)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (f0e6cf6c8c41 Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (f0ea7fd7a7d3 intel-iommu: fix up comment)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (d75868496ca0 MAINTAINERS: Add mailing list for remote processor subsystems)
Merging gpio/for-next (8db9fce084e5 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (c0553d04f8d3 dt-bindings: arm: add DT binding for Marvell AP806 system controller)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (222d586ca829 Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (fc0c2028135c x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem())
Merging akpm-current/current (7a55317f3165 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (b74786b0fa70 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* next-20160405 build: 0 failures 15 warnings (next-20160405)
From: Build bot for Mark Brown @ 2016-04-05 7:56 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160405
Git describe: next-20160405
Commit: aa36efa8b2 Add linux-next specific files for 20160405
Build Time: 86 min 1 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 15
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 15
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1493:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 5
From: Stephen Rothwell @ 2016-04-05 4:50 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160404:
The btrfs-kdave tree gained conflicts Linus' tree.
The ceph tree gained conflicts Linus' tree.
The staging tree gained conflicts against the staging.current and Linus'
trees.
Non-merge commits (relative to Linus' tree): 2132
2023 files changed, 82827 insertions(+), 53245 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (e865f4965ff6 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (f86b8892a1b7 ARC: Don't source drivers/pci/pcie/Kconfig ourselves)
Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence broadcast)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (c862cc9b7052 bridge: Fix incorrect variable assignment on error path in br_sysfs_addbr)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (ad8ec957f693 wext: unregister_pernet_subsys() on notifier registration failure)
Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample rate quirk for Phoenix Audio TMX320)
Merging pci-current/for-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()")
Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity checking for the number of ports)
Merging usb-gadget-fixes/fixes (7e8ac87a4474 usb: phy: qcom-8x16: fix regulator API abuse)
Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver")
Merging char-misc.current/char-misc-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging input-current/for-linus (162f98dea487 Input: gtco - fix crash on detecting device without endpoints)
Merging crypto-current/master (ef609c238a8e sunrpc: Fix skcipher/shash conversion)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (9735a22799b9 Linux 4.6-rc2)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging arm/for-next (7150fbc6a7ec Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (00cb3ac4afaa Merge branch 'imx/dt64' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (6de37509e43d Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (3ca4a238106d ARM: OMAP2+: hwmod: Fix updating of sysconfig register)
Merging qcom/for-next (faaa41613dc8 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (301c9ed92b8f Merge branches 'heads/arm64-cleanup-for-v4.7', 'heads/arm64-dt-for-v4.7', 'heads/cleanup-for-v4.7', 'heads/defconfig-for-v4.7', 'heads/drivers-for-v4.7', 'heads/dt-for-v4.7' and 'heads/simple-pm-bus-for-v4.7' into next)
Merging rockchip/for-next (0b4b91b4c9b2 Merge branch 'v4.6-armsoc/dts64-fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (dc66b800f7ef Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (24fead1eb323 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eb2b7a82d42e Merge branch 'for-next-4.6-20160404' into for-next-20160404)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (7c886661dc31 libceph: use KMEM_CACHE macro)
CONFLICT (content): Merge conflict in fs/ceph/inode.c
CONFLICT (content): Merge conflict in fs/ceph/addr.c
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (dd018b1f64c1 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (3e11e5304150 GFS2: ignore unlock failures after withdraw)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (45996492e5c8 orangefs: fix orangefs_superblock locking)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (f55532a0c0b8 Linux 4.6-rc1)
Merging hid/for-next (b7c33d5dcfe2 Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (8dcf32175b4e i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (c528f2aae571 hwmon: (max31722) Add support for MAX31722/MAX31723 temperature sensors)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (ea58c523eefd Merge branch 'pm-cpufreq-sched' into linux-next)
Merging idle/next (b318c60f942c intel_idle: Clean up all registered devices on exit.)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (f55532a0c0b8 Linux 4.6-rc1)
Merging net-next/master (9ef280c6c28f irda: sh_irda: remove driver)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (e46b4e2b46e1 Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging bluetooth/master (9ef280c6c28f irda: sh_irda: remove driver)
Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (5651d6aaf489 mtd: bcm47xxsflash: use ioremap_cache() instead of KSEG0ADDR())
Merging nand/nand/next (be17c419f889 mtd: brcmnand: Add support for v6.2 controllers)
Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration)
Merging drm/drm-next (4604202ca8d2 Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (27af5eea54d1 drm/i915: Move execlists irq handler to a bottom half)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list)
CONFLICT (content): Merge conflict in include/drm/drm_crtc.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (44fde3b89ba1 ALSA: hda - Update chmap tlv to report sink's capability)
Merging sound-asoc/for-next (c6da59a2ef1d Merge remote-tracking branches 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (7d8d86252307 Input: gpio-keys - clean up device tree binding example)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (ef6e0d57417a dm raid1: do not error successfully written bios during suspend)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (1dceb0415aa0 mmc: sdhci: Fix regression setting power on Trats2 board)
Merging md/for-next (f9a67b1182e5 md/bitmap: clear bitmap if bitmap_create failed)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (77f8e8e944cb Merge remote-tracking branches 'regulator/topic/maxim', 'regulator/topic/pwm', 'regulator/topic/qcom-spmi' and 'regulator/topic/twl' into regulator-next)
Merging security/next (9735a22799b9 Linux 4.6-rc2)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (e8203d2af614 selinux: consolidate the ptrace parent lookup code)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (0bf676d1fd51 audit: cleanup prune_tree_thread)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (80bed53f77e4 Merge remote-tracking branch 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (ff6fd1478c53 ARM: socfpga: Enable Arria10 L2 cache ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (eb7bfed901b9 Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c
CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c
$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
Applying: lustre: fix ups for PAGE_CACHE_... removal
Merging char-misc/char-misc-next (f55532a0c0b8 Linux 4.6-rc1)
Merging extcon/extcon-next (f55532a0c0b8 Linux 4.6-rc1)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (cf5277b893e5 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c67f5db82027 virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb())
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (d75868496ca0 MAINTAINERS: Add mailing list for remote processor subsystems)
Merging gpio/for-next (8db9fce084e5 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (c0553d04f8d3 dt-bindings: arm: add DT binding for Marvell AP806 system controller)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (222d586ca829 Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (fc0c2028135c x86, pmem: use memcpy_mcsafe() for memcpy_from_pmem())
Merging akpm-current/current (7a55317f3165 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (a005321fd803 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the staging.current tree
From: Greg KH @ 2016-04-05 4:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Irina Tirdea, Jonathan Cameron
In-Reply-To: <20160405130326.03c74125@canb.auug.org.au>
On Tue, Apr 05, 2016 at 01:03:26PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/gyro/bmg160_core.c
>
> between commit:
>
> b475c59b113d ("iio: gyro: bmg160: fix buffer read values")
>
> from the staging.current tree and commit:
>
> 7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger handler")
>
> from the staging tree.
>
> I fixed it up (I used the version from the staging tree) 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.
Jonathan warned me about this, thanks for resolving it in your tree.
I'll fix it up in mine once they merge back together in a few weeks.
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the staging tree with Linus' tree
From: Stephen Rothwell @ 2016-04-05 3:49 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Kirill A. Shutemov
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/lustre/lnet/selftest/brw_test.c
drivers/staging/lustre/lustre/include/lu_object.h
drivers/staging/lustre/lustre/lclient/lcommon_cl.c
drivers/staging/lustre/lustre/llite/llite_internal.h
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/llite/llite_mmap.c
drivers/staging/lustre/lustre/llite/rw.c
drivers/staging/lustre/lustre/llite/rw26.c
drivers/staging/lustre/lustre/llite/vvp_io.c
drivers/staging/lustre/lustre/llite/vvp_page.c
drivers/staging/lustre/lustre/obdclass/class_obd.c
drivers/staging/lustre/lustre/obdecho/echo_client.c
drivers/staging/lustre/lustre/osc/lproc_osc.c
drivers/staging/lustre/lustre/osc/osc_cache.c
drivers/staging/lustre/lustre/osc/osc_page.c
drivers/staging/lustre/lustre/osc/osc_request.c
between commits:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage")
from Linus' tree and lots of commits from the staging tree.
I fixed it up (see below the signature) 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.
I also added this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Apr 2016 13:38:19 +1000
Subject: [PATCH] lustre: fix ups for PAGE_CACHE_... removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h | 2 +-
drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 ++--
drivers/staging/lustre/lustre/lov/lov_offset.c | 4 ++--
drivers/staging/lustre/lustre/lov/lov_page.c | 2 +-
drivers/staging/lustre/lustre/osc/osc_io.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
index 6f7a276b87b7..ac4e8cfe6c8c 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
@@ -46,7 +46,7 @@
#if BITS_PER_LONG == 32
/* limit to lowmem on 32-bit systems */
#define NUM_CACHEPAGES \
- min(totalram_pages, 1UL << (30 - PAGE_CACHE_SHIFT) * 3 / 4)
+ min(totalram_pages, 1UL << (30 - PAGE_SHIFT) * 3 / 4)
#else
#define NUM_CACHEPAGES totalram_pages
#endif
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index e35c1a1f272e..ea29cef8e559 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -498,7 +498,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
id.vpi_index = vmpage->index;
/* Cant support over 16T file */
nr = !(vmpage->index > 0xffffffff);
- page_cache_release(vmpage);
+ put_page(vmpage);
}
lu_object_ref_del(&clob->co_lu, "dump", current);
@@ -581,7 +581,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
page = cl_vmpage_page(vmpage, clob);
unlock_page(vmpage);
- page_cache_release(vmpage);
+ put_page(vmpage);
}
seq_printf(f, "%8x@" DFID ": ", id.vpi_index,
diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c b/drivers/staging/lustre/lustre/lov/lov_offset.c
index cb7b51617498..59dbdac37016 100644
--- a/drivers/staging/lustre/lustre/lov/lov_offset.c
+++ b/drivers/staging/lustre/lustre/lov/lov_offset.c
@@ -74,9 +74,9 @@ pgoff_t lov_stripe_pgoff(struct lov_stripe_md *lsm, pgoff_t stripe_index,
{
loff_t offset;
- offset = lov_stripe_size(lsm, stripe_index << PAGE_CACHE_SHIFT,
+ offset = lov_stripe_size(lsm, stripe_index << PAGE_SHIFT,
stripe);
- return offset >> PAGE_CACHE_SHIFT;
+ return offset >> PAGE_SHIFT;
}
/* we have an offset in file backed by an lov and want to find out where
diff --git a/drivers/staging/lustre/lustre/lov/lov_page.c b/drivers/staging/lustre/lustre/lov/lov_page.c
index 9634c13a574d..0306f00c3f33 100644
--- a/drivers/staging/lustre/lustre/lov/lov_page.c
+++ b/drivers/staging/lustre/lustre/lov/lov_page.c
@@ -83,7 +83,7 @@ static int lov_raid0_page_is_under_lock(const struct lu_env *env,
}
/* calculate the end of current stripe */
- pps = loo->lo_lsm->lsm_stripe_size >> PAGE_CACHE_SHIFT;
+ pps = loo->lo_lsm->lsm_stripe_size >> PAGE_SHIFT;
index = ((slice->cpl_index + pps) & ~(pps - 1)) - 1;
/* never exceed the end of the stripe */
diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c
index cf7743d2f148..894007854ce7 100644
--- a/drivers/staging/lustre/lustre/osc/osc_io.c
+++ b/drivers/staging/lustre/lustre/osc/osc_io.c
@@ -321,7 +321,7 @@ static int osc_io_rw_iter_init(const struct lu_env *env,
if (cl_io_is_append(io))
return 0;
- npages = io->u.ci_rw.crw_count >> PAGE_CACHE_SHIFT;
+ npages = io->u.ci_rw.crw_count >> PAGE_SHIFT;
if (io->u.ci_rw.crw_pos & ~PAGE_MASK)
++npages;
--
2.7.0
--
Cheers,
Stephen Rothwell
diff --cc drivers/staging/lustre/lnet/selftest/brw_test.c
index dcb6e506f592,1988cee36751..000000000000
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@@ -90,8 -90,7 +90,7 @@@ brw_client_init(sfw_test_instance_t *ts
* NB: this is not going to work for variable page size,
* but we have to keep it for compatibility
*/
- len = npg * PAGE_CACHE_SIZE;
+ len = npg * PAGE_SIZE;
-
} else {
test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
@@@ -278,8 -277,7 +277,7 @@@ brw_client_prep_rpc(sfw_test_unit_t *ts
opc = breq->blk_opc;
flags = breq->blk_flags;
npg = breq->blk_npg;
- len = npg * PAGE_CACHE_SIZE;
+ len = npg * PAGE_SIZE;
-
} else {
test_bulk_req_v1_t *breq = &tsi->tsi_u.bulk_v1;
diff --cc drivers/staging/lustre/lustre/include/lu_object.h
index 242bb1ef6245,fcb9db6e1f1a..000000000000
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@@ -1118,7 -1118,7 +1118,7 @@@ struct lu_context_key
{ \
type *value; \
\
- CLASSERT(PAGE_SIZE >= sizeof (*value)); \
- CLASSERT(PAGE_CACHE_SIZE >= sizeof(*value)); \
++ CLASSERT(PAGE_SIZE >= sizeof(*value)); \
\
value = kzalloc(sizeof(*value), GFP_NOFS); \
if (!value) \
diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
index e3c0f1dd4d31,ba24f09ba1f9..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@@ -981,7 -907,11 +907,11 @@@ static inline void ll_invalidate_page(s
if (!mapping)
return;
+ /*
+ * truncate_complete_page() calls
+ * a_ops->invalidatepage()->cl_page_delete()->vvp_page_delete().
+ */
- ll_teardown_mmaps(mapping, offset, offset + PAGE_CACHE_SIZE);
+ ll_teardown_mmaps(mapping, offset, offset + PAGE_SIZE);
truncate_complete_page(mapping, vmpage);
}
diff --cc drivers/staging/lustre/lustre/llite/llite_mmap.c
index 5b484e62ffd0,5b4382cca0d7..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@@ -57,10 -57,10 +57,10 @@@ void policy_from_vma(ldlm_policy_data_
struct vm_area_struct *vma, unsigned long addr,
size_t count)
{
- policy->l_extent.start = ((addr - vma->vm_start) & CFS_PAGE_MASK) +
+ policy->l_extent.start = ((addr - vma->vm_start) & PAGE_MASK) +
- (vma->vm_pgoff << PAGE_CACHE_SHIFT);
+ (vma->vm_pgoff << PAGE_SHIFT);
policy->l_extent.end = (policy->l_extent.start + count - 1) |
- ~CFS_PAGE_MASK;
+ ~PAGE_MASK;
}
struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
diff --cc drivers/staging/lustre/lustre/llite/rw.c
index edab6c5b7e50,7d5dd3848552..000000000000
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@@ -776,8 -643,8 +643,8 @@@ int ll_readahead(const struct lu_env *e
if (reserved != 0)
ll_ra_count_put(ll_i2sbi(inode), reserved);
- if (ra_end == end + 1 && ra_end == (kms >> PAGE_CACHE_SHIFT))
+ if (ra_end == end + 1 && ra_end == (kms >> PAGE_SHIFT))
- ll_ra_stats_inc(mapping, RA_STAT_EOF);
+ ll_ra_stats_inc(inode, RA_STAT_EOF);
/* if we didn't get to the end of the region we reserved from
* the ras we need to go back and update the ras so that the
diff --cc drivers/staging/lustre/lustre/llite/rw26.c
index 69aa15e8e3ef,65baeebead72..000000000000
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@@ -382,11 -367,11 +367,11 @@@ static ssize_t ll_direct_IO_26(struct k
CDEBUG(D_VFSTRACE,
"VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n",
inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
- file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
- MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
+ file_offset, file_offset, count >> PAGE_SHIFT,
+ MAX_DIO_SIZE >> PAGE_SHIFT);
/* Check that all user buffers are aligned as well */
- if (iov_iter_alignment(iter) & ~CFS_PAGE_MASK)
+ if (iov_iter_alignment(iter) & ~PAGE_MASK)
return -EINVAL;
env = cl_env_get(&refcheck);
@@@ -432,11 -417,11 +417,11 @@@
* page worth of page pointers = 4MB on i386.
*/
if (result == -ENOMEM &&
- size > (PAGE_CACHE_SIZE / sizeof(*pages)) *
- PAGE_CACHE_SIZE) {
+ size > (PAGE_SIZE / sizeof(*pages)) *
+ PAGE_SIZE) {
size = ((((size / 2) - 1) |
- ~CFS_PAGE_MASK) + 1) &
- CFS_PAGE_MASK;
+ ~PAGE_MASK) + 1) &
+ PAGE_MASK;
CDEBUG(D_VFSTRACE, "DIO size now %lu\n",
size);
continue;
@@@ -474,37 -488,159 +488,159 @@@ static int ll_write_begin(struct file *
loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata)
{
+ struct ll_cl_context *lcc;
+ struct lu_env *env;
+ struct cl_io *io;
+ struct cl_page *page;
+ struct cl_object *clob = ll_i2info(mapping->host)->lli_clob;
- pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+ pgoff_t index = pos >> PAGE_SHIFT;
- struct page *page;
- int rc;
- unsigned from = pos & (PAGE_SIZE - 1);
+ struct page *vmpage = NULL;
- unsigned int from = pos & (PAGE_CACHE_SIZE - 1);
++ unsigned int from = pos & (PAGE_SIZE - 1);
+ unsigned int to = from + len;
+ int result = 0;
- page = grab_cache_page_write_begin(mapping, index, flags);
- if (!page)
- return -ENOMEM;
+ CDEBUG(D_VFSTRACE, "Writing %lu of %d to %d bytes\n", index, from, len);
+
+ lcc = ll_cl_init(file, NULL);
+ if (IS_ERR(lcc)) {
+ result = PTR_ERR(lcc);
+ goto out;
+ }
+
+ env = lcc->lcc_env;
+ io = lcc->lcc_io;
+
+ /* To avoid deadlock, try to lock page first. */
+ vmpage = grab_cache_page_nowait(mapping, index);
+ if (unlikely(!vmpage || PageDirty(vmpage) || PageWriteback(vmpage))) {
+ struct vvp_io *vio = vvp_env_io(env);
+ struct cl_page_list *plist = &vio->u.write.vui_queue;
- *pagep = page;
+ /* if the page is already in dirty cache, we have to commit
+ * the pages right now; otherwise, it may cause deadlock
+ * because it holds page lock of a dirty page and request for
+ * more grants. It's okay for the dirty page to be the first
+ * one in commit page list, though.
+ */
+ if (vmpage && plist->pl_nr > 0) {
+ unlock_page(vmpage);
- page_cache_release(vmpage);
++ put_page(vmpage);
+ vmpage = NULL;
+ }
- rc = ll_prepare_write(file, page, from, from + len);
- if (rc) {
- unlock_page(page);
- put_page(page);
+ /* commit pages and then wait for page lock */
+ result = vvp_io_write_commit(env, io);
+ if (result < 0)
+ goto out;
+
+ if (!vmpage) {
+ vmpage = grab_cache_page_write_begin(mapping, index,
+ flags);
+ if (!vmpage) {
+ result = -ENOMEM;
+ goto out;
+ }
+ }
}
- return rc;
+
+ page = cl_page_find(env, clob, vmpage->index, vmpage, CPT_CACHEABLE);
+ if (IS_ERR(page)) {
+ result = PTR_ERR(page);
+ goto out;
+ }
+
+ lcc->lcc_page = page;
+ lu_ref_add(&page->cp_reference, "cl_io", io);
+
+ cl_page_assume(env, io, page);
+ if (!PageUptodate(vmpage)) {
+ /*
+ * We're completely overwriting an existing page,
+ * so _don't_ set it up to date until commit_write
+ */
+ if (from == 0 && to == PAGE_SIZE) {
+ CL_PAGE_HEADER(D_PAGE, env, page, "full page write\n");
+ POISON_PAGE(vmpage, 0x11);
+ } else {
+ /* TODO: can be optimized at OSC layer to check if it
+ * is a lockless IO. In that case, it's not necessary
+ * to read the data.
+ */
+ result = ll_prepare_partial_page(env, io, page);
+ if (result == 0)
+ SetPageUptodate(vmpage);
+ }
+ }
+ if (result < 0)
+ cl_page_unassume(env, io, page);
+ out:
+ if (result < 0) {
+ if (vmpage) {
+ unlock_page(vmpage);
- page_cache_release(vmpage);
++ put_page(vmpage);
+ }
+ if (!IS_ERR(lcc))
+ ll_cl_fini(lcc);
+ } else {
+ *pagep = vmpage;
+ *fsdata = lcc;
+ }
+ return result;
}
static int ll_write_end(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied,
- struct page *page, void *fsdata)
+ struct page *vmpage, void *fsdata)
{
+ struct ll_cl_context *lcc = fsdata;
+ struct lu_env *env;
+ struct cl_io *io;
+ struct vvp_io *vio;
+ struct cl_page *page;
- unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+ unsigned from = pos & (PAGE_SIZE - 1);
- int rc;
+ bool unplug = false;
+ int result = 0;
+
- page_cache_release(vmpage);
++ put_page(vmpage);
+
+ env = lcc->lcc_env;
+ page = lcc->lcc_page;
+ io = lcc->lcc_io;
+ vio = vvp_env_io(env);
+
+ LASSERT(cl_page_is_owned(page, io));
+ if (copied > 0) {
+ struct cl_page_list *plist = &vio->u.write.vui_queue;
+
+ lcc->lcc_page = NULL; /* page will be queued */
+
+ /* Add it into write queue */
+ cl_page_list_add(plist, page);
+ if (plist->pl_nr == 1) /* first page */
+ vio->u.write.vui_from = from;
+ else
+ LASSERT(from == 0);
+ vio->u.write.vui_to = from + copied;
+
+ /* We may have one full RPC, commit it soon */
+ if (plist->pl_nr >= PTLRPC_MAX_BRW_PAGES)
+ unplug = true;
+
+ CL_PAGE_DEBUG(D_VFSTRACE, env, page,
+ "queued page: %d.\n", plist->pl_nr);
+ } else {
+ cl_page_disown(env, io, page);
+
+ /* page list is not contiguous now, commit it now */
+ unplug = true;
+ }
- rc = ll_commit_write(file, page, from, from + copied);
- unlock_page(page);
- put_page(page);
+ if (unplug ||
+ file->f_flags & O_SYNC || IS_SYNC(file_inode(file)))
+ result = vvp_io_write_commit(env, io);
- return rc ?: copied;
+ ll_cl_fini(lcc);
+ return result >= 0 ? copied : result;
}
#ifdef CONFIG_MIGRATION
diff --cc drivers/staging/lustre/lustre/llite/vvp_io.c
index 85a835976174,aed7b8e41a51..000000000000
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@@ -95,6 -104,115 +104,115 @@@ static bool can_populate_pages(const st
return rc;
}
+ static void vvp_object_size_lock(struct cl_object *obj)
+ {
+ struct inode *inode = vvp_object_inode(obj);
+
+ ll_inode_size_lock(inode);
+ cl_object_attr_lock(obj);
+ }
+
+ static void vvp_object_size_unlock(struct cl_object *obj)
+ {
+ struct inode *inode = vvp_object_inode(obj);
+
+ cl_object_attr_unlock(obj);
+ ll_inode_size_unlock(inode);
+ }
+
+ /**
+ * Helper function that if necessary adjusts file size (inode->i_size), when
+ * position at the offset \a pos is accessed. File size can be arbitrary stale
+ * on a Lustre client, but client at least knows KMS. If accessed area is
+ * inside [0, KMS], set file size to KMS, otherwise glimpse file size.
+ *
+ * Locking: cl_isize_lock is used to serialize changes to inode size and to
+ * protect consistency between inode size and cl_object
+ * attributes. cl_object_size_lock() protects consistency between cl_attr's of
+ * top-object and sub-objects.
+ */
+ static int vvp_prep_size(const struct lu_env *env, struct cl_object *obj,
+ struct cl_io *io, loff_t start, size_t count,
+ int *exceed)
+ {
+ struct cl_attr *attr = vvp_env_thread_attr(env);
+ struct inode *inode = vvp_object_inode(obj);
+ loff_t pos = start + count - 1;
+ loff_t kms;
+ int result;
+
+ /*
+ * Consistency guarantees: following possibilities exist for the
+ * relation between region being accessed and real file size at this
+ * moment:
+ *
+ * (A): the region is completely inside of the file;
+ *
+ * (B-x): x bytes of region are inside of the file, the rest is
+ * outside;
+ *
+ * (C): the region is completely outside of the file.
+ *
+ * This classification is stable under DLM lock already acquired by
+ * the caller, because to change the class, other client has to take
+ * DLM lock conflicting with our lock. Also, any updates to ->i_size
+ * by other threads on this client are serialized by
+ * ll_inode_size_lock(). This guarantees that short reads are handled
+ * correctly in the face of concurrent writes and truncates.
+ */
+ vvp_object_size_lock(obj);
+ result = cl_object_attr_get(env, obj, attr);
+ if (result == 0) {
+ kms = attr->cat_kms;
+ if (pos > kms) {
+ /*
+ * A glimpse is necessary to determine whether we
+ * return a short read (B) or some zeroes at the end
+ * of the buffer (C)
+ */
+ vvp_object_size_unlock(obj);
+ result = cl_glimpse_lock(env, io, inode, obj, 0);
+ if (result == 0 && exceed) {
+ /* If objective page index exceed end-of-file
+ * page index, return directly. Do not expect
+ * kernel will check such case correctly.
+ * linux-2.6.18-128.1.1 miss to do that.
+ * --bug 17336
+ */
+ loff_t size = i_size_read(inode);
- loff_t cur_index = start >> PAGE_CACHE_SHIFT;
++ loff_t cur_index = start >> PAGE_SHIFT;
+ loff_t size_index = (size - 1) >>
- PAGE_CACHE_SHIFT;
++ PAGE_SHIFT;
+
+ if ((size == 0 && cur_index != 0) ||
+ size_index < cur_index)
+ *exceed = 1;
+ }
+ return result;
+ }
+ /*
+ * region is within kms and, hence, within real file
+ * size (A). We need to increase i_size to cover the
+ * read region so that generic_file_read() will do its
+ * job, but that doesn't mean the kms size is
+ * _correct_, it is only the _minimum_ size. If
+ * someone does a stat they will get the correct size
+ * which will always be >= the kms value here.
+ * b=11081
+ */
+ if (i_size_read(inode) < kms) {
+ i_size_write(inode, kms);
+ CDEBUG(D_VFSTRACE, DFID " updating i_size %llu\n",
+ PFID(lu_object_fid(&obj->co_lu)),
+ (__u64)i_size_read(inode));
+ }
+ }
+
+ vvp_object_size_unlock(obj);
+
+ return result;
+ }
+
/*****************************************************************************
*
* io operations.
@@@ -505,17 -708,14 +708,14 @@@ static int vvp_io_read_start(const stru
inode->i_ino, cnt, pos, i_size_read(inode));
/* turn off the kernel's read-ahead */
- cio->cui_fd->fd_file->f_ra.ra_pages = 0;
+ vio->vui_fd->fd_file->f_ra.ra_pages = 0;
/* initialize read-ahead window once per syscall */
- if (!vio->cui_ra_window_set) {
- vio->cui_ra_window_set = 1;
- bead->lrr_start = cl_index(obj, pos);
- /*
- * XXX: explicit PAGE_SIZE
- */
- bead->lrr_count = cl_index(obj, tot + PAGE_SIZE - 1);
- ll_ra_read_in(file, bead);
+ if (!vio->vui_ra_valid) {
+ vio->vui_ra_valid = true;
+ vio->vui_ra_start = cl_index(obj, pos);
- vio->vui_ra_count = cl_index(obj, tot + PAGE_CACHE_SIZE - 1);
++ vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
+ ll_ras_enter(file);
}
/* BUG: 5972 */
diff --cc drivers/staging/lustre/lustre/llite/vvp_page.c
index 33ca3eb34965,0c92293dbf2e..000000000000
--- a/drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_page.c
@@@ -52,12 -59,12 +59,12 @@@
*
*/
- static void vvp_page_fini_common(struct ccc_page *cp)
+ static void vvp_page_fini_common(struct vvp_page *vpg)
{
- struct page *vmpage = cp->cpg_page;
+ struct page *vmpage = vpg->vpg_page;
LASSERT(vmpage);
- page_cache_release(vmpage);
+ put_page(vmpage);
}
static void vvp_page_fini(const struct lu_env *env,
@@@ -530,27 -553,31 +553,31 @@@ static const struct cl_page_operations
};
int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
- struct cl_page *page, struct page *vmpage)
+ struct cl_page *page, pgoff_t index)
{
- struct ccc_page *cpg = cl_object_page_slice(obj, page);
+ struct vvp_page *vpg = cl_object_page_slice(obj, page);
+ struct page *vmpage = page->cp_vmpage;
- CLOBINVRNT(env, obj, ccc_object_invariant(obj));
+ CLOBINVRNT(env, obj, vvp_object_invariant(obj));
- cpg->cpg_page = vmpage;
+ vpg->vpg_page = vmpage;
- page_cache_get(vmpage);
+ get_page(vmpage);
- INIT_LIST_HEAD(&cpg->cpg_pending_linkage);
+ INIT_LIST_HEAD(&vpg->vpg_pending_linkage);
if (page->cp_type == CPT_CACHEABLE) {
+ /* in cache, decref in vvp_page_delete */
+ atomic_inc(&page->cp_ref);
SetPagePrivate(vmpage);
vmpage->private = (unsigned long)page;
- cl_page_slice_add(page, &cpg->cpg_cl, obj, &vvp_page_ops);
+ cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
+ &vvp_page_ops);
} else {
- struct ccc_object *clobj = cl2ccc(obj);
+ struct vvp_object *clobj = cl2vvp(obj);
- LASSERT(!inode_trylock(clobj->cob_inode));
- cl_page_slice_add(page, &cpg->cpg_cl, obj,
+ LASSERT(!inode_trylock(clobj->vob_inode));
+ cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
&vvp_transient_page_ops);
- clobj->cob_transient_pages++;
+ clobj->vob_transient_pages++;
}
return 0;
}
diff --cc drivers/staging/lustre/lustre/obdclass/class_obd.c
index c2cf015962dd,d9844ba8b9be..000000000000
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@@ -461,9 -461,9 +461,9 @@@ static int obd_init_checks(void
CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len);
ret = -EINVAL;
}
- if ((u64val & ~CFS_PAGE_MASK) >= PAGE_SIZE) {
- if ((u64val & ~PAGE_MASK) >= PAGE_CACHE_SIZE) {
++ if ((u64val & ~PAGE_MASK) >= PAGE_SIZE) {
CWARN("mask failed: u64val %llu >= %llu\n", u64val,
- (__u64)PAGE_CACHE_SIZE);
+ (__u64)PAGE_SIZE);
ret = -EINVAL;
}
diff --cc drivers/staging/lustre/lustre/obdecho/echo_client.c
index 1e83669c204d,a752bb4e946b..000000000000
--- a/drivers/staging/lustre/lustre/obdecho/echo_client.c
+++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c
@@@ -273,12 -266,10 +266,10 @@@ static void echo_page_completion(const
static void echo_page_fini(const struct lu_env *env,
struct cl_page_slice *slice)
{
- struct echo_page *ep = cl2echo_page(slice);
struct echo_object *eco = cl2echo_obj(slice->cpl_obj);
- struct page *vmpage = ep->ep_vmpage;
atomic_dec(&eco->eo_npages);
- put_page(vmpage);
- page_cache_release(slice->cpl_page->cp_vmpage);
++ put_page(slice->cpl_page->cp_vmpage);
}
static int echo_page_prep(const struct lu_env *env,
@@@ -372,10 -345,9 +345,9 @@@ static int echo_page_init(const struct
struct echo_page *ep = cl_object_page_slice(obj, page);
struct echo_object *eco = cl2echo_obj(obj);
- ep->ep_vmpage = vmpage;
- get_page(vmpage);
- page_cache_get(page->cp_vmpage);
++ get_page(page->cp_vmpage);
mutex_init(&ep->ep_lock);
- cl_page_slice_add(page, &ep->ep_cl, obj, &echo_page_ops);
+ cl_page_slice_add(page, &ep->ep_cl, obj, index, &echo_page_ops);
atomic_inc(&eco->eo_npages);
return 0;
}
@@@ -1470,11 -1429,11 +1429,11 @@@ static int echo_client_prep_commit(cons
u64 npages, tot_pages;
int i, ret = 0, brw_flags = 0;
- if (count <= 0 || (count & (~CFS_PAGE_MASK)) != 0)
+ if (count <= 0 || (count & (~PAGE_MASK)) != 0)
return -EINVAL;
- npages = batch >> PAGE_CACHE_SHIFT;
- tot_pages = count >> PAGE_CACHE_SHIFT;
+ npages = batch >> PAGE_SHIFT;
+ tot_pages = count >> PAGE_SHIFT;
lnb = kcalloc(npages, sizeof(struct niobuf_local), GFP_NOFS);
rnb = kcalloc(npages, sizeof(struct niobuf_remote), GFP_NOFS);
diff --cc drivers/staging/lustre/lustre/osc/lproc_osc.c
index a3358c39b2f1,911e5054a9c4..000000000000
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@@ -169,10 -169,10 +169,10 @@@ static ssize_t max_dirty_mb_store(struc
pages_number > totalram_pages / 4) /* 1/4 of RAM */
return -ERANGE;
- client_obd_list_lock(&cli->cl_loi_list_lock);
+ spin_lock(&cli->cl_loi_list_lock);
- cli->cl_dirty_max = (u32)(pages_number << PAGE_CACHE_SHIFT);
+ cli->cl_dirty_max = (u32)(pages_number << PAGE_SHIFT);
osc_wake_cache_waiters(cli);
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
return count;
}
@@@ -569,17 -577,17 +577,17 @@@ static ssize_t max_pages_per_rpc_store(
/* if the max_pages is specified in bytes, convert to pages */
if (val >= ONE_MB_BRW_SIZE)
- val >>= PAGE_CACHE_SHIFT;
+ val >>= PAGE_SHIFT;
- chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1);
+ chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_SHIFT)) - 1);
/* max_pages_per_rpc must be chunk aligned */
val = (val + ~chunk_mask) & chunk_mask;
- if (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) {
+ if (val == 0 || val > ocd->ocd_brw_size >> PAGE_SHIFT) {
return -ERANGE;
}
- client_obd_list_lock(&cli->cl_loi_list_lock);
+ spin_lock(&cli->cl_loi_list_lock);
cli->cl_max_pages_per_rpc = val;
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
return count;
}
diff --cc drivers/staging/lustre/lustre/osc/osc_cache.c
index 5f25bf83dcfc,d01f2a207a91..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@@ -543,8 -556,8 +556,8 @@@ static int osc_extent_merge(const struc
if (cur->oe_max_end != victim->oe_max_end)
return -ERANGE;
- LASSERT(cur->oe_osclock == victim->oe_osclock);
+ LASSERT(cur->oe_dlmlock == victim->oe_dlmlock);
- ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_CACHE_SHIFT;
+ ppc_bits = osc_cli(obj)->cl_chunkbits - PAGE_SHIFT;
chunk_start = cur->oe_start >> ppc_bits;
chunk_end = cur->oe_end >> ppc_bits;
if (chunk_start != (victim->oe_end >> ppc_bits) + 1 &&
@@@ -644,11 -657,15 +657,15 @@@ static struct osc_extent *osc_extent_fi
if (!cur)
return ERR_PTR(-ENOMEM);
- lock = cl_lock_at_pgoff(env, osc2cl(obj), index, NULL, 1, 0);
- LASSERT(lock->cll_descr.cld_mode >= CLM_WRITE);
+ olck = osc_env_io(env)->oi_write_osclock;
+ LASSERTF(olck, "page %lu is not covered by lock\n", index);
+ LASSERT(olck->ols_state == OLS_GRANTED);
+
+ descr = &olck->ols_cl.cls_lock->cll_descr;
+ LASSERT(descr->cld_mode >= CLM_WRITE);
- LASSERT(cli->cl_chunkbits >= PAGE_CACHE_SHIFT);
- ppc_bits = cli->cl_chunkbits - PAGE_CACHE_SHIFT;
+ LASSERT(cli->cl_chunkbits >= PAGE_SHIFT);
+ ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;
chunk_mask = ~((1 << ppc_bits) - 1);
chunksize = 1 << cli->cl_chunkbits;
chunk = index >> ppc_bits;
@@@ -1288,14 -1309,14 +1309,14 @@@ static int osc_refresh_count(const stru
if (result < 0)
return result;
kms = attr->cat_kms;
- if (cl_offset(obj, page->cp_index) >= kms)
+ if (cl_offset(obj, index) >= kms)
/* catch race with truncate */
return 0;
- else if (cl_offset(obj, page->cp_index + 1) > kms)
+ else if (cl_offset(obj, index + 1) > kms)
/* catch sub-page write at end of file */
- return kms % PAGE_CACHE_SIZE;
+ return kms % PAGE_SIZE;
else
- return PAGE_CACHE_SIZE;
+ return PAGE_SIZE;
}
static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
@@@ -1373,13 -1394,13 +1394,13 @@@
static void osc_consume_write_grant(struct client_obd *cli,
struct brw_page *pga)
{
- assert_spin_locked(&cli->cl_loi_list_lock.lock);
+ assert_spin_locked(&cli->cl_loi_list_lock);
LASSERT(!(pga->flag & OBD_BRW_FROM_GRANT));
atomic_inc(&obd_dirty_pages);
- cli->cl_dirty += PAGE_CACHE_SIZE;
+ cli->cl_dirty += PAGE_SIZE;
pga->flag |= OBD_BRW_FROM_GRANT;
CDEBUG(D_CACHE, "using %lu grant credits for brw %p page %p\n",
- PAGE_CACHE_SIZE, pga, pga->pg);
+ PAGE_SIZE, pga, pga->pg);
osc_update_next_shrink(cli);
}
@@@ -1467,9 -1488,9 +1488,9 @@@ static void osc_free_grant(struct clien
{
int grant = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
- client_obd_list_lock(&cli->cl_loi_list_lock);
+ spin_lock(&cli->cl_loi_list_lock);
atomic_sub(nr_pages, &obd_dirty_pages);
- cli->cl_dirty -= nr_pages << PAGE_CACHE_SHIFT;
+ cli->cl_dirty -= nr_pages << PAGE_SHIFT;
cli->cl_lost_grant += lost_grant;
if (cli->cl_avail_grant < grant && cli->cl_lost_grant >= grant) {
/* borrow some grant from truncate to avoid the case that
diff --cc drivers/staging/lustre/lustre/osc/osc_page.c
index ce9ddd515f64,82979f4039c1..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_page.c
+++ b/drivers/staging/lustre/lustre/osc/osc_page.c
@@@ -410,10 -309,10 +309,10 @@@ int osc_page_init(const struct lu_env *
int result;
opg->ops_from = 0;
- opg->ops_to = PAGE_CACHE_SIZE;
+ opg->ops_to = PAGE_SIZE;
- result = osc_prep_async_page(osc, opg, vmpage,
- cl_offset(obj, page->cp_index));
+ result = osc_prep_async_page(osc, opg, page->cp_vmpage,
+ cl_offset(obj, index));
if (result == 0) {
struct osc_io *oio = osc_env_io(env);
@@@ -486,10 -395,9 +395,9 @@@ static DECLARE_WAIT_QUEUE_HEAD(osc_lru_
/* LRU pages are freed in batch mode. OSC should at least free this
* number of pages to avoid running out of LRU budget, and..
*/
-static const int lru_shrink_min = 2 << (20 - PAGE_CACHE_SHIFT); /* 2M */
+static const int lru_shrink_min = 2 << (20 - PAGE_SHIFT); /* 2M */
/* free this number at most otherwise it will take too long time to finish. */
- static const int lru_shrink_max = 32 << (20 - PAGE_SHIFT); /* 32M */
-static const int lru_shrink_max = 8 << (20 - PAGE_CACHE_SHIFT); /* 8M */
++static const int lru_shrink_max = 8 << (20 - PAGE_SHIFT); /* 8M */
/* Check if we can free LRU slots from this OSC. If there exists LRU waiters,
* we should free slots aggressively. In this way, slots are freed in a steady
diff --cc drivers/staging/lustre/lustre/osc/osc_request.c
index 30526ebcad04,547539c74a7b..000000000000
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@@ -909,12 -910,12 +910,12 @@@ static void osc_shrink_grant_local(stru
static int osc_shrink_grant(struct client_obd *cli)
{
__u64 target_bytes = (cli->cl_max_rpcs_in_flight + 1) *
- (cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT);
+ (cli->cl_max_pages_per_rpc << PAGE_SHIFT);
- client_obd_list_lock(&cli->cl_loi_list_lock);
+ spin_lock(&cli->cl_loi_list_lock);
if (cli->cl_avail_grant <= target_bytes)
- target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;
+ target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
return osc_shrink_grant_to_target(cli, target_bytes);
}
@@@ -929,14 -930,14 +930,14 @@@ int osc_shrink_grant_to_target(struct c
* We don't want to shrink below a single RPC, as that will negatively
* impact block allocation and long-term performance.
*/
- if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT)
- target_bytes = cli->cl_max_pages_per_rpc << PAGE_CACHE_SHIFT;
+ if (target_bytes < cli->cl_max_pages_per_rpc << PAGE_SHIFT)
+ target_bytes = cli->cl_max_pages_per_rpc << PAGE_SHIFT;
if (target_bytes >= cli->cl_avail_grant) {
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
return 0;
}
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
body = kzalloc(sizeof(*body), GFP_NOFS);
if (!body)
@@@ -1052,8 -1053,8 +1053,8 @@@ static void osc_init_grant(struct clien
}
/* determine the appropriate chunk size used by osc_extent. */
- cli->cl_chunkbits = max_t(int, PAGE_CACHE_SHIFT, ocd->ocd_blocksize);
+ cli->cl_chunkbits = max_t(int, PAGE_SHIFT, ocd->ocd_blocksize);
- client_obd_list_unlock(&cli->cl_loi_list_lock);
+ spin_unlock(&cli->cl_loi_list_lock);
CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld chunk bits: %d\n",
cli->cl_import->imp_obd->obd_name,
@@@ -1992,8 -2006,8 +2006,8 @@@ int osc_build_rpc(const struct lu_env *
if (tmp)
tmp->oap_request = ptlrpc_request_addref(req);
- client_obd_list_lock(&cli->cl_loi_list_lock);
+ spin_lock(&cli->cl_loi_list_lock);
- starting_offset >>= PAGE_CACHE_SHIFT;
+ starting_offset >>= PAGE_SHIFT;
if (cmd == OBD_BRW_READ) {
cli->cl_r_in_flight++;
lprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count);
@@@ -2787,15 -2779,15 +2779,15 @@@ out
goto skip_locking;
policy.l_extent.start = fm_key->fiemap.fm_start &
- CFS_PAGE_MASK;
+ PAGE_MASK;
if (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <=
- fm_key->fiemap.fm_start + PAGE_CACHE_SIZE - 1)
+ fm_key->fiemap.fm_start + PAGE_SIZE - 1)
policy.l_extent.end = OBD_OBJECT_EOF;
else
policy.l_extent.end = (fm_key->fiemap.fm_start +
fm_key->fiemap.fm_length +
- PAGE_SIZE - 1) & CFS_PAGE_MASK;
- PAGE_CACHE_SIZE - 1) & PAGE_MASK;
++ PAGE_SIZE - 1) & PAGE_MASK;
ostid_build_res_name(&fm_key->oa.o_oi, &res_id);
mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
^ permalink raw reply related
* linux-next: manual merge of the staging tree with the staging.current tree
From: Stephen Rothwell @ 2016-04-05 3:03 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Irina Tirdea, Jonathan Cameron
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/iio/gyro/bmg160_core.c
between commit:
b475c59b113d ("iio: gyro: bmg160: fix buffer read values")
from the staging.current tree and commit:
7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger handler")
from the staging tree.
I fixed it up (I used the version from the staging tree) 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: please clean up the ceph tree
From: Stephen Rothwell @ 2016-04-05 0:42 UTC (permalink / raw)
To: Sage Weil; +Cc: linux-next, linux-kernel
Hi Sage,
It appears that the ceph tree was completely rebased before asking Linus to
merge it (to remove its first commit (ebfadc523e06 "[DO NOT MERGE] rbd:
bump RBD_MAX_PARENT_CHAIN_LEN to 128")). Please clean it up as it is
starting to produce comflicts in linux-next (against Linus' tree so far).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the btrfs-kdave tree with Linus' tree
From: Stephen Rothwell @ 2016-04-05 0:32 UTC (permalink / raw)
To: David Sterba; +Cc: linux-next, linux-kernel, Kirill A. Shutemov, Liu Bo
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/extent_io.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
from Linus' tree and commit:
a7424783a24d ("Btrfs: make mapping->writeback_index point to the last written page")
from the btrfs-kdave tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/btrfs/extent_io.c
index d247fc0eea19,46a5c12906ae..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -3946,8 -3945,10 +3943,10 @@@ static int extent_write_cache_pages(str
index = mapping->writeback_index; /* Start from prev offset */
end = -1;
} else {
- index = wbc->range_start >> PAGE_CACHE_SHIFT;
- end = wbc->range_end >> PAGE_CACHE_SHIFT;
+ index = wbc->range_start >> PAGE_SHIFT;
+ end = wbc->range_end >> PAGE_SHIFT;
+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
+ range_whole = 1;
scanned = 1;
}
if (wbc->sync_mode == WB_SYNC_ALL)
^ permalink raw reply
* linux-next: manual merge of the btrfs-kdave tree with Linus' tree
From: Stephen Rothwell @ 2016-04-05 0:32 UTC (permalink / raw)
To: David Sterba; +Cc: linux-next, linux-kernel, Anand Jain, Kirill A. Shutemov
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/volumes.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
from Linus' tree and commit:
b54a17371a08 ("btrfs: create a helper function to read the disk super")
from the btrfs-kdave tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/btrfs/volumes.c
index bd0f45fb38c4,09ca95083674..000000000000
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -988,6 -1004,56 +1004,56 @@@ int btrfs_open_devices(struct btrfs_fs_
return ret;
}
+ void btrfs_release_disk_super(struct page *page)
+ {
+ kunmap(page);
- page_cache_release(page);
++ put_page(page);
+ }
+
+ int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr,
+ struct page **page, struct btrfs_super_block **disk_super)
+ {
+ void *p;
+ pgoff_t index;
+
+ /* make sure our super fits in the device */
- if (bytenr + PAGE_CACHE_SIZE >= i_size_read(bdev->bd_inode))
++ if (bytenr + PAGE_SIZE >= i_size_read(bdev->bd_inode))
+ return 1;
+
+ /* make sure our super fits in the page */
- if (sizeof(**disk_super) > PAGE_CACHE_SIZE)
++ if (sizeof(**disk_super) > PAGE_SIZE)
+ return 1;
+
+ /* make sure our super doesn't straddle pages on disk */
- index = bytenr >> PAGE_CACHE_SHIFT;
- if ((bytenr + sizeof(**disk_super) - 1) >> PAGE_CACHE_SHIFT != index)
++ index = bytenr >> PAGE_SHIFT;
++ if ((bytenr + sizeof(**disk_super) - 1) >> PAGE_SHIFT != index)
+ return 1;
+
+ /* pull in the page with our super */
+ *page = read_cache_page_gfp(bdev->bd_inode->i_mapping,
+ index, GFP_KERNEL);
+
+ if (IS_ERR_OR_NULL(*page))
+ return 1;
+
+ p = kmap(*page);
+
+ /* align our pointer to the offset of the super block */
- *disk_super = p + (bytenr & ~PAGE_CACHE_MASK);
++ *disk_super = p + (bytenr & ~PAGE_MASK);
+
+ if (btrfs_super_bytenr(*disk_super) != bytenr ||
+ btrfs_super_magic(*disk_super) != BTRFS_MAGIC) {
+ btrfs_release_disk_super(*page);
+ return 1;
+ }
+
+ if ((*disk_super)->label[0] &&
+ (*disk_super)->label[BTRFS_LABEL_SIZE - 1])
+ (*disk_super)->label[BTRFS_LABEL_SIZE - 1] = '\0';
+
+ return 0;
+ }
+
/*
* Look for a btrfs signature on a device. This may be called out of the mount path
* and we are not allowed to call set_blocksize during the scan. The superblock
^ permalink raw reply
* linux-next: manual merge of the btrfs-kdave tree with Linus' tree
From: Stephen Rothwell @ 2016-04-05 0:32 UTC (permalink / raw)
To: David Sterba; +Cc: linux-next, linux-kernel, Kirill A. Shutemov, Josef Bacik
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/file.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
from Linus' tree and commit:
201c5fdc44d7 ("Btrfs: don't do nocow check unless we have to")
from the btrfs-kdave tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/btrfs/file.c
index cf31a60c6284,1bc8d464d415..000000000000
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@@ -1534,30 -1534,30 +1534,30 @@@ static noinline ssize_t __btrfs_buffere
reserve_bytes = round_up(write_bytes + sector_offset,
root->sectorsize);
- if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
- BTRFS_INODE_PREALLOC)) &&
- check_can_nocow(inode, pos, &write_bytes) > 0) {
- /*
- * For nodata cow case, no need to reserve
- * data space.
- */
- only_release_metadata = true;
- /*
- * our prealloc extent may be smaller than
- * write_bytes, so scale down.
- */
- num_pages = DIV_ROUND_UP(write_bytes + offset,
- PAGE_SIZE);
- reserve_bytes = round_up(write_bytes + sector_offset,
- root->sectorsize);
- goto reserve_metadata;
- }
-
ret = btrfs_check_data_free_space(inode, pos, write_bytes);
- if (ret < 0)
- break;
+ if (ret < 0) {
+ if ((BTRFS_I(inode)->flags & (BTRFS_INODE_NODATACOW |
+ BTRFS_INODE_PREALLOC)) &&
+ check_can_nocow(inode, pos, &write_bytes) > 0) {
+ /*
+ * For nodata cow case, no need to reserve
+ * data space.
+ */
+ only_release_metadata = true;
+ /*
+ * our prealloc extent may be smaller than
+ * write_bytes, so scale down.
+ */
+ num_pages = DIV_ROUND_UP(write_bytes + offset,
- PAGE_CACHE_SIZE);
++ PAGE_SIZE);
+ reserve_bytes = round_up(write_bytes +
+ sector_offset,
+ root->sectorsize);
+ } else {
+ break;
+ }
+ }
- reserve_metadata:
ret = btrfs_delalloc_reserve_metadata(inode, reserve_bytes);
if (ret) {
if (!only_release_metadata)
^ 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