* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Al Viro @ 2016-03-15 4:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin LaHaise, linux-next, linux-kernel, linux-fsdevel
In-Reply-To: <20160315150640.02a4db30@canb.auug.org.au>
On Tue, Mar 15, 2016 at 03:06:40PM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the aio tree got a conflict in:
>
> fs/namei.c
>
> between commit:
>
> 5955102c9984 ("wrappers for ->i_mutex access")
>
> from the vfs tree and commit:
>
> 5d3d80fcf992 ("aio: add support for in-submit openat")
>
> from the aio tree.
What.
The.
Hell?
The first commit is in the mainline, not in vfs tree. And it had been
there since before -rc1.
Incidentally, why the hell has that thing never landed in my mailbox? Not
directly, not Cc'd, not via fsdevel either.
Ben, what the fuck going on? OK, you don't feel necessary to mention
that to me (or have me take a look through it). Your business. You also
don't bother to bring it on fsdevel. Again, your estimates of the
usefulness of said list and review there are your business. But it looks
like you also do not bother to check what has landed in the mainline two
months ago. WTF?
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Stephen Rothwell @ 2016-03-15 4:53 UTC (permalink / raw)
To: Al Viro; +Cc: Benjamin LaHaise, linux-next, linux-kernel, linux-fsdevel
In-Reply-To: <20160315043448.GE17997@ZenIV.linux.org.uk>
Hi Al,
On Tue, 15 Mar 2016 04:34:48 +0000 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> > between commit:
> >
> > 5955102c9984 ("wrappers for ->i_mutex access")
> >
> > from the vfs tree and commit:
>
> What.
>
> The.
>
> Hell?
>
> The first commit is in the mainline, not in vfs tree. And it had been
> there since before -rc1.
Sorry, my mistake.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Al Viro @ 2016-03-15 5:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin LaHaise, linux-next, linux-kernel, linux-fsdevel
In-Reply-To: <20160315043448.GE17997@ZenIV.linux.org.uk>
On Tue, Mar 15, 2016 at 04:34:48AM +0000, Al Viro wrote:
> Incidentally, why the hell has that thing never landed in my mailbox? Not
> directly, not Cc'd, not via fsdevel either.
>
> Ben, what the fuck going on? OK, you don't feel necessary to mention
> that to me (or have me take a look through it). Your business. You also
> don't bother to bring it on fsdevel. Again, your estimates of the
> usefulness of said list and review there are your business. But it looks
> like you also do not bother to check what has landed in the mainline two
> months ago. WTF?
While we are at it, aio.git commit in question is crap anyway. What is the
semantics of that LOOKUP_NONBLOCK thing and what makes you think that
it will *not* block prior to reaching do_last()? LOOKUP_RCU that was
originally there? Sorry, wrong. RCU pathwalk will happily fall back to
non-RCU one if it can do so without restart from scratch. And proceed
to lock directories, hit the disk over nbd over wet string, do automounts,
etc. Anything and everything. IOW, this is complete BS and had been such
for at least ~5 years.
There *is* a reason for code review. Or, at least, asking somebody familiar
with the code you are working with whether some assumption you are making
is true or false. Me, for example, in our conversation regarding earlier parts
of aio.git queue about a week ago. Or at any other point.
Al "Really annoyed" Viro
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Al Viro @ 2016-03-15 5:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin LaHaise, linux-next, linux-kernel, linux-fsdevel
In-Reply-To: <20160315050712.GF17997@ZenIV.linux.org.uk>
On Tue, Mar 15, 2016 at 05:07:12AM +0000, Al Viro wrote:
> There *is* a reason for code review. Or, at least, asking somebody familiar
> with the code you are working with whether some assumption you are making
> is true or false. Me, for example, in our conversation regarding earlier parts
> of aio.git queue about a week ago. Or at any other point.
While we are at it, 150a0b49 ("aio: add support for async openat()") is also
crap. fs_struct and files_struct is nowhere near enough. And yes, I realize
that your application probably doesn't step into it. Which means that these
patches are just fine for your private kernel. _Not_ for mainline.
Reviewed-and-NAKed-by: Al Viro <viro@zeniv.linux.org.uk>
^ permalink raw reply
* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Guenter Roeck @ 2016-03-15 5:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Qais Yousef, Ralf Baechle, linux-mips
In-Reply-To: <20160314143729.GA31845@roeck-us.net>
On Mon, Mar 14, 2016 at 07:37:29AM -0700, Guenter Roeck wrote:
> On Mon, Mar 14, 2016 at 05:40:37PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20160311:
> >
> > The vfs tree gained a conflict against Linus' tree. I also applied a
> > patch for a known runtime bug.
> >
> > The tip tree gained a conflict against the mips tree.
> >
> > The aio tree still had a build failure so I removed several commits
> > from it. It also gained a conflict against the vfs tree.
> >
> > Non-merge commits (relative to Linus' tree): 11202
> > 8646 files changed, 426680 insertions(+), 211740 deletions(-)
> >
>
> To give people an idea what to expect in the merge window, here are my current
> build and runtime test results. Some of the runtime failures are due to the
> newly introduced i2c bug, but many (including the arm64 boot failures) have
> been around for a while.
>
[ ... ]
> Qemu test results:
> total: 96 pass: 69 fail: 27
> Failed tests:
[ ... ]
> mips:mips_malta_smp_defconfig
I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp CMP, CPS and MT
use the new generic IPI functions". Bisect log is attached.
> mips64:smp:mips_malta64_defconfig
> mips:mipsel_malta_smp_defconfig
> mips:mipsel_malta64_smp_defconfig
If necessary I can repeat the bisect for those. Please let me know.
Thanks,
Guenter
---
Bisect log:
# bad: [4342eec3c5a2402ca5de3d6e56f541fe1c5171e2] Add linux-next specific files for 20160314
# good: [f6cede5b49e822ebc41a099fe41ab4989f64e2cb] Linux 4.5-rc7
git bisect start 'HEAD' 'v4.5-rc7'
# good: [0525c3e26ec2c43cd509433be3be25210a0154ef] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
git bisect good 0525c3e26ec2c43cd509433be3be25210a0154ef
# bad: [385128a1b49762c1b9515c9f6294aeebbc55b956] Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
git bisect bad 385128a1b49762c1b9515c9f6294aeebbc55b956
# good: [dfdb27baab4fc45c9399a991270413d0fb1c694a] Merge remote-tracking branch 'spi/for-next'
git bisect good dfdb27baab4fc45c9399a991270413d0fb1c694a
# bad: [e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565] Merge branch 'timers/nohz'
git bisect bad e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565
# good: [ced30bc9129777d715057d06fc8dbdfd3b81e94d] Merge tag 'perf-core-for-mingo-20160310' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
git bisect good ced30bc9129777d715057d06fc8dbdfd3b81e94d
# bad: [656a61d4d9cbb8dfc2d007281190b2eccebad522] manual merge of mm/pkeys
git bisect bad 656a61d4d9cbb8dfc2d007281190b2eccebad522
# good: [16f7379f2da43f29d9faa2f474745e2705a3f510] Merge branch 'efi/core'
git bisect good 16f7379f2da43f29d9faa2f474745e2705a3f510
# bad: [a7fb9a8169be9a55e0cfb98346aece1b51c016fa] Merge branch 'locking/core'
git bisect bad a7fb9a8169be9a55e0cfb98346aece1b51c016fa
# good: [2a07870511829977d02609dac6450017b0419ea9] irqchip/mips-gic: Use gic_vpes instead of NR_CPUS
git bisect good 2a07870511829977d02609dac6450017b0419ea9
# good: [eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7] locking/pvqspinlock: Move lock stealing count tracking code into pv_queued_spin_steal_lock()
git bisect good eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7
# good: [013e379a3094ff2898f8d33cfbff1573d471ee14] tools/lib/lockdep: Fix link creation warning
git bisect good 013e379a3094ff2898f8d33cfbff1573d471ee14
# bad: [7eb8c99db26cc6499bfb1eba72dffc4730570752] MIPS: Delete smp-gic.c
git bisect bad 7eb8c99db26cc6499bfb1eba72dffc4730570752
# good: [fbde2d7d8290d8c642d591a471356abda2446874] MIPS: Add generic SMP IPI support
git bisect good fbde2d7d8290d8c642d591a471356abda2446874
# bad: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
git bisect bad bb11cff327e54179c13446c4022ed4ed7d4871c7
# first bad commit: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Al Viro @ 2016-03-15 5:35 UTC (permalink / raw)
To: Benjamin LaHaise
Cc: Christoph Hellwig, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160314152438.GG17923@kvack.org>
On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote:
> On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote:
> > The aio changes have either been reviewed negatively or not at all. That
> > tree should be dropped.
>
> That isn't solely your decision. If you have comments, please provide
> constructive feedback, as there are users and use-cases that need this
> kind of functionality.
"This kind of functionality" being what, exactly? Bypassing code review?
It's not that you've made trivial mistakes; everyone does from time to time.
But failing to post patches with non-trivial interactions outside of the
subsystem you are familiar with (be it on fsdevel or privately to people who
work with the areas involved) *AND* failing to recognize that the lack
of review might be a problem even after having been explicitly told so...
For fuck sake, you should know better. You are not a newbie with a pet set
of half-baked patches for his pet application, refering to (unspecified)
"users that need this kind of functionality" and getting very surprised when
those mean, rude folks on development lists inform them that code review is
more than just a good idea.
^ permalink raw reply
* Re: linux-next: Tree for Mar 14
From: Wolfram Sang @ 2016-03-15 6:43 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Stephen Rothwell, linux-next, linux-kernel, David Airlie,
Ben Skeggs, linux-i2c, dri-devel
In-Reply-To: <20160315003029.GA2126@swordfish>
[-- Attachment #1: Type: text/plain, Size: 760 bytes --]
On Tue, Mar 15, 2016 at 09:30:29AM +0900, Sergey Senozhatsky wrote:
> On (03/14/16 17:40), Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20160311:
> >
> > The vfs tree gained a conflict against Linus' tree. I also applied a
> > patch for a known runtime bug.
> >
> > The tip tree gained a conflict against the mips tree.
> >
> > The aio tree still had a build failure so I removed several commits
> > from it. It also gained a conflict against the vfs tree.
> >
> > Non-merge commits (relative to Linus' tree): 11202
> > 8646 files changed, 426680 insertions(+), 211740 deletions(-)
>
>
> Hello,
>
> I'm seeing a bunch of warnings and errors
I pushed the fix to my for-next branch yesterday. Sorry for the fuzz!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the aio tree
From: Stephen Rothwell @ 2016-03-15 6:46 UTC (permalink / raw)
To: Benjamin LaHaise
Cc: linux-next, linux-kernel, Michael Ellerman,
Benjamin Herrenschmidt, linuxppc-dev, Al Viro, Christoph Hellwig
Hi Benjamin,
After merging the aio tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:
fs/built-in.o: In function `aio_thread_op_foo_at':
aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
Caused by commit
150a0b4905f1 ("aio: add support for async openat()")
despite commit
d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
This is due to a bug in the powerpc __get_user_check() macro (the return
value is defined to be "unsigned long" which is only 32 bits on a 32
bit platform).
I applied the patch below which seems to help (Michael, what do you
think?), but given Al's and Christoph's reactions, I am inclined to
remove the aio tree from tomorrow and maybe it can be revisited after
the merge window.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2016 16:36:06 +1100
Subject: [PATCH] powerpc: fix get_user for 64 bit typs on 32 bit platforms
solution borrowed from the x86 uaccess.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/uaccess.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index b7c20f0b8fbe..52262b2f37fc 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -261,10 +261,13 @@ do { \
} \
} while (0)
+#define __inttype(x) \
+ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+
#define __get_user_nocheck(x, ptr, size) \
({ \
long __gu_err; \
- unsigned long __gu_val; \
+ __inttype(*(ptr)) __gu_val; \
__typeof__(*(ptr)) __user *__gu_addr = (ptr); \
__chk_user_ptr(ptr); \
if (!is_kernel_addr((unsigned long)__gu_addr)) \
@@ -277,7 +280,7 @@ do { \
#define __get_user_check(x, ptr, size) \
({ \
long __gu_err = -EFAULT; \
- unsigned long __gu_val = 0; \
+ __inttype(*(ptr)) __gu_val = 0; \
__typeof__(*(ptr)) __user *__gu_addr = (ptr); \
might_fault(); \
if (access_ok(VERIFY_READ, __gu_addr, (size))) \
@@ -289,7 +292,7 @@ do { \
#define __get_user_nosleep(x, ptr, size) \
({ \
long __gu_err; \
- unsigned long __gu_val; \
+ __inttype(*(ptr)) __gu_val; \
__typeof__(*(ptr)) __user *__gu_addr = (ptr); \
__chk_user_ptr(ptr); \
__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: Tree for Mar 14
From: Sergey Senozhatsky @ 2016-03-15 6:52 UTC (permalink / raw)
To: Wolfram Sang
Cc: Sergey Senozhatsky, Stephen Rothwell, linux-next, linux-kernel,
David Airlie, Ben Skeggs, linux-i2c, dri-devel
In-Reply-To: <20160315064318.GA1385@katana>
On (03/15/16 07:43), Wolfram Sang wrote:
> > Hello,
> >
> > I'm seeing a bunch of warnings and errors
>
> I pushed the fix to my for-next branch yesterday. Sorry for the fuzz!
no prob, thanks!
-ss
^ permalink raw reply
* linux-next: Tree for Mar 15
From: Stephen Rothwell @ 2016-03-15 7:18 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.7 related material to your linux-next included
trees until after v4.6-rc1 is released.
Changes since 20160314:
The net-next tree gained conflicts agains Linus' tree.
The tip tree gained conflicts against the pm tree.
The aio tree regained its build failure for which I applied a patch
(to the powerpc uaccess code).
Non-merge commits (relative to Linus' tree): 11397
8936 files changed, 441989 insertions(+), 220157 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 231 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (b562e44f507e Linux 4.5)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (f778cc657176 ARC: [BE] readl()/writel() to work in Big Endian CPU configuration)
Merging arm-current/fixes (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b562e44f507e Linux 4.5)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging net/master (133800d1f028 sctp: fix copying more bytes than expected in sctp_add_bind_addr)
Merging ipsec/master (52717aa43094 vti: Fix recource leeks on pmtu discovery)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (10da848f67a7 ssb: host_soc depends on sprom)
Merging mac80211/master (2af8c4dc2e9c mac80211_hwsim: treat as part of mac80211 for MAINTAINERS)
Merging sound-current/for-linus (ca80e26a5995 Merge tag 'asoc-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (54c6e2dd00c3 PCI: Allow a NULL "parent" pointer in pci_bus_assign_domain_nr())
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (861c3849222b Merge tag 'usb-serial-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging char-misc.current/char-misc-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (b562e44f507e Linux 4.5)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (1d28d704a1bd ARC: [intc-*] switch to linear domain)
Merging arm/for-next (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC)
Merging arm-soc/for-next (6dae7e7ff600 ARM: SoC: Document merges)
Merging at91/at91-next (c40abde4b32e Merge branch 'at91-4.6-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (f094c5346231 Merge branch 'heads/sh-drivers-for-v4.6' into next)
Merging rockchip/for-next (545d1b355f3a Merge branch 'v4.6-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (466369e4e14b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (2776e0e8ef68 arm64: kasan: Fix zero shadow mapping overriding kernel image shadow)
CONFLICT (content): Merge conflict in arch/arm64/mm/init.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cputype.h
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (a6cab95ec1ae Merge branch '4.5-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (d8c0282f4da6 Merge branch 'topic/mprofile-kernel' into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (80c544ded25a s390/pci: enforce fmb page boundary rule)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (35b90a2939a5 tile: Fix misspellings in comments.)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (c91e02bd9702 xtensa: support hardware breakpoints/watchpoints)
Merging btrfs/next (5e33a2bd7ca7 Btrfs: do not collect ordered extents when logging that inode exists)
Merging btrfs-kdave/for-next (e7cb91a03873 Merge branch 'for-next-4.6-20160314' into for-next-20160314)
Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (1ae1602de028 configfs: switch ->default groups to a linked list)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers)
Merging ext4/dev (600be30a8bc1 ext4: remove i_ioend_count)
Merging f2fs/dev (7918a6e1b5e2 f2fs: avoid writepage lock when many threads call fsync)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (744742d692e3 fuse: Add reference counting for fuse_io_priv)
Merging gfs2/for-next (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (ecf782868399 Merge branch 'multipath')
Merging nfsd/nfsd-next (05a162ddfb10 nfsd: block and scsi layout drivers need to depend on CONFIG_BLOCK)
Merging orangefs/for-next (2180c52cc729 Orangefs: fix sloppy cleanups of debugfs and sysfs init failures.)
Merging overlayfs/overlayfs-next (b81de061fa59 ovl: copy new uid/gid into overlayfs runtime inode)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (e4f6daac2033 ubi: Fix out of bounds write in volume update code)
Merging xfs/for-next (ab9d1e4f7b02 Merge branch 'xfs-misc-fixes-4.6-3' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (c99dce976ab3 Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next)
CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c
Merging pci/next (204a68bf1d55 Merge branch 'pci/resource' into next)
Merging hid/for-next (7961b4b4f276 Merge branch 'for-4.6/multitouch' into for-next)
Merging i2c/i2c/for-next (b980a26d02d1 i2c: immediately mark ourselves as registered)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (630300d5fcb6 hwmon: Create an NSA320 hardware monitoring driver)
Merging v4l-dvb/master (1752d448bb5e Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (a4f54c25dec6 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4b3ec0279397 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (161b2f652935 Merge branch 'pm-tools' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging thermal/next (33cae63614e6 Merge branches 'thermal-core' and 'thermal-intel' into next)
Merging thermal-soc/next (44fa372da981 Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (e38e5ce81c3e firewire: ABI documentation: libhinawa uses firewire-cdev)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7ea5d41560d9 Merge branch 'for-linus' into next)
Merging net-next/master (005bcea93362 Merge branch 'dsa-finers-bridging-control')
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-gp.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-db.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (ccfe1e853220 rtl8xxxu: Temporarily disable 8192eu device init)
Merging bluetooth/master (6a0e78072c2a Bluetooth: Fix potential buffer overflow with Add Advertising)
Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support)
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (9df4f913eb39 MAINTAINERS: add a maintainer for the NAND subsystem)
Merging l2-mtd/master (6871c1b96de8 mtd: nand: remove kerneldoc for removed function parameter)
Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration)
CONFLICT (content): Merge conflict in net/rxrpc/rxkad.c
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (f2c488212b51 Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (94669e6ba1ad drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.)
Merging drm-tegra/drm/tegra/for-next (5dff6a2179a0 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (c1f415c9acb5 drm: atomic helper: do not unreference error pointer)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/juno-base.dtsi
Merging drm-vc4/drm-vc4-next (90d7116061f8 drm/vc4: Recognize a more specific compatible string for V3D.)
Merging regmap/for-next (d25263d917ca Merge remote-tracking branch 'regmap/topic/update-bits' into regmap-next)
Merging sound/for-next (ca80e26a5995 Merge tag 'asoc-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (d4a6360f19c1 Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (9979c1c70724 Input: snvs_pwrkey - fix returned value check of syscon_regmap_lookup_by_phandle())
Merging block/for-next (63ec31aa11e6 Merge branch 'for-4.6/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Applying: nvme: fix up for "split pci module out of core module"
Merging device-mapper/for-next (98dbc9c6c616 dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (67b3fcff2da9 mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch)
Merging md/for-next (00a41f985265 raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang)
Merging mfd/for-mfd-next (acb61da505d5 mfd: intel-lpss: Pass I2C configuration via properties on BXT)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (768e66686cfe Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next)
Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging tpmdd/next (2c4934e534eb Merge branch 'master' into next)
Merging watchdog/master (c0732e8a5bb1 watchdog: Ensure that wdd is not dereferenced if NULL)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/foundation-v8.dts
Merging iommu/next (d459a0941140 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8173.dtsi
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (abfa6cd8cda7 modsign: Fix documentation on module signing enforcement parameter.)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (fa38a82096a1 scripts/dtc: Update to upstream version 53bf130b1cdd)
Merging mailbox/mailbox-for-next (f70ed3b5dc8b mailbox: rockchip: Add Rockchip mailbox driver)
Merging spi/for-next (c508709bcffb Merge remote-tracking branches 'spi/topic/res', 'spi/topic/rockchip', 'spi/topic/sh', 'spi/topic/ti-qspi' and 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (42357f7330db Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
CONFLICT (content): Merge conflict in kernel/sched/sched.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
CONFLICT (content): Merge conflict in drivers/cpufreq/intel_pstate.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (1cf8067b5418 tracing: Fix typoes in code comment and printk in trace_nop.c)
Merging rcu/rcu/next (7220b7742659 locktorture: Fix nil pointer dereferencing for cleanup paths)
Merging kvm/linux-next (f958ee745f70 Merge tag 'kvm-s390-next-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM)
Merging xen-tip/linux-next (4478c407ea38 xen/x86: Drop mode-selecting ifdefs in startup_xen())
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (5b4466b8f63b hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (7296c33ed12e leds: triggers: simplify led_trigger_store)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a95fc9c8e576 serial: 8250: describe CONFIG_SERIAL_8250_RSA)
Merging usb/usb-next (ce53bfc4374c Merge tag 'usb-serial-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name)
Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (2df122bdebab staging: lustre: fix aligments in lnet selftest)
CONFLICT (content): Merge conflict in include/linux/irqdomain.h
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/dvb-frontends/mn88473.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (16617535684f goldfish: Fix build error of missing ioremap on UM)
Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag)
Merging cgroup/for-next (10c2c49ff21e Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (dc7a36877bb9 Merge branch 'misc' into for-next)
Merging target-updates/for-next (59bde5aad901 target/iblock: Use -EAGAIN/-ENOMEM to propigate SAM BUSY/TASK_SET_FULL)
Merging target-merge/for-next-merge (4d0a0090695c cxgb4: update Kconfig and Makefile)
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Merging pinctrl/for-next (3c177a166253 pinctrl: single: Use a separate lockdep class)
Merging vhost/linux-next (030881372460 vhost_net: basic polling support)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (69ae9895d3fe MAINTAINERS: Add co-maintainer for remoteproc subsystems)
Merging gpio/for-next (ec57bde1a1f2 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in tools/Makefile
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (116e5575805d pwm: brcmstb: Fix check of devm_ioremap_resource() return code)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (d3781a74bcc9 clk: fixed-rate: Remove CLK_IS_ROOT)
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-master.c
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-main.c
Merging aio/master (d2f7a973e11e aio: don't use __get_user() for 64 bit values)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/namei.c
Applying: vfs: do_loop_readv_writev() API change merge fix
Applying: vfs: do_loop_readv_writev API merge fix up part 2
Applying: vfs: do_loop_readv_writev API merge fix part 3
Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (d6566346e17b Merge branch 'for-4.6/upstream' into for-next)
Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (cee2cc215506 rtc: pcf2127: add pcf2129 device id)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (489011652a2d Merge branch 'for-4.6/pfn' into libnvdimm-for-next)
Applying: powerpc: fix get_user for 64 bit typs on 32 bit platforms
Merging akpm-current/current (7d1ac13b79b1 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/mempool.c
CONFLICT (content): Merge conflict in mm/huge_memory.c
CONFLICT (content): Merge conflict in include/linux/huge_mm.h
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
CONFLICT (content): Merge conflict in arch/x86/realmode/rm/Makefile
CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
CONFLICT (content): Merge conflict in arch/x86/entry/vdso/Makefile
CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/x86/boot/Makefile
CONFLICT (content): Merge conflict in arch/mips/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: staging/goldfish: use 6-arg get_user_pages()
Applying: mm/mprotect.c: don't imply PROT_EXEC on non-exec fs
Applying: kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE
Applying: memremap: don't modify flags
Applying: memremap: add MEMREMAP_WC flag
Applying: drivers: dma-coherent: use MEMREMAP_WC for DMA_MEMORY_MAP
Applying: drivers: dma-coherent: use memset_io for DMA_MEMORY_IO mappings
Applying: kernel/...: convert pr_warning to pr_warn
Applying: dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes
Applying: alpha/extable: use generic search and sort routines
Applying: s390/extable: use generic search and sort routines
Applying: x86/extable: use generic search and sort routines
Applying: ia64/extable: use generic search and sort routines
Merging akpm/master (0ba5cc6a86aa ia64/extable: use generic search and sort routines)
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Christoph Hellwig @ 2016-03-15 8:37 UTC (permalink / raw)
To: Benjamin LaHaise
Cc: Christoph Hellwig, Stephen Rothwell, Al Viro, linux-next,
linux-kernel
In-Reply-To: <20160314152438.GG17923@kvack.org>
On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote:
> On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote:
> > The aio changes have either been reviewed negatively or not at all. That
> > tree should be dropped.
>
> That isn't solely your decision. If you have comments, please provide
> constructive feedback, as there are users and use-cases that need this
> kind of functionality.
Nothing should be a "sole decision". But you have patches that stomp
all over areas outside your maintainership, and even those in there
aren't reviewed. This does not fit the Linux-next criteria.
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with Linus' tree
From: Gregory CLEMENT @ 2016-03-15 8:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Thomas Petazzoni,
Olof Johansson, Marcin Wojtas
In-Reply-To: <20160315110713.49c4846e@canb.auug.org.au>
Hi Stephen,
On mar., mars 15 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm/boot/dts/armada-xp-db.dts
> arch/arm/boot/dts/armada-xp-gp.dts
> arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
>
> between commit:
>
> d7d5a43c0d16 ("ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window")
>
> from Linus' tree and commits:
>
> 9dd7a57e2cbf ("ARM: dts: armada-xp: enable buffer manager support on Armada XP boards")
> 293fdc24fcc9 ("ARM: dts: armada-xp-openblocks-ax3-4: Add BM support")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This fix is good, thanks!
Gregory
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm/boot/dts/armada-xp-db.dts
> index 45813a5526c8,30657302305d..000000000000
> --- a/arch/arm/boot/dts/armada-xp-db.dts
> +++ b/arch/arm/boot/dts/armada-xp-db.dts
> @@@ -76,8 -76,9 +76,9 @@@
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
> @@@ -229,34 -242,10 +242,38 @@@
> spi-max-frequency = <20000000>;
> };
> };
> +
> + nand@d0000 {
> + status = "okay";
> + num-cs = <1>;
> + marvell,nand-keep-config;
> + marvell,nand-enable-arbiter;
> + nand-on-flash-bbt;
> +
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "U-Boot";
> + reg = <0 0x800000>;
> + };
> + partition@800000 {
> + label = "Linux";
> + reg = <0x800000 0x800000>;
> + };
> + partition@1000000 {
> + label = "Filesystem";
> + reg = <0x1000000 0x3f000000>;
> +
> + };
> + };
> + };
> };
> +
> + bm-bppi {
> + status = "okay";
> + };
> };
> };
> diff --cc arch/arm/boot/dts/armada-xp-gp.dts
> index 5730b875c4f5,a1ded01d0c07..000000000000
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@@ -95,8 -95,9 +95,9 @@@
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
> diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> index 853bd392a4fe,3aa29a91c7b8..000000000000
> --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> @@@ -65,9 -65,10 +65,10 @@@
> soc {
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> - MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* next-20160315 build: 0 failures 10 warnings (next-20160315)
From: Build bot for Mark Brown @ 2016-03-15 11:41 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160315
Git describe: next-20160315
Commit: 6fdeb67177 Add linux-next specific files for 20160315
Build Time: 87 min 48 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 10
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
7 warnings 0 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
11 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-allnoconfig
5 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 10
12 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
12 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
3 ../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 arch/arm64/configs/defconfig:218:warning: override: reassigning to symbol MMC_BLOCK_MINORS
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
arch/arm64/configs/defconfig:218:warning: override: reassigning to symbol MMC_BLOCK_MINORS
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Benjamin LaHaise @ 2016-03-15 13:12 UTC (permalink / raw)
To: Al Viro; +Cc: Stephen Rothwell, linux-next, linux-kernel, linux-fsdevel
In-Reply-To: <20160315051939.GG17997@ZenIV.linux.org.uk>
On Tue, Mar 15, 2016 at 05:19:39AM +0000, Al Viro wrote:
> On Tue, Mar 15, 2016 at 05:07:12AM +0000, Al Viro wrote:
>
> > There *is* a reason for code review. Or, at least, asking somebody familiar
> > with the code you are working with whether some assumption you are making
> > is true or false. Me, for example, in our conversation regarding earlier parts
> > of aio.git queue about a week ago. Or at any other point.
>
> While we are at it, 150a0b49 ("aio: add support for async openat()") is also
> crap. fs_struct and files_struct is nowhere near enough. And yes, I realize
> that your application probably doesn't step into it. Which means that these
> patches are just fine for your private kernel. _Not_ for mainline.
>
> Reviewed-and-NAKed-by: Al Viro <viro@zeniv.linux.org.uk>
You've had two months to make this comment, so I'm glad you've finally
done so.
-ben
--
"Thought is the essence of where you are now."
^ permalink raw reply
* Re: linux-next: manual merge of the aio tree with the vfs tree
From: Benjamin LaHaise @ 2016-03-15 13:24 UTC (permalink / raw)
To: Al Viro; +Cc: Christoph Hellwig, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160315053533.GH17997@ZenIV.linux.org.uk>
On Tue, Mar 15, 2016 at 05:35:33AM +0000, Al Viro wrote:
> On Mon, Mar 14, 2016 at 11:24:38AM -0400, Benjamin LaHaise wrote:
> > On Mon, Mar 14, 2016 at 08:35:23AM +0100, Christoph Hellwig wrote:
> > > The aio changes have either been reviewed negatively or not at all. That
> > > tree should be dropped.
> >
> > That isn't solely your decision. If you have comments, please provide
> > constructive feedback, as there are users and use-cases that need this
> > kind of functionality.
>
> "This kind of functionality" being what, exactly? Bypassing code review?
> It's not that you've made trivial mistakes; everyone does from time to time.
> But failing to post patches with non-trivial interactions outside of the
> subsystem you are familiar with (be it on fsdevel or privately to people who
> work with the areas involved) *AND* failing to recognize that the lack
> of review might be a problem even after having been explicitly told so...
I'm not bypassing code review. The code was sent out back in January,
you were cc'd on it and has been waiting for you to provide some feedback
on the mailing lists, which you haven't done until yesterday. Given that
review has not occurred, I fully well don't expect this series to be
merged until further work is done.
> For fuck sake, you should know better. You are not a newbie with a pet set
> of half-baked patches for his pet application, refering to (unspecified)
> "users that need this kind of functionality" and getting very surprised when
> those mean, rude folks on development lists inform them that code review is
> more than just a good idea.
No, my comment was based on HCH essentially saying that exposure in
linux-next is a bad thing and the tree should be removed. Quite the
opposite -- it's useful in that it lets people see what is going on and
lets me know about conflicts with other work. Removing the tree from
linux-next gets rid of those benefits, and that is what I was objecting
to. Fwiw, I don't think someone should have a veto over what goes in
linux-next. People should provide feedback, not a blanket "drop that".
-ben
--
"Thought is the essence of where you are now."
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Andy Shevchenko @ 2016-03-15 14:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin LaHaise, linux-next, linux-kernel@vger.kernel.org,
Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev, Al Viro,
Christoph Hellwig
In-Reply-To: <20160315174634.6766cd88@canb.auug.org.au>
On Tue, Mar 15, 2016 at 8:46 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Benjamin,
>
> After merging the aio tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> fs/built-in.o: In function `aio_thread_op_foo_at':
> aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
> aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
avr32 seems affected as well and the below solution is not suitable
(should be much more verbose in asm, I guess).
>
> Caused by commit
>
> 150a0b4905f1 ("aio: add support for async openat()")
>
> despite commit
>
> d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
>
> This is due to a bug in the powerpc __get_user_check() macro (the return
> value is defined to be "unsigned long" which is only 32 bits on a 32
> bit platform).
>
> I applied the patch below which seems to help (Michael, what do you
> think?), but given Al's and Christoph's reactions, I am inclined to
> remove the aio tree from tomorrow and maybe it can be revisited after
> the merge window.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Mar 2016 16:36:06 +1100
> Subject: [PATCH] powerpc: fix get_user for 64 bit typs on 32 bit platforms
>
> solution borrowed from the x86 uaccess.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/include/asm/uaccess.h | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
> index b7c20f0b8fbe..52262b2f37fc 100644
> --- a/arch/powerpc/include/asm/uaccess.h
> +++ b/arch/powerpc/include/asm/uaccess.h
> @@ -261,10 +261,13 @@ do { \
> } \
> } while (0)
>
> +#define __inttype(x) \
> + __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
> +
> #define __get_user_nocheck(x, ptr, size) \
> ({ \
> long __gu_err; \
> - unsigned long __gu_val; \
> + __inttype(*(ptr)) __gu_val; \
> __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
> __chk_user_ptr(ptr); \
> if (!is_kernel_addr((unsigned long)__gu_addr)) \
> @@ -277,7 +280,7 @@ do { \
> #define __get_user_check(x, ptr, size) \
> ({ \
> long __gu_err = -EFAULT; \
> - unsigned long __gu_val = 0; \
> + __inttype(*(ptr)) __gu_val = 0; \
> __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
> might_fault(); \
> if (access_ok(VERIFY_READ, __gu_addr, (size))) \
> @@ -289,7 +292,7 @@ do { \
> #define __get_user_nosleep(x, ptr, size) \
> ({ \
> long __gu_err; \
> - unsigned long __gu_val; \
> + __inttype(*(ptr)) __gu_val; \
> __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
> __chk_user_ptr(ptr); \
> __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
> --
> 2.7.0
>
> --
> Cheers,
> Stephen Rothwell
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Sudip Mukherjee @ 2016-03-15 16:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin LaHaise, linux-next, linux-kernel, Michael Ellerman,
Benjamin Herrenschmidt, linuxppc-dev, Al Viro, Christoph Hellwig
In-Reply-To: <20160315174634.6766cd88@canb.auug.org.au>
On Tue, Mar 15, 2016 at 05:46:34PM +1100, Stephen Rothwell wrote:
> Hi Benjamin,
>
> After merging the aio tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> fs/built-in.o: In function `aio_thread_op_foo_at':
> aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
> aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
>
> Caused by commit
>
> 150a0b4905f1 ("aio: add support for async openat()")
>
> despite commit
>
> d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
>
> This is due to a bug in the powerpc __get_user_check() macro (the return
> value is defined to be "unsigned long" which is only 32 bits on a 32
> bit platform).
m68k allmodconfig and all defs of m32r fails while building next-20160315.
regards
sudip
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Benjamin LaHaise @ 2016-03-15 16:22 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Stephen Rothwell, linux-next, linux-kernel, Michael Ellerman,
Benjamin Herrenschmidt, linuxppc-dev, Al Viro, Christoph Hellwig
In-Reply-To: <20160315161901.GA2713@sudip-laptop>
On Tue, Mar 15, 2016 at 04:19:02PM +0000, Sudip Mukherjee wrote:
> On Tue, Mar 15, 2016 at 05:46:34PM +1100, Stephen Rothwell wrote:
> > Hi Benjamin,
> >
> > After merging the aio tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
> >
> > fs/built-in.o: In function `aio_thread_op_foo_at':
> > aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
> > aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
> >
> > Caused by commit
> >
> > 150a0b4905f1 ("aio: add support for async openat()")
> >
> > despite commit
> >
> > d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
> >
> > This is due to a bug in the powerpc __get_user_check() macro (the return
> > value is defined to be "unsigned long" which is only 32 bits on a 32
> > bit platform).
>
> m68k allmodconfig and all defs of m32r fails while building next-20160315.
>
> regards
> sudip
I've removed everything from the aio-next.git tree for now. Will revisit
after the merge window.
-ben
--
"Thought is the essence of where you are now."
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Arnd Bergmann @ 2016-03-15 16:42 UTC (permalink / raw)
To: linuxppc-dev
Cc: Andy Shevchenko, Stephen Rothwell, linux-kernel@vger.kernel.org,
Benjamin LaHaise, linux-next, Christoph Hellwig, Al Viro
In-Reply-To: <CAHp75VcjmDsgStAZVA=0EU4nQwCx-s+4kF_CsmSrrZtVpVg1bA@mail.gmail.com>
On Tuesday 15 March 2016 16:38:51 Andy Shevchenko wrote:
> On Tue, Mar 15, 2016 at 8:46 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Benjamin,
> >
> > After merging the aio tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
> >
> > fs/built-in.o: In function `aio_thread_op_foo_at':
> > aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
> > aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
>
> avr32 seems affected as well and the below solution is not suitable
> (should be much more verbose in asm, I guess).
>
ARM as well, at least for ARMv7-M.
Arnd
^ permalink raw reply
* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Qais Yousef @ 2016-03-15 21:55 UTC (permalink / raw)
To: Guenter Roeck, Stephen Rothwell
Cc: linux-next, linux-kernel, Qais Yousef, Ralf Baechle, linux-mips
In-Reply-To: <20160315052659.GA9320@roeck-us.net>
Hi Guenter,
On 15/03/2016 05:26, Guenter Roeck wrote:
> On Mon, Mar 14, 2016 at 07:37:29AM -0700, Guenter Roeck wrote:
>> On Mon, Mar 14, 2016 at 05:40:37PM +1100, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20160311:
>>>
>>> The vfs tree gained a conflict against Linus' tree. I also applied a
>>> patch for a known runtime bug.
>>>
>>> The tip tree gained a conflict against the mips tree.
>>>
>>> The aio tree still had a build failure so I removed several commits
>>> from it. It also gained a conflict against the vfs tree.
>>>
>>> Non-merge commits (relative to Linus' tree): 11202
>>> 8646 files changed, 426680 insertions(+), 211740 deletions(-)
>>>
>> To give people an idea what to expect in the merge window, here are my current
>> build and runtime test results. Some of the runtime failures are due to the
>> newly introduced i2c bug, but many (including the arm64 boot failures) have
>> been around for a while.
>>
> [ ... ]
>
>> Qemu test results:
>> total: 96 pass: 69 fail: 27
>> Failed tests:
> [ ... ]
>> mips:mips_malta_smp_defconfig
> I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp CMP, CPS and MT
> use the new generic IPI functions". Bisect log is attached.
Thanks for bisecting this. I tested this on a real Malta system but not
qemu. I'll try to reproduce.
Can I get qemu run script and the instructions to use it from somewhere?
Thanks,
Qais
>
>> mips64:smp:mips_malta64_defconfig
>> mips:mipsel_malta_smp_defconfig
>> mips:mipsel_malta64_smp_defconfig
> If necessary I can repeat the bisect for those. Please let me know.
>
> Thanks,
> Guenter
>
> ---
> Bisect log:
>
> # bad: [4342eec3c5a2402ca5de3d6e56f541fe1c5171e2] Add linux-next specific files for 20160314
> # good: [f6cede5b49e822ebc41a099fe41ab4989f64e2cb] Linux 4.5-rc7
> git bisect start 'HEAD' 'v4.5-rc7'
> # good: [0525c3e26ec2c43cd509433be3be25210a0154ef] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
> git bisect good 0525c3e26ec2c43cd509433be3be25210a0154ef
> # bad: [385128a1b49762c1b9515c9f6294aeebbc55b956] Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
> git bisect bad 385128a1b49762c1b9515c9f6294aeebbc55b956
> # good: [dfdb27baab4fc45c9399a991270413d0fb1c694a] Merge remote-tracking branch 'spi/for-next'
> git bisect good dfdb27baab4fc45c9399a991270413d0fb1c694a
> # bad: [e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565] Merge branch 'timers/nohz'
> git bisect bad e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565
> # good: [ced30bc9129777d715057d06fc8dbdfd3b81e94d] Merge tag 'perf-core-for-mingo-20160310' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
> git bisect good ced30bc9129777d715057d06fc8dbdfd3b81e94d
> # bad: [656a61d4d9cbb8dfc2d007281190b2eccebad522] manual merge of mm/pkeys
> git bisect bad 656a61d4d9cbb8dfc2d007281190b2eccebad522
> # good: [16f7379f2da43f29d9faa2f474745e2705a3f510] Merge branch 'efi/core'
> git bisect good 16f7379f2da43f29d9faa2f474745e2705a3f510
> # bad: [a7fb9a8169be9a55e0cfb98346aece1b51c016fa] Merge branch 'locking/core'
> git bisect bad a7fb9a8169be9a55e0cfb98346aece1b51c016fa
> # good: [2a07870511829977d02609dac6450017b0419ea9] irqchip/mips-gic: Use gic_vpes instead of NR_CPUS
> git bisect good 2a07870511829977d02609dac6450017b0419ea9
> # good: [eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7] locking/pvqspinlock: Move lock stealing count tracking code into pv_queued_spin_steal_lock()
> git bisect good eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7
> # good: [013e379a3094ff2898f8d33cfbff1573d471ee14] tools/lib/lockdep: Fix link creation warning
> git bisect good 013e379a3094ff2898f8d33cfbff1573d471ee14
> # bad: [7eb8c99db26cc6499bfb1eba72dffc4730570752] MIPS: Delete smp-gic.c
> git bisect bad 7eb8c99db26cc6499bfb1eba72dffc4730570752
> # good: [fbde2d7d8290d8c642d591a471356abda2446874] MIPS: Add generic SMP IPI support
> git bisect good fbde2d7d8290d8c642d591a471356abda2446874
> # bad: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
> git bisect bad bb11cff327e54179c13446c4022ed4ed7d4871c7
> # first bad commit: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Arnd Bergmann @ 2016-03-15 22:02 UTC (permalink / raw)
To: linuxppc-dev
Cc: Benjamin LaHaise, Sudip Mukherjee, Stephen Rothwell, linux-kernel,
linux-next, Al Viro, Christoph Hellwig
In-Reply-To: <20160315162228.GP17923@kvack.org>
On Tuesday 15 March 2016 12:22:28 Benjamin LaHaise wrote:
> On Tue, Mar 15, 2016 at 04:19:02PM +0000, Sudip Mukherjee wrote:
> > On Tue, Mar 15, 2016 at 05:46:34PM +1100, Stephen Rothwell wrote:
> > > Hi Benjamin,
> > >
> > > After merging the aio tree, today's linux-next build (powerpc
> > > ppc44x_defconfig) failed like this:
> > >
> > > fs/built-in.o: In function `aio_thread_op_foo_at':
> > > aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
> > > aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
> > >
> > > Caused by commit
> > >
> > > 150a0b4905f1 ("aio: add support for async openat()")
> > >
> > > despite commit
> > >
> > > d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
> > >
> > > This is due to a bug in the powerpc __get_user_check() macro (the return
> > > value is defined to be "unsigned long" which is only 32 bits on a 32
> > > bit platform).
> >
> > m68k allmodconfig and all defs of m32r fails while building next-20160315.
> >
> > regards
> > sudip
>
> I've removed everything from the aio-next.git tree for now. Will revisit
> after the merge window.
>
I've also sent a patch that fixes the link error on ARM and that should
work on all other architectures too.
Arnd
^ permalink raw reply
* mmotm 2016-03-15-16-15 uploaded
From: akpm @ 2016-03-15 23:16 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-03-15-16-15 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.5:
(patches marked "*" will be included in linux-next)
origin.patch
* init-mainc-use-list_for_each_entry.patch
* tags-fix-define_per_cpu-expansions.patch
* m32r-mm-fix-build-warning.patch
* blackfin-define-dummy-pgprot_writecombine-for-mmu.patch
* ocfs2-cluster-replace-the-interrupt-safe-spinlocks-with-common-ones.patch
* ocfs2-use-spinlock-irqsave-for-downconvert-lock-in-ocfs2_osb_dump.patch
* ocfs2-dlm-fix-a-typo-in-dlmcommonh.patch
* ocfs2-dlm-add-deref_done-message.patch
* ocfs2-dlm-return-in-progress-if-master-can-not-clear-the-refmap-bit-right-now.patch
* ocfs2-dlm-clear-dropping_ref-flag-when-the-master-goes-down.patch
* ocfs2-dlm-return-einval-when-the-lockres-on-migration-target-is-in-dropping_ref-state.patch
* ocfs2-fix-a-tiny-race-that-leads-file-system-read-only.patch
* ocfs2-dlm-fix-a-variable-overflow-problem-in-dlmdomainc.patch
* block-partition-add-partition-specific-uevent-callbacks-for-partition-info.patch
* paride-make-verbose-parameter-an-int-again.patch
* slub-cleanup-code-for-kmem-cgroup-support-to-kmem_cache_free_bulk.patch
* mm-slab-move-slub-alloc-hooks-to-common-mm-slabh.patch
* mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
* slab-use-slab_pre_alloc_hook-in-slab-allocator-shared-with-slub.patch
* mm-kmemcheck-skip-object-if-slab-allocation-failed.patch
* slab-use-slab_post_alloc_hook-in-slab-allocator-shared-with-slub.patch
* slab-implement-bulk-alloc-in-slab-allocator.patch
* slab-avoid-running-debug-slab-code-with-irqs-disabled-for-alloc_bulk.patch
* slab-implement-bulk-free-in-slab-allocator.patch
* mm-new-api-kfree_bulk-for-slabslub-allocators.patch
* mm-fix-some-spelling.patch
* mm-slab-fix-stale-code-comment.patch
* mm-slab-remove-useless-structure-define.patch
* mm-slab-remove-the-checks-for-slab-implementation-bug.patch
* mm-slab-activate-debug_pagealloc-in-slab-when-it-is-actually-enabled.patch
* mm-slab-use-more-appropriate-condition-check-for-debug_pagealloc.patch
* mm-slab-clean-up-debug_pagealloc-processing-code.patch
* mm-slab-alternative-implementation-for-debug_slab_leak.patch
* mm-slab-remove-object-status-buffer-for-debug_slab_leak.patch
* mm-slab-put-the-freelist-at-the-end-of-slab-page.patch
* mm-slab-align-cache-size-first-before-determination-of-off_slab-candidate.patch
* mm-slab-clean-up-cache-type-determination.patch
* mm-slab-do-not-change-cache-size-if-debug-pagealloc-isnt-possible.patch
* mm-slab-make-criteria-for-off-slab-determination-robust-and-simple.patch
* mm-slab-factor-out-slab-list-fixup-code.patch
* mm-slab-factor-out-debugging-initialization-in-cache_init_objs.patch
* mm-slab-introduce-new-slab-management-type-objfreelist_slab.patch
* mm-slab-avoid-returning-values-by-reference.patch
* mm-slab-re-implement-pfmemalloc-support.patch
* slub-drop-lock-at-the-end-of-free_debug_processing.patch
* slub-fix-clean-free_debug_processing-return-paths.patch
* slub-convert-slab_debug_free-to-slab_consistency_checks.patch
* slub-relax-cmpxchg-consistency-restrictions.patch
* mm-slub-support-left-red-zone.patch
* fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
* mm-page_allocc-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
* mm-page_allocc-introduce-kernelcore=mirror-option.patch
* mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
* mm-page-writeback-fix-dirty_ratelimit-calculation.patch
* mm-debug_pagealloc-ask-users-for-default-setting-of-debug_pagealloc.patch
* mm-fix-two-typos-in-comments-for-to_vmem_altmap.patch
* mm-filemap-remove-redundant-code-in-do_read_cache_page.patch
* mm-filemap-avoid-unnecessary-calls-to-lock_page-when-waiting-for-io-to-complete-during-a-read.patch
* tracepoints-move-trace_print_flags-definitions-to-tracepoint-defsh.patch
* mm-tracing-make-show_gfp_flags-up-to-date.patch
* tools-perf-make-gfp_compact_table-up-to-date.patch
* mm-tracing-unify-mm-flags-handling-in-tracepoints-and-printk.patch
* mm-printk-introduce-new-format-string-for-flags.patch
* mm-debug-replace-dump_flags-with-the-new-printk-formats.patch
* mm-page_alloc-print-symbolic-gfp_flags-on-allocation-failure.patch
* mm-oom-print-symbolic-gfp_flags-in-oom-warning.patch
* mm-page_owner-print-migratetype-of-page-and-pageblock-symbolic-flags.patch
* mm-page_owner-convert-page_owner_inited-to-static-key.patch
* mm-page_owner-copy-page-owner-info-during-migration.patch
* mm-page_owner-track-and-print-last-migrate-reason.patch
* mm-page_owner-dump-page-owner-info-from-dump_page.patch
* mm-debug-move-bad-flags-printing-to-bad_page.patch
* mm-page_poisonc-enable-page_poisoning-as-a-separate-option.patch
* mm-page_poisoningc-allow-for-zero-poisoning.patch
* mm-slb-print-gfp_flags-as-strings-in-slab_out_of_memory.patch
* mm-madvise-pass-return-code-of-memory_failure-to-userspace.patch
* mm-memory-failurec-remove-the-useless-undefs.patch
* mm-mempolicy-skip-vm_hugetlb-and-vm_mixedmap-vma-for-lazy-mbind.patch
* make-apply_to_page_range-more-robust.patch
* memory-hotplug-add-automatic-onlining-policy-for-the-newly-added-memory.patch
* xen_balloon-support-memory-auto-onlining-policy.patch
* mm-vmscan-do-not-clear-shrinker_numa_aware-if-nr_node_ids-==-1.patch
* mm-madvise-update-comment-on-sys_madvise.patch
* mm-vmscan-make-zone_reclaimable_pages-more-precise.patch
* mm-memcontrol-generalize-locking-for-the-page-mem_cgroup-binding.patch
* mm-workingset-define-radix-entry-eviction-mask.patch
* mm-workingset-separate-shadow-unpacking-and-refault-calculation.patch
* mm-workingset-eviction-buckets-for-bigmem-lowbit-machines.patch
* mm-workingset-per-cgroup-cache-thrash-detection.patch
* mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages.patch
* mm-simplify-lock_page_memcg.patch
* mm-remove-unnecessary-uses-of-lock_page_memcg.patch
* mm-use-linear_page_index-in-do_fault.patch
* thp-cleanup-split_huge_page.patch
* x86-query-dynamic-debug_pagealloc-setting.patch
* s390-query-dynamic-debug_pagealloc-setting.patch
* x86-also-use-debug_pagealloc_enabled-for-free_init_pages.patch
* mm-memblock-remove-unnecessary-memblock_type-variable.patch
* mm-compaction-fix-invalid-free_pfn-and-compact_cached_free_pfn.patch
* mm-compaction-pass-only-pageblock-aligned-range-to-pageblock_pfn_to_page.patch
* mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous.patch
* mm-migrate-consolidate-mem_cgroup_migrate-calls.patch
* mm-memcontrol-drop-unnecessary-lru-locking-from-mem_cgroup_migrate.patch
* checkpatch-exclude-asm-volatile-from-complex-macro-check.patch
* checkpatch-warn-on-bare-unsigned-or-signed-declarations-without-int.patch
* checkpatch-improve-unspecified_int-test-for-bare-signed-unsigned-uses.patch
* checkpatch-fix-left-brace-warning.patch
* x86-kallsyms-disable-absolute-percpu-symbols-on-smp.patch
* kallsyms-dont-overload-absolute-symbol-type-for-percpu-symbols.patch
* kallsyms-add-support-for-relative-offsets-in-kallsyms-address-table.patch
* autofs-show-pipe-inode-in-mount-options.patch
* autofs4-coding-style-fixes.patch
* autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
* autofs4-fix-coding-style-line-length-in-autofs4_wait.patch
* autofs4-fix-invalid-ioctl-return-in-autofs4_root_ioctl_unlocked.patch
* autofs4-fix-some-white-space-errors.patch
* autofs4-make-autofs-log-prints-consistent.patch
* autofs4-change-log-print-macros-to-not-insert-newline.patch
* autofs4-use-pr_xxx-macros-directly-for-logging.patch
* autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
* ia64-define-ioremap_uc.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-add-ocfs2_write_type_t-type-to-identify-the-caller-of-write.patch
* ocfs2-use-c_new-to-indicate-newly-allocated-extents.patch
* ocfs2-test-target-page-before-change-it.patch
* ocfs2-do-not-change-i_size-in-write_end-for-direct-io.patch
* ocfs2-return-the-physical-address-in-ocfs2_write_cluster.patch
* ocfs2-record-unwritten-extents-when-populate-write-desc.patch
* ocfs2-fix-sparse-file-data-ordering-issue-in-direct-io.patch
* ocfs2-code-clean-up-for-direct-io.patch
* ocfs2-code-clean-up-for-direct-io-fix.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
* ocfs2-take-ip_alloc_sem-in-ocfs2_dio_get_block-ocfs2_dio_end_io_write.patch
* ocfs2-fix-disk-file-size-and-memory-file-size-mismatch.patch
* ocfs2-fix-a-deadlock-issue-in-ocfs2_dio_end_io_write.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v2.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v3.patch
* ocfs2-dlm-fix-bug-in-dlm_move_lockres_to_recovery_list.patch
* ocfs2-extend-transaction-for-ocfs2_remove_rightmost_path-and-ocfs2_update_edge_lengths-before-to-avoid-inconsistency-between-inode-and-et.patch
* extend-enough-credits-for-freeing-one-truncate-record-while-replaying-truncate-records.patch
* ocfs2-avoid-occurring-deadlock-by-changing-ocfs2_wq-from-global-to-local.patch
* ocfs2-solve-a-problem-of-crossing-the-boundary-in-updating-backups.patch
* ocfs2-export-ocfs2_kset-for-online-file-check.patch
* ocfs2-sysfile-interfaces-for-online-file-check.patch
* ocfs2-sysfile-interfaces-for-online-file-check-v4.patch
* ocfs2-create-remove-sysfile-for-online-file-check.patch
* ocfs2-check-fix-inode-block-for-online-file-check.patch
* ocfs2-check-fix-inode-block-for-online-file-check-v4.patch
* ocfs2-add-feature-document-for-online-file-check.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert.patch
* ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* watchdog-dont-run-proc_watchdog_update-if-new-value-is-same-as-old.patch
mm.patch
* sched-add-schedule_timeout_idle.patch
* mm-oom-introduce-oom-reaper.patch
* oom-reaper-handle-mlocked-pages.patch
* oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch
* oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space-fix-2.patch
* mm-oom_reaper-report-success-failure.patch
* mm-oom_reaper-report-success-failure-fix.patch
* mm-oom_reaper-report-success-failure-fix-2.patch
* mm-oom_reaper-report-success-failure-fix-fix.patch
* mm-oom_reaper-implement-oom-victims-queuing.patch
* mm-oom_reaper-implement-oom-victims-queuing-fix.patch
* oom-make-oom_reaper-freezable.patch
* oom-oom_reaper-disable-oom_reaper-for-oom_kill_allocating_task.patch
* mm-oom_kill-dont-ignore-oom-score-on-exiting-tasks.patch
* mm-memcontrol-do-not-bypass-slab-charge-if-memcg-is-offline.patch
* mm-memcontrol-make-tree_statevents-fetch-all-stats.patch
* mm-memcontrol-make-tree_statevents-fetch-all-stats-fix.patch
* mm-memcontrol-report-slab-usage-in-cgroup2-memorystat.patch
* mm-memcontrol-report-kernel-stack-usage-in-cgroup2-memorystat.patch
* mm-memcontrol-report-kernel-stack-usage-in-cgroup2-memorystat-v2.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
* proc-kpageflags-return-kpf_slab-for-slab-tail-pages.patch
* tools-vm-page-typesc-support-swap-entry.patch
* mm-vmalloc-query-dynamic-debug_pagealloc-setting.patch
* mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
* mm-slub-query-dynamic-debug_pagealloc-setting.patch
* mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
* mm-slub-query-dynamic-debug_pagealloc-setting-v2.patch
* sound-query-dynamic-debug_pagealloc-setting.patch
* sound-query-dynamic-debug_pagealloc-setting-fix.patch
* powerpc-query-dynamic-debug_pagealloc-setting.patch
* tile-query-dynamic-debug_pagealloc-setting.patch
* mm-kswapd-remove-bogus-check-of-balance_classzone_idx.patch
* mm-compaction-introduce-kcompactd.patch
* mm-compaction-introduce-kcompactd-fix.patch
* mm-compaction-introduce-kcompactd-fix-2.patch
* mm-compaction-introduce-kcompactd-fix-3.patch
* mm-compaction-introduce-kcompactd-fix-4.patch
* mm-memory-hotplug-small-cleanup-in-online_pages.patch
* mm-kswapd-replace-kswapd-compaction-with-waking-up-kcompactd.patch
* tools-vm-page-typesc-add-memory-cgroup-dumping-and-filtering.patch
* tools-vm-page-typesc-add-memory-cgroup-dumping-and-filtering-fix.patch
* bufferhead-force-inlining-of-buffer-head-flag-operations.patch
* force-inlining-of-selected-page-flag-modifications.patch
* mm-memcontrol-enable-kmem-accounting-for-all-cgroups-in-the-legacy-hierarchy.patch
* mm-vmscan-pass-root_mem_cgroup-instead-of-null-to-memcg-aware-shrinker.patch
* mm-memcontrol-zap-memcg_kmem_online-helper.patch
* radix-tree-account-radix_tree_node-to-memory-cgroup.patch
* mm-workingset-size-shadow-nodes-lru-basing-on-file-cache-size.patch
* mm-workingset-make-shadow-node-shrinker-memcg-aware.patch
* thp-vmstats-count-deferred-split-events.patch
* thp-vmstats-count-deferred-split-events-v2.patch
* mm-move-max_map_count-bits-into-mmh.patch
* mm-dedupclicate-memory-overcommitment-code.patch
* mm-tracing-refresh-__def_vmaflag_names.patch
* mm-tracing-refresh-__def_vmaflag_names-fix.patch
* mm-thp-migration-switch-from-flush_tlb_range-to-flush_pmd_tlb_range.patch
* arc-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* mm-kconfig-remove-redundant-arch-depend-for-memory-hotplug.patch
* calculate-available-memory-in-the-separate-function.patch
* virtio_balloon-export-available-memory-to-balloon-statistics.patch
* mm-cleanup-pte_alloc-interfaces.patch
* mm-cleanup-pte_alloc-interfaces-fix.patch
* mm-cleanup-pte_alloc-interfaces-fix-2.patch
* mm-scale-kswapd-watermarks-in-proportion-to-memory.patch
* mm-scale-kswapd-watermarks-in-proportion-to-memory-v3.patch
* mm-remove-unnecessary-description-about-a-non-exist-gfp-flag.patch
* mm-mempool-only-set-__gfp_nomemalloc-if-there-are-free-elements.patch
* mm-thp-set-thp-defrag-by-default-to-madvise-and-add-a-stall-free-defrag-option.patch
* mm-thp-set-thp-defrag-by-default-to-madvise-and-add-a-stall-free-defrag-option-fix.patch
* mm-introduce-page-reference-manipulation-functions.patch
* mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation.patch
* mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-2.patch
* mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-3.patch
* mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation-fix-3-fix.patch
* mm-remove-__gfp_nofail-is-deprecated-comment.patch
* mm-memory-hotplug-print-debug-message-in-the-proper-way-for-online_pages.patch
* mm-memcontrol-cleanup-css_reset-callback.patch
* mm-exclude-zone_device-from-gfp_zone_table.patch
* mm-convert-pr_warning-to-pr_warn.patch
* mm-coalesce-split-strings.patch
* mm-convert-printkkern_level-to-pr_level.patch
* mm-percpu-use-pr_fmt-to-prefix-output.patch
* mm-remove-vm_fault_minor.patch
* mm-zone_device-depends-on-sparsemem_vmemmap.patch
* rmap-introduce-rmap_walk_locked.patch
* rmap-extend-try_to_unmap-to-be-usable-by-split_huge_page.patch
* mm-make-remove_migration_ptes-beyond-mm-migrationc.patch
* thp-rewrite-freeze_page-unfreeze_page-with-generic-rmap-walkers.patch
* thp-rewrite-freeze_page-unfreeze_page-with-generic-rmap-walkers-fix.patch
* thp-fix-deadlock-in-split_huge_pmd.patch
* mm-meminit-initialise-more-memory-for-inode-dentry-hash-tables-in-early-boot.patch
* powerpc-mm-enable-page-parallel-initialisation.patch
* tools-vm-page-typesc-avoid-memset-in-walk_pfn-when-count-==-1.patch
* mm-memcontrol-reclaim-when-shrinking-memoryhigh-below-usage.patch
* mm-memcontrol-reclaim-and-oom-kill-when-shrinking-memorymax-below-usage.patch
* mm-memcontrol-clarify-the-uncharge_list-loop.patch
* mm-memcontrol-zap-oom_info_lock.patch
* mm-vmalloc-reuse-page_aligned-to-check-page_size-aligned.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-3.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* kasan-modify-kmalloc_large_oob_right-add-kmalloc_pagealloc_oob_right.patch
* mm-kasan-slab-support.patch
* mm-kasan-added-gfp-flags-to-kasan-api.patch
* arch-ftrace-for-kasan-put-hard-soft-irq-entries-into-separate-sections.patch
* mm-kasan-stackdepot-implementation-enable-stackdepot-for-slab.patch
* mm-kasan-stackdepot-implementation-enable-stackdepot-for-slab-fix.patch
* mm-kasan-stackdepot-implementation-enable-stackdepot-for-slab-v8.patch
* kasan-test-fix-warn-if-the-uaf-could-not-be-detected-in-kmalloc_uaf2.patch
* mm-kasan-initial-memory-quarantine-implementation.patch
* mm-kasan-initial-memory-quarantine-implementation-v8.patch
* zsmalloc-drop-unused-member-mapping_area-huge.patch
* zram-export-the-number-of-available-comp-streams.patch
* zram-export-the-number-of-available-comp-streams-fix.patch
* mm-zsmalloc-add-freeable-column-to-pool-stat.patch
* mm-zsmalloc-add-freeable-column-to-pool-stat-fix.patch
* mmoom-make-oom_killer_disable-killable.patch
* mmoom-do-not-loop-__gfp_fs-allocation-if-the-oom-killer-is-disabled.patch
* mm-oom-rework-oom-detection.patch
* mm-oom-rework-oom-detection-checkpatch-fixes.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* timer-convert-timer_slack_ns-from-unsigned-long-to-u64.patch
* proc-add-proc-pid-timerslack_ns-interface.patch
* proc-add-proc-pid-timerslack_ns-interface-fix.patch
* procfs-add-conditional-compilation-check.patch
* proc-base-make-prompt-shell-start-from-new-line-after-executing-cat-proc-pid-wchan.patch
* proc-vmcore-wrong-data-type-casting-fix.patch
* mn10300-c6x-config_generic_bug-must-depend-on-config_bug.patch
* arch-mn10300-kernel-fpu-nofpuc-needs-asm-elfh.patch
* bug-set-warn-variable-before-calling-warn.patch
* fix-my-email-addresses.patch
* remove-v850-from-linux-elf-emh.patch
* kernel-hung_taskc-use-timeout-diff-when-timeout-is-updated.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-use-irq-work-only-when-ready.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-move-can_use_console-out-of-console_trylock_for_printk.patch
* printk-set-may_schedule-for-some-of-console_trylock-callers.patch
* printk-check-con_enabled-in-have_callable_console.patch
* printk-add-clear_idx-symbol-to-vmcoreinfo.patch
* maintainers-update-s-par-driver-maintainer-list.patch
* include-linux-list_blh-use-bool-instead-of-int-for-boolean-functions.patch
* lib-bug-make-panic_on_warn-available-for-all-architectures.patch
* radix-tree-add-an-explicit-include-of-bitopsh.patch
* radix-tree-test-harness.patch
* radix-tree-test-harness-fix.patch
* radix_tree-tag-all-internal-tree-nodes-as-indirect-pointers.patch
* radix_tree-loop-based-on-shift-count-not-height.patch
* radix_tree-add-support-for-multi-order-entries.patch
* radix_tree-add-radix_tree_dump.patch
* btrfs-use-radix_tree_iter_retry.patch
* btrfs-use-radix_tree_iter_retry-fix.patch
* mm-use-radix_tree_iter_retry.patch
* mm-use-radix_tree_iter_retry-fix.patch
* radix-treeshmem-introduce-radix_tree_iter_next.patch
* radix-treeshmem-introduce-radix_tree_iter_next-fix.patch
* radix-tree-tests-add-regression3-test.patch
* radix-tree-tests-add-test-for-radix_tree_iter_next.patch
* lib-string-introduce-match_string-helper.patch
* lib-string-introduce-match_string-helper-fix.patch
* device-property-convert-to-use-match_string-helper.patch
* device-property-convert-to-use-match_string-helper-fix.patch
* pinctrl-convert-to-use-match_string-helper.patch
* drm-edid-convert-to-use-match_string-helper.patch
* power-charger_manager-convert-to-use-match_string-helper.patch
* power-ab8500-convert-to-use-match_string-helper.patch
* ata-hpt366-convert-to-use-match_string-helper.patch
* ide-hpt366-convert-to-use-match_string-helper.patch
* usb-common-convert-to-use-match_string-helper.patch
* asm-generic-force-inlining-of-some-atomic_long-operations.patch
* force-inlining-of-some-byteswap-operations.patch
* force-inlining-of-unaligned-byteswap-operations.patch
* lib-move-strtobool-to-kstrtobool.patch
* lib-update-single-char-callers-of-strtobool.patch
* lib-add-on-off-support-to-kstrtobool.patch
* param-convert-some-on-off-users-to-strtobool.patch
* param-convert-some-on-off-users-to-strtobool-fix.patch
* lib-bugc-use-common-warn-helper.patch
* sscanf-implement-basic-character-sets.patch
* sscanf-implement-basic-character-sets-fix.patch
* mm-utilc-add-kstrimdup.patch
* lib-add-crc64-ecma-module.patch
* compat-add-in_compat_syscall-to-ask-whether-were-in-a-compat-syscall.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
* sparc-syscall-fix-syscall_get_arch.patch
* seccomp-check-in_compat_syscall-not-is_compat_task-in-strict-mode.patch
* ptrace-in-peek_siginfo-check-syscall-bitness-not-task-bitness.patch
* auditsc-for-seccomp-events-log-syscall-compat-state-using-in_compat_syscall.patch
* staging-lustre-switch-from-is_compat_task-to-in_compat_syscall.patch
* ext4-in-ext4_dir_llseek-check-syscall-bitness-directly.patch
* net-sctp-use-in_compat_syscall-for-sctp_getsockopt_connectx3.patch
* net-xfrm_user-use-in_compat_syscall-to-deny-compat-syscalls.patch
* firewire-use-in_compat_syscall-to-check-ioctl-compatness.patch
* efivars-use-in_compat_syscall-to-check-for-compat-callers.patch
* amdkfd-use-in_compat_syscall-to-check-open-caller-type.patch
* input-redefine-input_compat_test-as-in_compat_syscall.patch
* uhid-check-write-bitness-using-in_compat_syscall.patch
* x86-compat-remove-is_compat_task.patch
* fat-add-config-option-to-set-utf-8-mount-option-by-default.patch
* ptrace-change-__ptrace_unlink-to-clear-ptrace-under-siglock.patch
* fs-coredump-prevent-fsuid=0-dumps-into-user-controlled-directories.patch
* cpumask-remove-incorrect-information-from-comment.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory-v4.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres-v4.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rionet-fix-deadlock-on-smp.patch
* rapidio-rionet-add-capability-to-change-mtu.patch
* rapidio-tsi721-fix-hardcoded-mrrs-setting.patch
* rapidio-tsi721-add-check-for-overlapped-ib-window-mappings.patch
* rapidio-tsi721-add-option-to-configure-direct-mapping-of-ib-window.patch
* rapidio-tsi721_dma-fix-pending-transaction-queue-handling.patch
* rapidio-add-query_mport-operation.patch
* rapidio-tsi721-add-query_mport-callback.patch
* rapidio-add-shutdown-notification-for-rapidio-devices.patch
* rapidio-tsi721-add-shutdown-notification-callback.patch
* rapidio-rionet-add-shutdown-event-handling.patch
* rapidio-rework-common-rio-device-add-delete-routines.patch
* rapidio-move-net-allocation-into-core-code.patch
* rapidio-move-net-allocation-into-core-code-fix.patch
* rapidio-add-core-mport-removal-support.patch
* rapidio-tsi721-add-hw-specific-mport-removal.patch
* powerpc-fsl_rio-changes-to-mport-registration.patch
* rapidio-rionet-add-locking-into-add-remove-device.patch
* rapidio-rionet-add-mport-removal-handling.patch
* rapidio-add-lock-protection-for-doorbell-list.patch
* rapidio-add-lock-protection-for-doorbell-list-fix.patch
* rapidio-move-rio_local_set_device_id-function-to-the-common-core.patch
* rapidio-move-rio_pw_enable-into-core-code.patch
* rapidio-move-rio_pw_enable-into-core-code-fix.patch
* rapidio-add-global-inbound-port-write-interfaces.patch
* rapidio-add-global-inbound-port-write-interfaces-fix.patch
* rapidio-tsi721-fix-locking-in-ob_msg-processing.patch
* rapidio-add-outbound-window-support.patch
* rapidio-tsi721-add-outbound-windows-mapping-support.patch
* rapidio-tsi721-add-filtered-debug-output.patch
* rapidio-tsi721_dma-update-error-reporting-from-prep_sg-callback.patch
* rapidio-tsi721_dma-fix-synchronization-issues.patch
* rapidio-tsi721_dma-fix-hardware-error-handling.patch
* rapidio-add-mport-char-device-driver.patch
* rapidio-add-mport-char-device-driver-fix.patch
* rapidio-add-mport-char-device-driver-fix-2.patch
* rapidio-add-mport-char-device-driver-fix-3.patch
* rapidio-add-mport-char-device-driver-fix-4.patch
* cred-userns-define-current_user_ns-as-a-function.patch
* eventfd-document-lockless-access-in-eventfd_poll.patch
* panic-change-nmi_panic-from-macro-to-function.patch
* ipmi-watchdog-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
* hpwdt-use-nmi_panic-when-kernel-panics-in-nmi-handler.patch
* profile-hide-unused-functions-when-config_proc_fs.patch
* kernel-add-kcov-code-coverage.patch
* kernel-add-kcov-code-coverage-fix.patch
* kernel-add-kcov-code-coverage-fix-2.patch
* kernel-add-kcov-code-coverage-clean-up-code.patch
* kernel-add-kcov-code-coverage-makefile-tweaks.patch
* scripts-gdb-add-version-command.patch
* scripts-gdb-add-cmdline-reader-command.patch
* scripts-gdb-account-for-changes-in-module-data-structure.patch
* kfifo-fix-sparse-complains.patch
* ubsan-fix-tree-wide-wmaybe-uninitialized-false-positives.patch
* ipc-sem-make-semctl-setting-sempid-consistent.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* staging-goldfish-use-6-arg-get_user_pages.patch
* mm-mprotectc-dont-imply-prot_exec-on-non-exec-fs.patch
* add-compile-time-check-for-__arch_si_preamble_size.patch
* memremap-dont-modify-flags.patch
* memremap-add-memremap_wc-flag.patch
* drivers-dma-coherent-use-memremap_wc-for-dma_memory_map.patch
* drivers-dma-coherent-use-memset_io-for-dma_memory_io-mappings.patch
* kernel-convert-pr_warning-to-pr_warn.patch
* dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
* alpha-extable-use-generic-search-and-sort-routines.patch
* s390-extable-use-generic-search-and-sort-routines.patch
* x86-extable-use-generic-search-and-sort-routines.patch
* ia64-extable-use-generic-search-and-sort-routines.patch
mm-add-strictlimit-knob-v2.patch
do_shared_fault-check-that-mmap_sem-is-held.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: build failure after merge of the kbuild tree
From: Stephen Rothwell @ 2016-03-15 23:58 UTC (permalink / raw)
To: Michal Marek
Cc: linux-next, linux-kernel, Daniel Wagner, Peter Zijlstra (Intel),
Thomas Gleixner, Ingo Molnar, Daniel Vetter
Hi Michal,
After merging the kbuild tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/gma500/mdfld_dsi_output.c:407:39: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms,
^
Caused by commit
ea8daa7b9784 ("kbuild: Add option to turn incompatible pointer check into error")
Maybe this needs to be optional?
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Guenter Roeck @ 2016-03-16 0:17 UTC (permalink / raw)
To: Qais Yousef
Cc: Stephen Rothwell, linux-next, linux-kernel, Qais Yousef,
Ralf Baechle, linux-mips
In-Reply-To: <56E884BA.5050103@gmail.com>
On Tue, Mar 15, 2016 at 09:55:06PM +0000, Qais Yousef wrote:
> Hi Guenter,
>
> On 15/03/2016 05:26, Guenter Roeck wrote:
> >On Mon, Mar 14, 2016 at 07:37:29AM -0700, Guenter Roeck wrote:
> >>On Mon, Mar 14, 2016 at 05:40:37PM +1100, Stephen Rothwell wrote:
> >>>Hi all,
> >>>
> >>>Changes since 20160311:
> >>>
> >>>The vfs tree gained a conflict against Linus' tree. I also applied a
> >>>patch for a known runtime bug.
> >>>
> >>>The tip tree gained a conflict against the mips tree.
> >>>
> >>>The aio tree still had a build failure so I removed several commits
> >>>from it. It also gained a conflict against the vfs tree.
> >>>
> >>>Non-merge commits (relative to Linus' tree): 11202
> >>> 8646 files changed, 426680 insertions(+), 211740 deletions(-)
> >>>
> >>To give people an idea what to expect in the merge window, here are my current
> >>build and runtime test results. Some of the runtime failures are due to the
> >>newly introduced i2c bug, but many (including the arm64 boot failures) have
> >>been around for a while.
> >>
> >[ ... ]
> >
> >>Qemu test results:
> >> total: 96 pass: 69 fail: 27
> >>Failed tests:
> >[ ... ]
> >> mips:mips_malta_smp_defconfig
> >I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp CMP, CPS and MT
> >use the new generic IPI functions". Bisect log is attached.
>
> Thanks for bisecting this. I tested this on a real Malta system but not
> qemu. I'll try to reproduce.
>
I run the tests with only a single CPU core enabled. Maybe that causes
problems with your code ?
> Can I get qemu run script and the instructions to use it from somewhere?
>
Clone https://github.com/groeck/linux-build-test.git.
Look in rootfs/*mips* for qemu scripts and root file systems.
The SMP tests all fail, so it should not matter which one you pick.
I use my own version of qemu, but for mips standard qemu 2.5.0 should
work fine (I don't have any mips specific changes in my version).
Hope this helps,
Guenter
> Thanks,
> Qais
>
> >
> >> mips64:smp:mips_malta64_defconfig
> >> mips:mipsel_malta_smp_defconfig
> >> mips:mipsel_malta64_smp_defconfig
> >If necessary I can repeat the bisect for those. Please let me know.
> >
> >Thanks,
> >Guenter
> >
> >---
> >Bisect log:
> >
> ># bad: [4342eec3c5a2402ca5de3d6e56f541fe1c5171e2] Add linux-next specific files for 20160314
> ># good: [f6cede5b49e822ebc41a099fe41ab4989f64e2cb] Linux 4.5-rc7
> >git bisect start 'HEAD' 'v4.5-rc7'
> ># good: [0525c3e26ec2c43cd509433be3be25210a0154ef] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
> >git bisect good 0525c3e26ec2c43cd509433be3be25210a0154ef
> ># bad: [385128a1b49762c1b9515c9f6294aeebbc55b956] Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
> >git bisect bad 385128a1b49762c1b9515c9f6294aeebbc55b956
> ># good: [dfdb27baab4fc45c9399a991270413d0fb1c694a] Merge remote-tracking branch 'spi/for-next'
> >git bisect good dfdb27baab4fc45c9399a991270413d0fb1c694a
> ># bad: [e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565] Merge branch 'timers/nohz'
> >git bisect bad e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565
> ># good: [ced30bc9129777d715057d06fc8dbdfd3b81e94d] Merge tag 'perf-core-for-mingo-20160310' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
> >git bisect good ced30bc9129777d715057d06fc8dbdfd3b81e94d
> ># bad: [656a61d4d9cbb8dfc2d007281190b2eccebad522] manual merge of mm/pkeys
> >git bisect bad 656a61d4d9cbb8dfc2d007281190b2eccebad522
> ># good: [16f7379f2da43f29d9faa2f474745e2705a3f510] Merge branch 'efi/core'
> >git bisect good 16f7379f2da43f29d9faa2f474745e2705a3f510
> ># bad: [a7fb9a8169be9a55e0cfb98346aece1b51c016fa] Merge branch 'locking/core'
> >git bisect bad a7fb9a8169be9a55e0cfb98346aece1b51c016fa
> ># good: [2a07870511829977d02609dac6450017b0419ea9] irqchip/mips-gic: Use gic_vpes instead of NR_CPUS
> >git bisect good 2a07870511829977d02609dac6450017b0419ea9
> ># good: [eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7] locking/pvqspinlock: Move lock stealing count tracking code into pv_queued_spin_steal_lock()
> >git bisect good eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7
> ># good: [013e379a3094ff2898f8d33cfbff1573d471ee14] tools/lib/lockdep: Fix link creation warning
> >git bisect good 013e379a3094ff2898f8d33cfbff1573d471ee14
> ># bad: [7eb8c99db26cc6499bfb1eba72dffc4730570752] MIPS: Delete smp-gic.c
> >git bisect bad 7eb8c99db26cc6499bfb1eba72dffc4730570752
> ># good: [fbde2d7d8290d8c642d591a471356abda2446874] MIPS: Add generic SMP IPI support
> >git bisect good fbde2d7d8290d8c642d591a471356abda2446874
> ># bad: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
> >git bisect bad bb11cff327e54179c13446c4022ed4ed7d4871c7
> ># first bad commit: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
>
^ permalink raw reply
* linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-03-16 0:58 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Amir Vadai, Maor Gottlieb
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
between commit:
60ab4584f5bf ("net/mlx5_core: Set flow steering dest only for forward rules")
from the net-next tree and commit:
b3638e1a7664 ("net/mlx5_core: Introduce forward to next priority action")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index e848d708d2b7,bf3446794bd5..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@@ -73,10 -73,13 +73,13 @@@
#define BY_PASS_MIN_LEVEL (KENREL_MIN_LEVEL + MLX5_BY_PASS_NUM_PRIOS +\
LEFTOVERS_MAX_FT)
-#define KERNEL_MAX_FT 2
-#define KERNEL_NUM_PRIOS 1
+#define KERNEL_MAX_FT 3
+#define KERNEL_NUM_PRIOS 2
#define KENREL_MIN_LEVEL 2
+ #define ANCHOR_MAX_FT 1
+ #define ANCHOR_NUM_PRIOS 1
+ #define ANCHOR_MIN_LEVEL (BY_PASS_MIN_LEVEL + 1)
struct node_caps {
size_t arr_sz;
long *caps;
@@@ -360,8 -367,13 +367,13 @@@ static void del_rule(struct fs_node *no
memcpy(match_value, fte->val, sizeof(fte->val));
fs_get_obj(ft, fg->node.parent);
list_del(&rule->node.list);
+ if (rule->sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
+ mutex_lock(&rule->dest_attr.ft->lock);
+ list_del(&rule->next_ft);
+ mutex_unlock(&rule->dest_attr.ft->lock);
+ }
- fte->dests_size--;
- if (fte->dests_size) {
+ if ((fte->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
+ --fte->dests_size) {
err = mlx5_cmd_update_fte(dev, ft,
fg->id, fte);
if (err)
@@@ -762,9 -835,9 +835,10 @@@ static struct mlx5_flow_rule *alloc_rul
if (!rule)
return NULL;
+ INIT_LIST_HEAD(&rule->next_ft);
rule->node.type = FS_TYPE_FLOW_DEST;
- memcpy(&rule->dest_attr, dest, sizeof(*dest));
+ if (dest)
+ memcpy(&rule->dest_attr, dest, sizeof(*dest));
return rule;
}
@@@ -783,12 -856,16 +857,17 @@@ static struct mlx5_flow_rule *add_rule_
return ERR_PTR(-ENOMEM);
fs_get_obj(ft, fg->node.parent);
- /* Add dest to dests list- added as first element after the head */
+ /* Add dest to dests list- we need flow tables to be in the
+ * end of the list for forward to next prio rules.
+ */
tree_init_node(&rule->node, 1, del_rule);
- list_add_tail(&rule->node.list, &fte->node.children);
+ if (dest && dest->type != MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE)
+ list_add(&rule->node.list, &fte->node.children);
+ else
+ list_add_tail(&rule->node.list, &fte->node.children);
- fte->dests_size++;
- if (fte->dests_size == 1)
+ if (dest)
+ fte->dests_size++;
+ if (fte->dests_size == 1 || !dest)
err = mlx5_cmd_create_fte(get_dev(&ft->node),
ft, fg->id, fte);
else
^ 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