* next-20170117 build: 0 failures 3 warnings (next-20170117)
From: Build bot for Mark Brown @ 2017-01-17 7:54 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170117
Git describe: next-20170117
Commit: a65f0161f4 Add linux-next specific files for 20170117
Build Time: 101 min 43 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 3
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 3
1 ../drivers/rtc/rtc-stm32.c:673:51: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/rtc/rtc-stm32.c:651:51: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/rtc/rtc-stm32.c:651:51: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/rtc/rtc-stm32.c:673:51: warning: large integer implicitly truncated to unsigned type [-Woverflow]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: build warning after merge of the wireless-drivers-next tree
From: Kalle Valo @ 2017-01-17 11:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Wireless, linux-next, linux-kernel, Xinming Hu, Amitkumar Karwar
In-Reply-To: <87shonjcle.fsf@codeaurora.org>
Kalle Valo <kvalo@codeaurora.org> writes:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> Hi all,
>>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (x86_64 allmodconfig) produced this warning:
>>
>> drivers/net/wireless/marvell/mwifiex/pcie.c: In function 'mwifiex_pcie_remove':
>> drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status' may be used uninitialized in this function [-Wmaybe-uninitialized]
>> if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
>> ^
>>
>> Introduced by commit
>>
>> 045f0c1b5e26 ("mwifiex: get rid of global user_rmmod flag")
>>
>> This is not a false positive since "reg" could be NULL just above
>> (otherwise it would be tested for).
>
> Thanks, I noticed this myself yesterday (after I had applied the patch)
> and I have asked Marvell to send a fix.
I missed that Arnd had already sent a fix, I'll apply that one:
mwifiex: fix uninitialized variable access in pcie_remove
https://patchwork.kernel.org/patch/9515899/
--
Kalle Valo
^ permalink raw reply
* Re: linux-next 0112 tree breaks fs DAX
From: Dave Jiang @ 2017-01-17 16:05 UTC (permalink / raw)
To: Stephen Rothwell, Xiong Zhou
Cc: linux-nvdimm-y27Ovi1pjclAfugRpC6u6w, Zwisler, Ross,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA, Andrew Morton
In-Reply-To: <20170116214543.1388c2e9-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
On 01/16/2017 03:45 AM, Stephen Rothwell wrote:
> Hi Xiong,
>
> Just cc'ing Andrew.
>
> On Mon, 16 Jan 2017 17:29:16 +0800 Xiong Zhou <xzhou-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>
>> On Fri, Jan 13, 2017 at 06:16:41PM +0800, Xiong Zhou wrote:
>>> Hi,
>>>
>>> These cases "hang" when testing with -o dax mount option:
>>> xfstests generic/030 generic/34{0,4,5,6} generic/198
>>> (maybe more)
>>>
>>> The test programme holetest or aiodio keep running for a
>>> long time. It's killable, but it seems never return.
>>>
>>> With both ext4 and xfs as fs.
>>>
>>> Without -o dax mount option, cases pass in seconds.
>>>
>>> 0111 tree passed the tests.
>>>
>>> sh-4.2# git log --oneline next-20170111..next-20170112 fs/dax.c
>>> 0c9a7909dd13 mm, dax: change pmd_fault() to take only vmf parameter
>>> f8dbc198d4ea mm, dax: make pmd_fault() and friends be the same as fault()
>>
>> 0112 tree with above 2 commits reverted pass the tests.
>
Thanks. I will debug.
^ permalink raw reply
* Re: linux-next 0112 tree breaks fs DAX
From: Dave Jiang @ 2017-01-17 18:13 UTC (permalink / raw)
To: Stephen Rothwell, Xiong Zhou
Cc: linux-nvdimm-y27Ovi1pjclAfugRpC6u6w, Zwisler, Ross,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA, Andrew Morton
In-Reply-To: <833df5ca-39a5-f402-fcd1-985217a55a85-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
On 01/17/2017 09:05 AM, Dave Jiang wrote:
> On 01/16/2017 03:45 AM, Stephen Rothwell wrote:
>> Hi Xiong,
>>
>> Just cc'ing Andrew.
>>
>> On Mon, 16 Jan 2017 17:29:16 +0800 Xiong Zhou <xzhou-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>>
>>> On Fri, Jan 13, 2017 at 06:16:41PM +0800, Xiong Zhou wrote:
>>>> Hi,
>>>>
>>>> These cases "hang" when testing with -o dax mount option:
>>>> xfstests generic/030 generic/34{0,4,5,6} generic/198
>>>> (maybe more)
>>>>
>>>> The test programme holetest or aiodio keep running for a
>>>> long time. It's killable, but it seems never return.
>>>>
>>>> With both ext4 and xfs as fs.
>>>>
>>>> Without -o dax mount option, cases pass in seconds.
>>>>
>>>> 0111 tree passed the tests.
>>>>
>>>> sh-4.2# git log --oneline next-20170111..next-20170112 fs/dax.c
>>>> 0c9a7909dd13 mm, dax: change pmd_fault() to take only vmf parameter
>>>> f8dbc198d4ea mm, dax: make pmd_fault() and friends be the same as fault()
>>>
>>> 0112 tree with above 2 commits reverted pass the tests.
>>
>
> Thanks. I will debug.
>
Xiong,
I think I reproduced the issue, but only on the second commit
0c9a7909dd13 and not the first one f8dbc198d4ea. Can you please confirm
that "f8dbc198d4ea mm, dax: make pmd_fault() and friends be the same as
fault()" is ok or the failure starts with that? Thanks!
^ permalink raw reply
* Re: linux-next 0112 tree breaks fs DAX
From: Dave Jiang @ 2017-01-17 20:25 UTC (permalink / raw)
To: Stephen Rothwell, Xiong Zhou
Cc: linux-nvdimm-y27Ovi1pjclAfugRpC6u6w, Zwisler, Ross,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA, Andrew Morton
In-Reply-To: <711fc876-c805-8483-a6af-f4e3c8369084-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
On 01/17/2017 11:13 AM, Dave Jiang wrote:
>
>
> On 01/17/2017 09:05 AM, Dave Jiang wrote:
>> On 01/16/2017 03:45 AM, Stephen Rothwell wrote:
>>> Hi Xiong,
>>>
>>> Just cc'ing Andrew.
>>>
>>> On Mon, 16 Jan 2017 17:29:16 +0800 Xiong Zhou <xzhou-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>>>
>>>> On Fri, Jan 13, 2017 at 06:16:41PM +0800, Xiong Zhou wrote:
>>>>> Hi,
>>>>>
>>>>> These cases "hang" when testing with -o dax mount option:
>>>>> xfstests generic/030 generic/34{0,4,5,6} generic/198
>>>>> (maybe more)
>>>>>
>>>>> The test programme holetest or aiodio keep running for a
>>>>> long time. It's killable, but it seems never return.
>>>>>
>>>>> With both ext4 and xfs as fs.
>>>>>
>>>>> Without -o dax mount option, cases pass in seconds.
>>>>>
>>>>> 0111 tree passed the tests.
>>>>>
>>>>> sh-4.2# git log --oneline next-20170111..next-20170112 fs/dax.c
>>>>> 0c9a7909dd13 mm, dax: change pmd_fault() to take only vmf parameter
>>>>> f8dbc198d4ea mm, dax: make pmd_fault() and friends be the same as fault()
>>>>
>>>> 0112 tree with above 2 commits reverted pass the tests.
>>>
>>
>> Thanks. I will debug.
>>
>
> Xiong,
> I think I reproduced the issue, but only on the second commit
> 0c9a7909dd13 and not the first one f8dbc198d4ea. Can you please confirm
> that "f8dbc198d4ea mm, dax: make pmd_fault() and friends be the same as
> fault()" is ok or the failure starts with that? Thanks!
Actually nevermind. I am able to reproduce on the first commit now. Thanks.
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2017-01-17 22:49 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM, Russell King
Cc: Florian Fainelli, Linus Walleij, linux-next, linux-kernel
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/mach-ux500/platsmp.c
between commit:
6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol")
from the arm tree and commit:
9e634cae7256 ("ARM: ux500: simplify secondary boot")
from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/mach-ux500/platsmp.c
index 8c8f26389067,e0ee139fdebf..000000000000
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@@ -92,7 -73,19 +73,19 @@@ static void __init ux500_smp_prepare_cp
static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- wakeup_secondary();
+ /*
+ * write the address of secondary startup into the backup ram register
+ * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the
+ * backup ram register at offset 0x1FF0, which is what boot rom code
+ * is waiting for. This will wake up the secondary core from WFE.
+ */
- writel(virt_to_phys(secondary_startup),
++ writel(__pa_symbol(secondary_startup),
+ backupram + UX500_CPU1_JUMPADDR_OFFSET);
+ writel(0xA1FEED01,
+ backupram + UX500_CPU1_WAKEMAGIC_OFFSET);
+
+ /* make sure write buffer is drained */
+ mb();
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
return 0;
}
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Florian Fainelli @ 2017-01-17 22:53 UTC (permalink / raw)
To: Stephen Rothwell, Olof Johansson, Arnd Bergmann, ARM,
Russell King
Cc: Linus Walleij, linux-next, linux-kernel
In-Reply-To: <20170118094929.7d79bb55@canb.auug.org.au>
On 01/17/2017 02:49 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in:
>
> arch/arm/mach-ux500/platsmp.c
>
> between commit:
>
> 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol")
>
> from the arm tree and commit:
>
> 9e634cae7256 ("ARM: ux500: simplify secondary boot")
>
> from the arm-soc 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.
Your resolution looks correct, thanks Stephen!
--
Florian
^ permalink raw reply
* linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Stephen Rothwell @ 2017-01-17 22:55 UTC (permalink / raw)
To: Kevin Hilman, Carlo Caione, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Neil Armstrong, Martin Blumenstingl
Hi all,
Today's linux-next merge of the amlogic tree got a conflict in:
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
between commit:
f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")
from the arm-soc tree and commit:
47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")
from the amlogic tree.
I fixed it up (the latter moved the code modified by the former into
another file, but also incorporated the change from the former) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warnings after merge of the net-next tree
From: Stephen Rothwell @ 2017-01-18 0:37 UTC (permalink / raw)
To: David Miller, Networking; +Cc: linux-next, linux-kernel, Ganesh Goudar
Hi all,
After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c: In function 'init_one':
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4646:9: warning: unused variable 'port_vec' [-Wunused-variable]
u32 v, port_vec;
^
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:4646:6: warning: unused variable 'v' [-Wunused-variable]
u32 v, port_vec;
^
Introduced by commit
96fe11f27b70 ("cxgb4: Implement ndo_get_phys_port_id for mgmt dev")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Jan 18
From: Stephen Rothwell @ 2017-01-18 5:32 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170117:
The arm-soc tree gained a conflict against the arm tree.
The amlogic tree gained a conflict against the arm-soc tree.
Non-merge commits (relative to Linus' tree): 3676
4511 files changed, 139928 insertions(+), 85028 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 251 trees (counting Linus' and 36 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (4b19a9e20bf9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (1adc3c8a6aad ARCv2: smp-boot: MCIP: use Inter-Core-Debug unit to kick start non master cpus)
Merging arm-current/fixes (90f92c631b21 ARM: 8613/1: Fix the uaccess crash on PB11MPCore)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (69973b830859 Linux 4.9)
Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (93b43fd137cd net: phy: dp83848: add DP83620 PHY support)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (e4670b058af6 netfilter: Fix typo in NF_CONNTRACK Kconfig option description)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (7195439d1d71 Revert "bcma: init serial console directly from ChipCommon code")
Merging mac80211/master (dbef53621116 mac80211: prevent skb/txq mismatch)
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (ea2a7fb12093 Revert "PCI: Add runtime PM support for PCIe ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (833674a45ec7 Merge tag 'fixes-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (49def1853334 Linux 4.10-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (a121103c9228 Linux 4.10-rc3)
Merging char-misc.current/char-misc-linus (49def1853334 Linux 4.10-rc4)
Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data)
Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (94a6fa899d2c vfio/type1: Remove pid_namespace.h include)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (f80c2fb63295 Merge tag 'gvt-fixes-2017-01-16' of https://github.com/01org/gvt-linux into drm-intel-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (7e9081c5aac7 drm/fence: fix memory overwrite when setting out_fence fd)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (01c4a81b2c85 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (cd53ed64f89f Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (5853b79aff8b Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (3d928ca85412 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (1393f73bb898 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (45f49b8d26ee Merge branch 'for_4.11/keystone_config' into next)
Merging mvebu/for-next (6b0b30683cca Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (8b5a738803d5 Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (ad240de8a360 Merge branch 'dts-for-4.11' into all-for-4.11)
Merging renesas/next (e11adf249ffd Merge branches 'arm64-dt-for-v4.11' and 'dt-for-v4.11' into next)
Merging rockchip/for-next (07bfba71f858 Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (769b280fb822 Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (829d2bd13392 arm64: entry-ftrace.S: avoid open-coded {adr,ldr}_l)
Merging clk/clk-next (89d5dcc48c08 clk: stm32f4: avoid uninitialized variable access)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (9a6134fbcc5b m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (82e014238f8a MIPS: Avoid old-style declaration)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (c6f6634721c8 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9437964885f8 s390/bpf: remove redundant check for non-null image)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (69a582fdbc94 Merge branch 'for-next-next-v4.11-20170111' into for-next-20170111)
Merging ceph/master (84fcc2d2bd6c ceph: fix get_oldest_context())
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (ad4d05329df5 udf: Make stat on symlink report symlink length as st_size)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (b63f5e84826b GFS2: Wake up io waiters whenever a flush is done)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (5cf7a0f3442b Merge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging nfsd/nfsd-next (799322e05df0 nfsd: opt in to labeled nfs per export)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (c3c869966480 ovl: fix reStructuredText syntax errors in documentation)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (657bdfb7f5e6 xfs: don't wrap ID in xfs_dq_get_next_id)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (7ce7d89f4883 Linux 4.10-rc1)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (b8ecb5c4a454 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (701dc207bf55 i2c: piix4: Avoid race conditions with IMC)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (c72eeabd0ca8 hwmon: (adc128d818) Preserve operation mode)
Merging jc_docs/docs-next (43d8808b0820 Documentation: cpuset: Fix 'cpuset.tasks' -> 'tasks')
Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
Merging pm/linux-next (a121103c9228 Linux 4.10-rc3)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cad8f6c4f660 Merge branches 'ida-conversion' and 'thermal-core' into next)
Merging thermal-soc/next (18591add41ec thermal: rockchip: handle set_trips without the trip points)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (602d9858f07c swiotlb: ensure that page-sized mappings are page-aligned)
Merging net-next/master (0e40f4c9593b tcp: accept RST for rcv_nxt - 1 after receiving a FIN)
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (726282aa6bbe IPsec: do not ignore crypto err in ah6 input)
Merging netfilter-next/master (ec2318904965 xtables: extend matches and targets with .usersize)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (7f2f61377bca rtlwifi: rtl8192de: Remove a pointless goto)
Merging bluetooth/master (4289e60cb056 Merge branch 'tc-skb-diet')
Merging mac80211-next/master (c88215d7050f cfg80211: Fix documentation for connect result)
Merging rdma/for-next (102c5ce082f5 RDMA/cma: use cached port state when bind loopback)
Merging rdma-leon/rdma-next (ee02a82baec7 Merge branch 'topic/odp-ksm' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
Merging crypto/master (87170961f312 crypto: virtio - adjust priority of algorithm)
Merging drm/drm-next (282d0a35c8c4 Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
Merging drm-panel/drm/panel/for-next (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel())
Merging drm-intel/for-linux-next (a5e4c7d0aa67 drm/i915: Ignore bogus plane coordinates on SKL when the plane is not visible)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (8e945cba255f drm: qxl: Let DRM core handle connector registering)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (bc34c1af0a28 Merge branches 'sunxi/clk-for-4.11', 'sunxi/core-for-4.11', 'sunxi/defconfig-for-4.11', 'sunxi/drm-for-4.11', 'sunxi/dt-for-4.11', 'sunxi/dt64-for-4.11' and 'sunxi/fixes-for-4.10' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (8b169cb27c82 ALSA: mips: avoid potential uninitialized variable use)
Merging sound-asoc/for-next (c4dcca0a1d05 Merge remote-tracking branches 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (259b77ef853c Input: tca8418 - use the interrupt trigger from the device tree)
Merging block/for-next (c21e2a700ada Merge branch 'for-4.11/block' into for-next)
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in block/blk-mq.c
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (5766c95d0c8f mmc: core: Don't use extern declarations of public mmc functions)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (46d47f14bddb md/r5cache: enable chunk_aligned_read with write back cache)
Merging mfd/for-mfd-next (ffd2217c7621 mfd: ab8500-sysctrl: Handle probe deferral)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (d04ba0a2cbaa power: supply: max14656: fix platform_no_drv_owner.cocci warnings)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (4dc8f39eb379 Merge remote-tracking branches 'regulator/topic/arizona' and 'regulator/topic/supplies' into regulator-next)
Merging security/next (3ccb76c5dfe0 apparmor: fix undefined reference to `aa_g_hash_policy')
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (8e25809f17af tpm: Do not print an error message when doing TPM auto startup)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (89670affa2a6 audit: Make AUDIT_ANOM_ABEND event normalized)
Merging devicetree/for-next (25dc3bbc55a6 serial: fsl-imx-uart.txt: Remove generic property)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (c438d5effe2a Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (8266f4d2b1da Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (f5c61277f67f EDAC, i82975x: Add ioremap_nocache() error handling)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (3dbb16b87b57 selftests: ftrace: Shift down default message verbosity)
Merging rcu/rcu/next (e0de3b0ef7dd doc: Add mid-boot operation to expedited grace periods)
Merging kvm/linux-next (0f89b207b04a kvm: svm: Use the hardware provided GPA instead of page walk)
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
Merging kvms390/next (40d9766ee501 KVM: s390: Introduce BCD Vector Instructions to the guest)
Merging xen-tip/linux-next (da72ff5bfcb0 partially revert "xen: Remove event channel notification through Xen PCI platform device")
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (c97ce278336b platform/x86: surface3-wmi: Shut up unused-function warning)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (5593edfbfa30 Merge 4.10-rc4 into driver-core-next)
Merging tty/tty-next (11cca3d12f03 Merge 4.10-rc4 into tty-next)
Merging usb/usb-next (a47b66da0380 Merge 4.10-rc4 into usb-next)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (2eee05020a0e USB: serial: opticon: fix CTS retrieval at open)
Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API)
Merging phy-next/next (a8df2768c2ed drivers: phy: constify phy_ops structures)
Merging staging/staging-next (1fac9c5a6c2a staging:r8188eu: remove unused rx_head member of struct recv_frame)
Merging char-misc/char-misc-next (39461ffdfc97 Merge 4.10-rc4 into char-misc-next)
Merging extcon/extcon-next (86d6cda68f37 extcon: Modify the name of EXTCON_USB_HOST connector)
Merging slave-dma/next (7919f00e4fdf Merge branch 'topic/zx' into next)
Merging cgroup/for-next (e055b0e58d99 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (b32d9f752e17 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (2c0f83f328fc scsi: qla4xxx: remove two unused MSI-X related #defines)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (084496c62f5e Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (6bdf1e0efb04 Makefile: drop -D__CHECK_ENDIAN__ from cflags)
Merging rpmsg/for-next (b3fe73f333cf Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (bb272e8f306a Merge branch 'devel' into for-next)
Merging pinctrl/for-next (83b7a967ce87 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (0caf7752a2d0 Merge branch 'for-4.11/core' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (93362fa47fe9 sysctl: Drop reference added by grab_header in proc_sys_readdir)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (3e91293ffcca selftests: x86 protection_keys remove dead code)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (f614cc8526df rtc: stm32: fix comparison warnings)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (17392e0a2afb ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: Reimplement IDR and IDA using the radix tree
Applying: idr: support storing NULL in the IDR
Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: kernel/exit: compute current directly
Applying: drivers/tty: compute current directly
Applying: kernel/locking: compute current directly
Applying: sched: remove set_task_state()
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (d7bc87b4f48c mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* next-20170118 build: 0 failures 0 warnings (next-20170118)
From: Build bot for Mark Brown @ 2017-01-18 8:58 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170118
Git describe: next-20170118
Commit: 8fd170ca36 Add linux-next specific files for 20170118
Build Time: 105 min 43 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 0
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
-------------------------------------------------------------------------------
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Kevin Hilman @ 2017-01-18 19:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Neil Armstrong, Martin Blumenstingl, linux-kernel,
Olof Johansson, linux-next, Carlo Caione, ARM
In-Reply-To: <20170118095531.37f33df0@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
>
> between commit:
>
> f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")
>
> from the arm-soc tree and commit:
>
> 47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")
>
> from the amlogic tree.
The latter has been dropped from the amlogic pending some ongoing
discussion, but I forgot to push an updated for-next. That's remedied
now.
Kevin
^ permalink raw reply
* Re: linux-next: Tree for Jan 18
From: Paul Gortmaker @ 2017-01-18 20:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org, LKML, Ard Biesheuvel, Herbert Xu
In-Reply-To: <20170118163225.5776630e@canb.auug.org.au>
On Wed, Jan 18, 2017 at 12:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20170117:
>
> The arm-soc tree gained a conflict against the arm tree.
>
> The amlogic tree gained a conflict against the arm-soc tree.
>
> Non-merge commits (relative to Linus' tree): 3676
> 4511 files changed, 139928 insertions(+), 85028 deletions(-)
Crypto now fails on arm allmodconfig:
arch/arm/crypto/Makefile:25: These ARMv8 Crypto Extensions modules
need binutils 2.23 or higher
arch/arm/crypto/Makefile:26: aes-arm-ce.o sha1-arm-ce.o sha2-arm-ce.o
ghash-arm-ce.o crct10dif-arm-ce.o crc32-arm-ce.o
AS [M] arch/arm/crypto/aes-neonbs-core.o
CC [M] arch/arm/crypto/aes-neonbs-glue.o
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S: Assembler messages:
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
Error: bad type for scalar -- `vmov q1h[1],r10'
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
Error: bad type for scalar -- `vmov q1h[0],r9'
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
Error: bad type for scalar -- `vmov q1l[1],r8'
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
Error: bad type for scalar -- `vmov q1l[0],r7'
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
Error: bad type for scalar -- `vmov q2h[1],r10'
/home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
Error: bad type for scalar -- `vmov q2h[0],r9'
[many more similar scalar errors deleted]
The 2.2.3 warning was there in the past, but it wasn't fatal. I'm using
an older binutils 2.22 from the kernel.org crosstool stuff.
Seems sfr's builds get the same issue:
http://kisskb.ellerman.id.au/kisskb/buildresult/12910945/
A mindless "git bisect run" comes up with:
cc477bf645736739e69d31fdf715281ef0dd5f9b is the first bad commit
commit cc477bf645736739e69d31fdf715281ef0dd5f9b
Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Wed Jan 11 16:41:54 2017 +0000
crypto: arm/aes - replace bit-sliced OpenSSL NEON code
Maybe binnutils 2.22 is finally too old?
Paul.
--
^ permalink raw reply
* Re: linux-next: Tree for Jan 18
From: Ard Biesheuvel @ 2017-01-18 22:02 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML, Herbert Xu
In-Reply-To: <CAP=VYLoirfK_wBSZuV_9YO_Cnm1SN=CsQ0zN5dZ6pMF4nU3D5g@mail.gmail.com>
(+ Arnd)
On 18 January 2017 at 20:44, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> On Wed, Jan 18, 2017 at 12:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Changes since 20170117:
>>
>> The arm-soc tree gained a conflict against the arm tree.
>>
>> The amlogic tree gained a conflict against the arm-soc tree.
>>
>> Non-merge commits (relative to Linus' tree): 3676
>> 4511 files changed, 139928 insertions(+), 85028 deletions(-)
>
> Crypto now fails on arm allmodconfig:
>
> arch/arm/crypto/Makefile:25: These ARMv8 Crypto Extensions modules
> need binutils 2.23 or higher
> arch/arm/crypto/Makefile:26: aes-arm-ce.o sha1-arm-ce.o sha2-arm-ce.o
> ghash-arm-ce.o crct10dif-arm-ce.o crc32-arm-ce.o
> AS [M] arch/arm/crypto/aes-neonbs-core.o
> CC [M] arch/arm/crypto/aes-neonbs-glue.o
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S: Assembler messages:
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1h[1],r10'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1h[0],r9'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1l[1],r8'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1l[0],r7'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
> Error: bad type for scalar -- `vmov q2h[1],r10'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
> Error: bad type for scalar -- `vmov q2h[0],r9'
>
> [many more similar scalar errors deleted]
>
> The 2.2.3 warning was there in the past, but it wasn't fatal. I'm using
> an older binutils 2.22 from the kernel.org crosstool stuff.
>
> Seems sfr's builds get the same issue:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/12910945/
>
> A mindless "git bisect run" comes up with:
>
> cc477bf645736739e69d31fdf715281ef0dd5f9b is the first bad commit
> commit cc477bf645736739e69d31fdf715281ef0dd5f9b
> Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Date: Wed Jan 11 16:41:54 2017 +0000
>
> crypto: arm/aes - replace bit-sliced OpenSSL NEON code
>
> Maybe binnutils 2.22 is finally too old?
>
I am not sure what the current policy is (Arnd?), but if all errors
pertain to vmovs from scalar to NEON register, I suppose I could work
around it. But perhaps the best solution is the simplest one: not
build the module for < 2.23, like we do for the Crypto Extensions
modules.
^ permalink raw reply
* linux-next: build warning after merge of the net tree
From: Stephen Rothwell @ 2017-01-18 22:56 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Eran Ben Elisha, Tariq Toukan
Hi all,
After merging the net tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_set_channels':
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:546:6: warning: unused variable 'ncv' [-Wunused-variable]
int ncv = mlx5e_get_max_num_channels(priv->mdev);
^
Introduced by commit
639e9e94160e ("net/mlx5e: Remove unnecessary checks when setting num channels")
which removed the last reference to 'ncv'.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm 2017-01-18-14-57 uploaded
From: akpm @ 2017-01-18 22:58 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-01-18-14-57 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.10-rc4:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* memory_hotplug-zone_can_shift-returns-boolean-value.patch
* mm-respect-foll_force-foll_cow-for-thp.patch
* mm-respect-foll_force-foll_cow-for-thp-checkpatch-fixes.patch
* dax-fix-build-warnings-with-fs_dax-and-fs_iomap.patch
* memstick-core-avoid-wnonnull-warning.patch
* userfaultfd-fix-sigbus-resulting-from-false-rwsem-wakeups.patch
* slub-trace-free-objects-at-kern_info.patch
* mm-alloc_contig-re-allow-cma-to-compact-fs-pages.patch
* proc-add-a-schedule-point-in-proc_pid_readdir.patch
* proc-add-a-schedule-point-in-proc_pid_readdir-fix.patch
* mm-memcg-do-not-retry-precharge-charges.patch
* documentation-filesystems-proctxt-add-vmpin.patch
* radix-tree-fix-private-list-warnings.patch
* mm-mempolicyc-do-not-put-mempolicy-before-using-its-nodemask.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* tracing-add-__print_flags_u64.patch
* dax-add-tracepoint-infrastructure-pmd-tracing.patch
* dax-update-maintainers-entries-for-fs-dax.patch
* dax-add-tracepoints-to-dax_pmd_load_hole.patch
* dax-add-tracepoints-to-dax_pmd_insert_mapping.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault-v7.patch
* mm-dax-move-pmd_fault-to-take-only-vmf-parameter.patch
* dax-enable-iostat-for-read-write.patch
* dax-enable-iostat-for-read-write-fix.patch
* dma-debug-add-comment-for-failed-to-check-map-error.patch
* tools-vm-add-missing-makefile-rules.patch
* scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
* scripts-lindent-clean-up-and-optimize.patch
* scripts-checkstackpl-add-support-for-nios2.patch
* m32r-use-generic-currenth.patch
* m32r-fix-build-warning.patch
* debugobjects-track-number-of-kmem_cache_alloc-kmem_cache_free-done.patch
* debugobjects-scale-thresholds-with-of-cpus.patch
* debugobjects-reduce-contention-on-the-global-pool_lock.patch
* ocfs2-dlmglue-prepare-tracking-logic-to-avoid-recursive-cluster-lock.patch
* ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-vfs-entry-points.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-prevent-false-hardlockup-on-overloaded-system.patch
* kernel-watchdog-prevent-false-hardlockup-on-overloaded-system-fix.patch
* kernel-watchdogc-do-not-hardcode-cpu-0-as-the-initial-thread.patch
mm.patch
* slub-do-not-merge-cache-if-slub_debug-contains-a-never-merge-flag.patch
* mm-slub-add-a-dump_stack-to-the-unexpected-gfp-check.patch
* tmpfs-change-shmem_mapping-to-test-shmem_aops.patch
* mm-throttle-show_mem-from-warn_alloc.patch
* mm-throttle-show_mem-from-warn_alloc-fix.patch
* mm-page_alloc-dont-convert-pfn-to-idx-when-merging.patch
* mm-page_alloc-avoid-page_to_pfn-when-merging-buddies.patch
* mm-vmallocc-use-rb_entry_safe.patch
* mm-page_alloc-convert-page_group_by_mobility_disable-to-static-key.patch
* mm-trace-extract-compaction_status-and-zone_type-to-a-common-header.patch
* oom-trace-add-oom-detection-tracepoints.patch
* oom-trace-add-compaction-retry-tracepoint.patch
* userfaultfd-document-_ior-_iow.patch
* userfaultfd-correct-comment-about-uffd_feature_pagefault_flag_wp.patch
* userfaultfd-convert-bug-to-warn_on_once.patch
* userfaultfd-use-vma_is_anonymous.patch
* userfaultfd-non-cooperative-split-the-find_userfault-routine.patch
* userfaultfd-non-cooperative-add-ability-to-report-non-pf-events-from-uffd-descriptor.patch
* userfaultfd-non-cooperative-report-all-available-features-to-userland.patch
* userfaultfd-non-cooperative-add-fork-event.patch
* userfaultfd-non-cooperative-add-fork-event-build-warning-fix.patch
* userfaultfd-non-cooperative-dup_userfaultfd-use-mm_count-instead-of-mm_users.patch
* userfaultfd-non-cooperative-add-mremap-event.patch
* userfaultfd-non-cooperative-optimize-mremap_userfaultfd_complete.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_dontneed-request.patch
* userfaultfd-non-cooperative-avoid-madv_dontneed-race-condition.patch
* userfaultfd-non-cooperative-wake-userfaults-after-uffdio_unregister.patch
* userfaultfd-hugetlbfs-add-copy_huge_page_from_user-for-hugetlb-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-hugetlb_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-__mcopy_atomic_hugetlb-for-huge-page-uffdio_copy.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
* userfaultfd-hugetlbfs-add-userfaultfd-hugetlb-hook.patch
* userfaultfd-hugetlbfs-allow-registration-of-ranges-containing-huge-pages.patch
* userfaultfd-hugetlbfs-add-userfaultfd_hugetlb-test.patch
* userfaultfd-hugetlbfs-userfaultfd_huge_must_wait-for-hugepmd-ranges.patch
* userfaultfd-hugetlbfs-gup-support-vm_fault_retry.patch
* userfaultfd-hugetlbfs-reserve-count-on-error-in-__mcopy_atomic_hugetlb.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_hugetlbfs.patch
* userfaultfd-introduce-vma_can_userfault.patch
* userfaultfd-shmem-add-shmem_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-shmem-introduce-vma_is_shmem.patch
* userfaultfd-shmem-add-tlbflushh-header-for-microblaze.patch
* userfaultfd-shmem-use-shmem_mcopy_atomic_pte-for-shared-memory.patch
* userfaultfd-shmem-add-userfaultfd-hook-for-shared-memory-faults.patch
* userfaultfd-shmem-allow-registration-of-shared-memory-ranges.patch
* userfaultfd-shmem-add-userfaultfd_shmem-test.patch
* userfaultfd-shmem-lock-the-page-before-adding-it-to-pagecache.patch
* userfaultfd-shmem-avoid-a-lockup-resulting-from-corrupted-page-flags.patch
* userfaultfd-shmem-avoid-leaking-blocks-and-used-blocks-in-uffdio_copy.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_shmem.patch
* userfaultfd-non-cooperative-selftest-introduce-userfaultfd_open.patch
* userfaultfd-non-cooperative-selftest-add-ufd-parameter-to-copy_page.patch
* userfaultfd-non-cooperative-selftest-add-test-for-fork-madvdontneed-and-remap-events.patch
* userfaultfd-selftest-test-uffdio_zeropage-on-all-memory-types.patch
* mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock.patch
* mm-vmscan-remove-unused-mm_vmscan_memcg_isolate.patch
* mm-vmscan-add-active-list-aging-tracepoint.patch
* mm-vmscan-add-active-list-aging-tracepoint-update.patch
* mm-vmscan-show-the-number-of-skipped-pages-in-mm_vmscan_lru_isolate.patch
* mm-vmscan-show-lru-name-in-mm_vmscan_lru_isolate-tracepoint.patch
* mm-vmscan-extract-shrink_page_list-reclaim-counters-into-a-struct.patch
* mm-vmscan-enhance-mm_vmscan_lru_shrink_inactive-tracepoint.patch
* mm-vmscan-add-mm_vmscan_inactive_list_is_low-tracepoint.patch
* trace-vmscan-postprocess-sync-with-tracepoints-updates.patch
* nfs-no-pg_private-waiters-remain-remove-waker.patch
* mm-un-export-wake_up_page-functions.patch
* mm-fix-filemapc-kernel-doc-warnings.patch
* mm-page_alloc-swap-likely-to-unlikely-as-code-logic-is-different-for-next_zones_zonelist.patch
* mm-compaction-add-vmstats-for-kcompactd-work.patch
* mm-page_alloc-skip-over-regions-of-invalid-pfns-where-possible.patch
* mmcompaction-serialize-waitqueue_active-checks.patch
* mm-bootmemc-cosmetic-improvement-of-code-readability.patch
* mm-fix-some-typos-in-mm-zsmallocc.patch
* mm-memblockc-trivial-code-refine-in-memblock_is_region_memory.patch
* mm-memblockc-check-return-value-of-memblock_reserve-in-memblock_virt_alloc_internal.patch
* mm-sparse-use-page_private-to-get-page-private-value.patch
* mm-memory_hotplug-set-magic-number-to-page-freelsit-instead-of-page-lrunext.patch
* powerpc-do-not-make-the-entire-heap-executable.patch
* mm-swap-fix-kernel-message-in-swap_info_get.patch
* mm-swap-add-cluster-lock.patch
* mm-swap-add-cluster-lock-v5.patch
* mm-swap-split-swap-cache-into-64mb-trunks.patch
* mm-swap-skip-read-ahead-for-unreferenced-swap-slots.patch
* mm-swap-allocate-swap-slots-in-batches.patch
* mm-swap-free-swap-slots-in-batch.patch
* mm-swap-add-cache-for-swap-slots-allocation.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix-2.patch
* mm-swap-enable-swap-slots-cache-usage.patch
* mm-swap-skip-readahead-only-when-swap-slot-cache-is-enabled.patch
* mm-thp-add-new-defermadvise-defrag-option.patch
* writeback-use-rb_entry.patch
* mm-vmscan-do-not-count-freed-pages-as-pgdeactivate.patch
* mm-vmscan-cleanup-lru-size-claculations.patch
* mm-vmscan-consider-eligible-zones-in-get_scan_count.patch
* revert-mm-bail-out-in-shrink_inactive_list.patch
* mm-page_alloc-do-not-report-all-nodes-in-show_mem.patch
* mm-page_alloc-warn_alloc-print-nodemask.patch
* arch-mm-remove-arch-specific-show_mem.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath.patch
* mm-oom-do-not-enfore-oom-killer-for-__gfp_nofail-automatically.patch
* mm-help-__gfp_nofail-allocations-which-do-not-trigger-oom-killer.patch
* mm-page_alloc-warn_alloc-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-drop-zap_details-ignore_dirty.patch
* mm-drop-zap_details-check_swap_entries.patch
* mm-drop-unused-argument-of-zap_page_range.patch
* oom-reaper-use-madvise_dontneed-logic-to-decide-if-unmap-the-vma.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-drain-quarantine-of-memcg-slab-objects.patch
* kasan-add-memcg-kmem_cache-test.patch
* frv-pci-frv-fix-build-warning.patch
* proc-use-rb_entry.patch
* proc-less-code-duplication-in-proc-cmdline.patch
* notifier-simplify-expression.patch
* timerqueue-use-rb_entry_safe.patch
* lib-add-module-support-to-crc32-tests.patch
* lib-add-module-support-to-glob-tests.patch
* lib-add-module-support-to-atomic64-tests.patch
* find_bit-micro-optimise-find_next__bit.patch
* find_bit-micro-optimise-find_next__bit-v2.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
* rbtree-use-designated-initializers.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort-fix.patch
* checkpatch-warn-on-embedded-function-names.patch
* checkpatch-warn-on-logging-continuations.patch
* checkpatch-update-logfunctions.patch
* hfs-fix-fix-hfs_readdir.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-use-get_user_pages_unlocked.patch
* fs-affs-remove-reference-to-affs_parent_ino.patch
* fs-affs-add-validation-block-function.patch
* fs-affs-make-affs-exportable.patch
* fs-affs-use-octal-for-permissions.patch
* fs-affs-add-prefix-to-some-functions.patch
* fs-affs-nameic-forward-declarations-clean-up.patch
* fs-affs-make-export-work-with-cold-dcache.patch
* config-android-recommended-disable-aio-support.patch
* config-android-base-enable-hardened-usercopy-and-kernel-aslr.patch
* fonts-keep-non-sparc-fonts-listed-together.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
linux-next.patch
linux-next-rejects.patch
* fs-add-i_blocksize.patch
* reimplement-idr-and-ida-using-the-radix-tree.patch
* reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr.patch
* reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes.patch
* reimplement-idr-and-ida-using-the-radix-tree-fix.patch
* scripts-spellingtxt-add-swith-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-swithc-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-user-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-union-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-one-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-partiton-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-aligment-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-algined-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-efective-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-varible-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-embeded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-againt-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-neded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-unneded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialization-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-initialiazation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialised-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-comsumer-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disbled-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overide-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overrided-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-configuartion-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-applys-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-explictely-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-omited-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disassocation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-deintialized-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwritting-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwriten-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-therfore-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-followings-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-some-typo-words.patch
* lib-vsprintfc-remove-%z-support.patch
* checkpatchpl-warn-against-using-%z.patch
* checkpatchpl-warn-against-using-%z-fix.patch
* kernel-exit-compute-current-directly.patch
* drivers-tty-compute-current-directly.patch
* kernel-locking-compute-current-directly.patch
* sched-remove-set_task_state.patch
* mm-add-new-mmgrab-helper.patch
* mm-add-new-mmget-helper.patch
* mm-use-mmget_not_zero-helper.patch
* mm-clarify-mm_structmm_userscount-documentation.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* linux-next: manual merge of the audit tree with Linus' tree
From: Stephen Rothwell @ 2017-01-19 2:51 UTC (permalink / raw)
To: Paul Moore; +Cc: linux-next, linux-kernel, Richard Guy Briggs
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
include/uapi/linux/audit.h
between commits:
7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
dcdaa2f9480c ("Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit")
from Linus' tree and commit:
92c82e8a322b ("audit: add feature audit_lost reset")
from the audit 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 include/uapi/linux/audit.h
index 1c107cb1c83f,3f24110ae63c..000000000000
--- a/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@@ -330,13 -331,14 +331,16 @@@ enum
#define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT 0x00000001
#define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME 0x00000002
#define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH 0x00000004
+#define AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND 0x00000008
#define AUDIT_FEATURE_BITMAP_SESSIONID_FILTER 0x00000010
+ #define AUDIT_FEATURE_BITMAP_LOST_RESET 0x00000020
+
#define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \
AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH | \
+ AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND | \
- AUDIT_FEATURE_BITMAP_SESSIONID_FILTER)
+ AUDIT_FEATURE_BITMAP_SESSIONID_FILTER | \
+ AUDIT_FEATURE_BITMAP_LOST_RESET)
/* deprecated: AUDIT_VERSION_* */
#define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL
^ permalink raw reply
* linux-next: manual merge of the tip tree with the security tree
From: Stephen Rothwell @ 2017-01-19 3:04 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
James Morris
Cc: linux-next, linux-kernel, John Johansen
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
security/apparmor/include/apparmor.h
between commit:
12557dcba21b ("apparmor: move lib definitions into separate lib include")
from the security tree and commit:
6b1ffa06e59d ("locking/atomic, kref: Use kref_get_unless_zero() more")
from the tip tree.
I fixed it up (the former moved the code to another file, so I applied the
below patch there) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 14:01:15 +1100
Subject: [PATCH] locking/atomic, kref: merge fixup for code movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
security/apparmor/include/lib.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index fa281c272970..65ff492a9807 100644
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -76,12 +76,6 @@ static inline void *kvzalloc(size_t size)
return __aa_kvmalloc(size, __GFP_ZERO);
}
-/* returns 0 if kref not incremented */
-static inline int kref_get_not0(struct kref *kref)
-{
- return atomic_inc_not_zero(&kref->refcount);
-}
-
/**
* aa_strneq - compare null terminated @str to a non null terminated substring
* @str: a null terminated string
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the rcu tree
From: Stephen Rothwell @ 2017-01-19 3:34 UTC (permalink / raw)
To: Paul E. McKenney, David Miller, Networking
Cc: linux-next, linux-kernel, Ursula Braun
Hi Paul,
After merging the rcu tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
net/smc/af_smc.c:102:16: error: 'SLAB_DESTROY_BY_RCU' undeclared here (not in a function)
.slab_flags = SLAB_DESTROY_BY_RCU,
^
Caused by commit
c7a545924ca1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU")
interacting with commit
ac7138746e14 ("smc: establish new socket family")
from the net-next tree.
I have applied the following merge fix patch (someone will need to
remember to mention this to Linus):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 14:29:12 +1100
Subject: [PATCH] smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/smc/af_smc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 4875e65f0c4a..a48260f9ebb7 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -99,7 +99,7 @@ struct proto smc_proto = {
.unhash = smc_unhash_sk,
.obj_size = sizeof(struct smc_sock),
.h.smc_hash = &smc_v4_hashinfo,
- .slab_flags = SLAB_DESTROY_BY_RCU,
+ .slab_flags = SLAB_TYPESAFE_BY_RCU,
};
EXPORT_SYMBOL_GPL(smc_proto);
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: manual merge of the audit tree with Linus' tree
From: Richard Guy Briggs @ 2017-01-19 4:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Audit Mailing List, linux-next, linux-kernel
In-Reply-To: <20170119135130.739d4f7b@canb.auug.org.au>
On 2017-01-19 13:51, Stephen Rothwell wrote:
> Hi Paul,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/uapi/linux/audit.h
>
> between commits:
>
> 7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
> dcdaa2f9480c ("Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit")
>
> from Linus' tree and commit:
>
> 92c82e8a322b ("audit: add feature audit_lost reset")
>
> from the audit tree.
This merge conflict was expected.
Your fix below looks as expected.
Thanks! Sorry for the trouble.
> 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 include/uapi/linux/audit.h
> index 1c107cb1c83f,3f24110ae63c..000000000000
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@@ -330,13 -331,14 +331,16 @@@ enum
> #define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT 0x00000001
> #define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME 0x00000002
> #define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH 0x00000004
> +#define AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND 0x00000008
> #define AUDIT_FEATURE_BITMAP_SESSIONID_FILTER 0x00000010
> + #define AUDIT_FEATURE_BITMAP_LOST_RESET 0x00000020
> +
> #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
> AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \
> AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH | \
> + AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND | \
> - AUDIT_FEATURE_BITMAP_SESSIONID_FILTER)
> + AUDIT_FEATURE_BITMAP_SESSIONID_FILTER | \
> + AUDIT_FEATURE_BITMAP_LOST_RESET)
>
> /* deprecated: AUDIT_VERSION_* */
> #define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL
- RGB
--
Richard Guy Briggs <rgb@redhat.com>
Kernel Security Engineering, Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635
^ permalink raw reply
* linux-next: Tree for Jan 19
From: Stephen Rothwell @ 2017-01-19 5:39 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170118:
The audit tree gained a conflict against Linus' tree.
The tip tree gained a conflict against the security tree.
The rcu tree gained a semantic conflict against the net-next tree for
which I applied a merge fix patch.
I dropped 4 patches from the akpm tree that turned up in the tip tree.
Non-merge commits (relative to Linus' tree): 3931
4740 files changed, 146960 insertions(+), 87918 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 251 trees (counting Linus' and 36 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (fa19a769f82f Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (eb1357d942e5 ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds)
Merging arm-current/fixes (90f92c631b21 ARM: 8613/1: Fix the uaccess crash on PB11MPCore)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (27593d72c4ad powerpc/perf: Use MSR to report privilege level on P9 DD1)
Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (d407bd25a204 bpf: don't trigger OOM killer under pressure with map alloc)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (3fd0b634de7d netfilter: ipt_CLUSTERIP: fix build error without procfs)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (7195439d1d71 Revert "bcma: init serial console directly from ChipCommon code")
Merging mac80211/master (dbef53621116 mac80211: prevent skb/txq mismatch)
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (ea2a7fb12093 Revert "PCI: Add runtime PM support for PCIe ports")
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (833674a45ec7 Merge tag 'fixes-for-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (49def1853334 Linux 4.10-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (a121103c9228 Linux 4.10-rc3)
Merging char-misc.current/char-misc-linus (49def1853334 Linux 4.10-rc4)
Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data)
Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (94a6fa899d2c vfio/type1: Remove pid_namespace.h include)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (3bfdfdcbce27 drm/i915: Ignore bogus plane coordinates on SKL when the plane is not visible)
Merging drm-misc-fixes/for-linux-next-fixes (7e9081c5aac7 drm/fence: fix memory overwrite when setting out_fence fd)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (01c4a81b2c85 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (cd53ed64f89f Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (d725535ae7ed Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (3d928ca85412 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (1393f73bb898 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (45f49b8d26ee Merge branch 'for_4.11/keystone_config' into next)
Merging mvebu/for-next (6b0b30683cca Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (8b5a738803d5 Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (ad240de8a360 Merge branch 'dts-for-4.11' into all-for-4.11)
Merging renesas/next (e11adf249ffd Merge branches 'arm64-dt-for-v4.11' and 'dt-for-v4.11' into next)
Merging rockchip/for-next (07bfba71f858 Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9ea22ade0558 Merge branch 'next/soc' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (829d2bd13392 arm64: entry-ftrace.S: avoid open-coded {adr,ldr}_l)
Merging clk/clk-next (89d5dcc48c08 clk: stm32f4: avoid uninitialized variable access)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (9a6134fbcc5b m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (82e014238f8a MIPS: Avoid old-style declaration)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (7ce7d89f4883 Linux 4.10-rc1)
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9437964885f8 s390/bpf: remove redundant check for non-null image)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (69a582fdbc94 Merge branch 'for-next-next-v4.11-20170111' into for-next-20170111)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (ad4d05329df5 udf: Make stat on symlink report symlink length as st_size)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (b63f5e84826b GFS2: Wake up io waiters whenever a flush is done)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (5cf7a0f3442b Merge tag 'nfs-for-4.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging nfsd/nfsd-next (799322e05df0 nfsd: opt in to labeled nfs per export)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (4c7d0c9cb713 ovl: fix possible use after free on redirect dir lookup)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (fd29f7af75b7 xfs: fix xfs_mode_to_ftype() prototype)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (7ce7d89f4883 Linux 4.10-rc1)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (b8ecb5c4a454 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (701dc207bf55 i2c: piix4: Avoid race conditions with IMC)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (c72eeabd0ca8 hwmon: (adc128d818) Preserve operation mode)
Merging jc_docs/docs-next (43d8808b0820 Documentation: cpuset: Fix 'cpuset.tasks' -> 'tasks')
Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
Merging pm/linux-next (a121103c9228 Linux 4.10-rc3)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (e4004621061f Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (18591add41ec thermal: rockchip: handle set_trips without the trip points)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (602d9858f07c swiotlb: ensure that page-sized mappings are page-aligned)
Merging net-next/master (4a7c972644c1 net: Remove usage of net_device last_rx member)
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (eb758c8864d4 esp: Introduce a helper to setup the trailer)
Merging netfilter-next/master (ec2318904965 xtables: extend matches and targets with .usersize)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (7f2f61377bca rtlwifi: rtl8192de: Remove a pointless goto)
Merging bluetooth/master (0e40f4c9593b tcp: accept RST for rcv_nxt - 1 after receiving a FIN)
Merging mac80211-next/master (c88215d7050f cfg80211: Fix documentation for connect result)
Merging rdma/for-next (102c5ce082f5 RDMA/cma: use cached port state when bind loopback)
Merging rdma-leon/rdma-next (ff2fc3dcef94 Merge branch 'topic/odp-ksm' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
Merging crypto/master (87170961f312 crypto: virtio - adjust priority of algorithm)
Merging drm/drm-next (282d0a35c8c4 Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
Merging drm-panel/drm/panel/for-next (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel())
Merging drm-intel/for-linux-next (1e5a15d65d4c drm/i915: Avoid drm_atomic_state_put(NULL) on error paths)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (c77b9abf3c5a drm: vc4: use crtc helper drm_crtc_from_index())
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (bc34c1af0a28 Merge branches 'sunxi/clk-for-4.11', 'sunxi/core-for-4.11', 'sunxi/defconfig-for-4.11', 'sunxi/drm-for-4.11', 'sunxi/dt-for-4.11', 'sunxi/dt64-for-4.11' and 'sunxi/fixes-for-4.10' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (9eb5d0e635eb ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform)
Merging sound-asoc/for-next (c4dcca0a1d05 Merge remote-tracking branches 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (72d1f2346ded Input: tm2-touchkey - add touchkey driver support for TM2)
Merging block/for-next (93e8accff18c Merge branch 'for-4.11/block' into for-next)
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in block/blk-mq.c
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (5766c95d0c8f mmc: core: Don't use extern declarations of public mmc functions)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (46d47f14bddb md/r5cache: enable chunk_aligned_read with write back cache)
Merging mfd/for-mfd-next (ffd2217c7621 mfd: ab8500-sysctrl: Handle probe deferral)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (51962a359cdc power: supply: qcom_smbb: add regulator dependency)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (4dc8f39eb379 Merge remote-tracking branches 'regulator/topic/arizona' and 'regulator/topic/supplies' into regulator-next)
Merging security/next (d69dece5f5b6 LSM: Add /sys/kernel/security/lsm)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (8e25809f17af tpm: Do not print an error message when doing TPM auto startup)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (25dc3bbc55a6 serial: fsl-imx-uart.txt: Remove generic property)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (c438d5effe2a Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (2fde24d1a97c Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (f5c61277f67f EDAC, i82975x: Add ioremap_nocache() error handling)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (3dbb16b87b57 selftests: ftrace: Shift down default message verbosity)
Merging rcu/rcu/next (c7a545924ca1 mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU)
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0f89b207b04a kvm: svm: Use the hardware provided GPA instead of page walk)
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
Merging kvms390/next (40d9766ee501 KVM: s390: Introduce BCD Vector Instructions to the guest)
Merging xen-tip/linux-next (da72ff5bfcb0 partially revert "xen: Remove event channel notification through Xen PCI platform device")
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (fe0dab821ca2 platform/x86: fujitsu-laptop: make hotkey handling functions more similar)
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (5593edfbfa30 Merge 4.10-rc4 into driver-core-next)
Merging tty/tty-next (11cca3d12f03 Merge 4.10-rc4 into tty-next)
Merging usb/usb-next (a47b66da0380 Merge 4.10-rc4 into usb-next)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (2eee05020a0e USB: serial: opticon: fix CTS retrieval at open)
Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API)
Merging phy-next/next (a8df2768c2ed drivers: phy: constify phy_ops structures)
Merging staging/staging-next (1fac9c5a6c2a staging:r8188eu: remove unused rx_head member of struct recv_frame)
Merging char-misc/char-misc-next (39461ffdfc97 Merge 4.10-rc4 into char-misc-next)
Merging extcon/extcon-next (86d6cda68f37 extcon: Modify the name of EXTCON_USB_HOST connector)
Merging slave-dma/next (7919f00e4fdf Merge branch 'topic/zx' into next)
Merging cgroup/for-next (e055b0e58d99 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (b32d9f752e17 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (2c0f83f328fc scsi: qla4xxx: remove two unused MSI-X related #defines)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (5f4a1235fb8e Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (6bdf1e0efb04 Makefile: drop -D__CHECK_ENDIAN__ from cflags)
Merging rpmsg/for-next (a4193bb9c499 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (cc792ff702e1 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (83b7a967ce87 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (e52d5f1c5221 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (93362fa47fe9 sysctl: Drop reference added by grab_header in proc_sys_readdir)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (3e91293ffcca selftests: x86 protection_keys remove dead code)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (f614cc8526df rtc: stm32: fix comparison warnings)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (d27d91e17d08 ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: Reimplement IDR and IDA using the radix tree
Applying: idr: support storing NULL in the IDR
Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (4eea6c0dbcc9 mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* Re: linux-next: build warning after merge of the net tree
From: Tariq Toukan @ 2017-01-19 8:26 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: linux-next, linux-kernel, Eran Ben Elisha, Tariq Toukan
In-Reply-To: <20170119095600.6d7a84d7@canb.auug.org.au>
Hi Stephen,
On 19/01/2017 12:56 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_set_channels':
> drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:546:6: warning: unused variable 'ncv' [-Wunused-variable]
> int ncv = mlx5e_get_max_num_channels(priv->mdev);
> ^
>
> Introduced by commit
>
> 639e9e94160e ("net/mlx5e: Remove unnecessary checks when setting num channels")
>
> which removed the last reference to 'ncv'.
>
We will send a fix shortly.
Thanks for your report!
Regards,
Tariq
^ permalink raw reply
* next-20170119 build: 0 failures 1 warnings (next-20170119)
From: Build bot for Mark Brown @ 2017-01-19 9:15 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170119
Git describe: next-20170119
Commit: fb6271277d Add linux-next specific files for 20170119
Build Time: 104 min 32 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 1
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 1
2 ../drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:546:6: warning: unused variable 'ncv' [-Wunused-variable]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:546:6: warning: unused variable 'ncv' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:546:6: warning: unused variable 'ncv' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Jan 18
From: Ard Biesheuvel @ 2017-01-19 12:19 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML, Herbert Xu
In-Reply-To: <CAP=VYLoirfK_wBSZuV_9YO_Cnm1SN=CsQ0zN5dZ6pMF4nU3D5g@mail.gmail.com>
On 18 January 2017 at 20:44, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> On Wed, Jan 18, 2017 at 12:32 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Changes since 20170117:
>>
>> The arm-soc tree gained a conflict against the arm tree.
>>
>> The amlogic tree gained a conflict against the arm-soc tree.
>>
>> Non-merge commits (relative to Linus' tree): 3676
>> 4511 files changed, 139928 insertions(+), 85028 deletions(-)
>
> Crypto now fails on arm allmodconfig:
>
> arch/arm/crypto/Makefile:25: These ARMv8 Crypto Extensions modules
> need binutils 2.23 or higher
> arch/arm/crypto/Makefile:26: aes-arm-ce.o sha1-arm-ce.o sha2-arm-ce.o
> ghash-arm-ce.o crct10dif-arm-ce.o crc32-arm-ce.o
> AS [M] arch/arm/crypto/aes-neonbs-core.o
> CC [M] arch/arm/crypto/aes-neonbs-glue.o
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S: Assembler messages:
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1h[1],r10'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1h[0],r9'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1l[1],r8'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:817:
> Error: bad type for scalar -- `vmov q1l[0],r7'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
> Error: bad type for scalar -- `vmov q2h[1],r10'
> /home/paul/git/linux-head/arch/arm/crypto/aes-neonbs-core.S:818:
> Error: bad type for scalar -- `vmov q2h[0],r9'
>
> [many more similar scalar errors deleted]
>
> The 2.2.3 warning was there in the past, but it wasn't fatal. I'm using
> an older binutils 2.22 from the kernel.org crosstool stuff.
>
> Seems sfr's builds get the same issue:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/12910945/
>
> A mindless "git bisect run" comes up with:
>
> cc477bf645736739e69d31fdf715281ef0dd5f9b is the first bad commit
> commit cc477bf645736739e69d31fdf715281ef0dd5f9b
> Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Date: Wed Jan 11 16:41:54 2017 +0000
>
> crypto: arm/aes - replace bit-sliced OpenSSL NEON code
>
> Maybe binnutils 2.22 is finally too old?
>
This fixes it for me
diff --git a/arch/arm/crypto/aes-neonbs-core.S
b/arch/arm/crypto/aes-neonbs-core.S
index c9477044fbba..12da247164d1 100644
--- a/arch/arm/crypto/aes-neonbs-core.S
+++ b/arch/arm/crypto/aes-neonbs-core.S
@@ -766,13 +766,13 @@ ENTRY(aesbs_cbc_decrypt)
ENDPROC(aesbs_cbc_decrypt)
.macro next_ctr, q
- vmov \q\()h[1], r10
+ vmov.32 \q\()h[1], r10
adds r10, r10, #1
- vmov \q\()h[0], r9
+ vmov.32 \q\()h[0], r9
adcs r9, r9, #0
- vmov \q\()l[1], r8
+ vmov.32 \q\()l[1], r8
adcs r8, r8, #0
- vmov \q\()l[0], r7
+ vmov.32 \q\()l[0], r7
adc r7, r7, #0
vrev32.8 \q, \q
.endm
so I will propose this to Herbert as a followup patch.
Thanks,
Ard.
^ permalink raw reply related
* Re: linux-next: Tree for Jan 19
From: Paul Gortmaker @ 2017-01-19 16:42 UTC (permalink / raw)
To: Stephen Rothwell, Stefan Kristiansson, Stafford Horne
Cc: linux-next@vger.kernel.org, LKML
In-Reply-To: <20170119163959.07a25ca8@canb.auug.org.au>
On Thu, Jan 19, 2017 at 12:39 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20170118:
>
> The audit tree gained a conflict against Linus' tree.
>
> The tip tree gained a conflict against the security tree.
>
> The rcu tree gained a semantic conflict against the net-next tree for
> which I applied a merge fix patch.
>
> I dropped 4 patches from the akpm tree that turned up in the tip tree.
>
> Non-merge commits (relative to Linus' tree): 3931
> 4740 files changed, 146960 insertions(+), 87918 deletions(-)
>
The or32 builds started failing in the last couple days:
http://kisskb.ellerman.id.au/kisskb/buildresult/12912013/
I was able to reproduce it locally, and a mindless bisect says:
116ded1356614cff3facc9010125b5a28718cbf1 is the first bad commit
commit 116ded1356614cff3facc9010125b5a28718cbf1
Author: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Date: Mon May 12 14:08:26 2014 +0300
openrisc: add atomic bitops
I expect the binutils sfr is using is probably similar vintage to
what I've got here locally - from kernel.org crosstool stuff:
$ or32-linux-as --version
GNU assembler (GNU Binutils) 2.20.1.20100303
Copyright 2009 Free Software Foundation, Inc.
This program is free software; you may redistribute it under the terms of
the GNU General Public License version 3 or later.
This program has absolutely no warranty.
This assembler was configured for a target of `or32-linux'.
Paul.
--
^ 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