* Re: linux-next: bad commit in the omap tree
From: Tony Lindgren @ 2016-11-09 23:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Santosh Shilimkar, Nishanth Menon,
Keerthy
In-Reply-To: <20161109073700.2ffb276d@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [161108 13:37]:
> Hi Tony,
>
> Commit 63fdf6527272 ("ARM: OMAP5: Add basic cpuidle MPU CSWR support")
> in the omap tree has no Signed-off-by from you as the committer.
Thanks for letting me know, will fix it up.
Tony
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-09 23:50 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Or Gerlitz, Saeed Mahameed,
Hadar Hen Zion
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
between commit:
ee39fbc4447d ("net/mlx5: E-Switch, Set the actions for offloaded rules properly")
from the net tree and commit:
66958ed906b8 ("net/mlx5: Support encap id when setting new steering entry")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index d239f5d0ea36,50fe8e8861bb..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@@ -57,14 -58,14 +58,15 @@@ mlx5_eswitch_add_offloaded_rule(struct
if (esw->mode != SRIOV_OFFLOADS)
return ERR_PTR(-EOPNOTSUPP);
- flow_act.action = attr->action;
+ /* per flow vlan pop/push is emulated, don't set that into the firmware */
- action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
++ flow_act.action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
- if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
- dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
- dest.vport_num = attr->out_rep->vport;
- action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
- } else if (action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {
+ if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
+ dest[i].type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
+ dest[i].vport_num = attr->out_rep->vport;
+ i++;
+ }
+ if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {
counter = mlx5_fc_create(esw->dev, true);
if (IS_ERR(counter))
return ERR_CAST(counter);
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the netfilter tree
From: Stephen Rothwell @ 2016-11-09 23:56 UTC (permalink / raw)
To: David Miller, Networking, Pablo Neira Ayuso, NetFilter
Cc: linux-next, linux-kernel, WANG Cong, Johannes Berg
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/netfilter/ipvs/ip_vs_ctl.c
between commit:
8fbfef7f505b ("ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr")
from the netfilter tree and commit:
489111e5c25b ("genetlink: statically initialize families")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/netfilter/ipvs/ip_vs_ctl.c
index a6e44ef2ec9a,6b85ded4f91d..000000000000
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -3872,10 -3865,20 +3865,20 @@@ static const struct genl_ops ip_vs_genl
},
};
+ static struct genl_family ip_vs_genl_family __ro_after_init = {
+ .hdrsize = 0,
+ .name = IPVS_GENL_NAME,
+ .version = IPVS_GENL_VERSION,
- .maxattr = IPVS_CMD_MAX,
++ .maxattr = IPVS_CMD_ATTR_MAX,
+ .netnsok = true, /* Make ipvsadm to work on netns */
+ .module = THIS_MODULE,
+ .ops = ip_vs_genl_ops,
+ .n_ops = ARRAY_SIZE(ip_vs_genl_ops),
+ };
+
static int __init ip_vs_genl_register(void)
{
- return genl_register_family_with_ops(&ip_vs_genl_family,
- ip_vs_genl_ops);
+ return genl_register_family(&ip_vs_genl_family);
}
static void ip_vs_genl_unregister(void)
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the netfilter tree
From: Pablo Neira Ayuso @ 2016-11-10 0:31 UTC (permalink / raw)
To: David Miller
Cc: Stephen Rothwell, Networking, NetFilter, linux-next, linux-kernel,
WANG Cong, Johannes Berg
In-Reply-To: <20161110105633.31ebdc76@canb.auug.org.au>
Hi David,
On Thu, Nov 10, 2016 at 10:56:33AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/netfilter/ipvs/ip_vs_ctl.c
>
> between commit:
>
> 8fbfef7f505b ("ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr")
>
> from the netfilter tree and commit:
>
> 489111e5c25b ("genetlink: statically initialize families")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
I think I cannot help to address this conflict myself.
8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
you will hit this conflict by when you pull net into net-next.
So please keep this patch from Stephen to resolve the conflict in your
radar to solve this.
Or let me know if you come up with any way I can handle this from here
to reduce your burden. Thanks.
> diff --cc net/netfilter/ipvs/ip_vs_ctl.c
> index a6e44ef2ec9a,6b85ded4f91d..000000000000
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@@ -3872,10 -3865,20 +3865,20 @@@ static const struct genl_ops ip_vs_genl
> },
> };
>
> + static struct genl_family ip_vs_genl_family __ro_after_init = {
> + .hdrsize = 0,
> + .name = IPVS_GENL_NAME,
> + .version = IPVS_GENL_VERSION,
> - .maxattr = IPVS_CMD_MAX,
> ++ .maxattr = IPVS_CMD_ATTR_MAX,
> + .netnsok = true, /* Make ipvsadm to work on netns */
> + .module = THIS_MODULE,
> + .ops = ip_vs_genl_ops,
> + .n_ops = ARRAY_SIZE(ip_vs_genl_ops),
> + };
> +
> static int __init ip_vs_genl_register(void)
> {
> - return genl_register_family_with_ops(&ip_vs_genl_family,
> - ip_vs_genl_ops);
> + return genl_register_family(&ip_vs_genl_family);
> }
>
> static void ip_vs_genl_unregister(void)
^ permalink raw reply
* linux-next: manual merge of the mmc tree with the imx-mxs tree
From: Stephen Rothwell @ 2016-11-10 0:50 UTC (permalink / raw)
To: Ulf Hansson, Shawn Guo; +Cc: linux-next, linux-kernel, Yangbo Lu, Hongtao Jia
Hi Ulf,
Today's linux-next merge of the mmc tree got a conflict in:
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
between commit:
784e94eeb377 ("arm64: dts: ls2080a: Add TMU device tree support for LS2080A")
from the imx-mxs tree and commit:
61ab9ffac1b9 ("ARM64: dts: ls2080a: add device configuration node")
from the mmc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
index aa5a0fbf2cdf,d058e56db72d..000000000000
--- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
@@@ -222,100 -216,12 +222,106 @@@
clocks = <&sysclk>;
};
+ dcfg: dcfg@1e00000 {
+ compatible = "fsl,ls2080a-dcfg", "syscon";
+ reg = <0x0 0x1e00000 0x0 0x10000>;
+ little-endian;
+ };
+
+ tmu: tmu@1f80000 {
+ compatible = "fsl,qoriq-tmu";
+ reg = <0x0 0x1f80000 0x0 0x10000>;
+ interrupts = <0 23 0x4>;
+ fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>;
+ fsl,tmu-calibration = <0x00000000 0x00000026
+ 0x00000001 0x0000002d
+ 0x00000002 0x00000032
+ 0x00000003 0x00000039
+ 0x00000004 0x0000003f
+ 0x00000005 0x00000046
+ 0x00000006 0x0000004d
+ 0x00000007 0x00000054
+ 0x00000008 0x0000005a
+ 0x00000009 0x00000061
+ 0x0000000a 0x0000006a
+ 0x0000000b 0x00000071
+
+ 0x00010000 0x00000025
+ 0x00010001 0x0000002c
+ 0x00010002 0x00000035
+ 0x00010003 0x0000003d
+ 0x00010004 0x00000045
+ 0x00010005 0x0000004e
+ 0x00010006 0x00000057
+ 0x00010007 0x00000061
+ 0x00010008 0x0000006b
+ 0x00010009 0x00000076
+
+ 0x00020000 0x00000029
+ 0x00020001 0x00000033
+ 0x00020002 0x0000003d
+ 0x00020003 0x00000049
+ 0x00020004 0x00000056
+ 0x00020005 0x00000061
+ 0x00020006 0x0000006d
+
+ 0x00030000 0x00000021
+ 0x00030001 0x0000002a
+ 0x00030002 0x0000003c
+ 0x00030003 0x0000004e>;
+ little-endian;
+ #thermal-sensor-cells = <1>;
+ };
+
+ thermal-zones {
+ cpu_thermal: cpu-thermal {
+ polling-delay-passive = <1000>;
+ polling-delay = <5000>;
+
+ thermal-sensors = <&tmu 4>;
+
+ trips {
+ cpu_alert: cpu-alert {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit: cpu-crit {
+ temperature = <85000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+
+ cooling-maps {
+ map0 {
+ trip = <&cpu_alert>;
+ cooling-device =
+ <&cpu0 THERMAL_NO_LIMIT
+ THERMAL_NO_LIMIT>;
+ };
+ map1 {
+ trip = <&cpu_alert>;
+ cooling-device =
+ <&cpu2 THERMAL_NO_LIMIT
+ THERMAL_NO_LIMIT>;
+ };
+ map2 {
+ trip = <&cpu_alert>;
+ cooling-device =
+ <&cpu4 THERMAL_NO_LIMIT
+ THERMAL_NO_LIMIT>;
+ };
+ map3 {
+ trip = <&cpu_alert>;
+ cooling-device =
+ <&cpu6 THERMAL_NO_LIMIT
+ THERMAL_NO_LIMIT>;
+ };
+ };
+ };
+ };
+
serial0: serial@21c0500 {
compatible = "fsl,ns16550", "ns16550a";
reg = <0x0 0x21c0500 0x0 0x100>;
^ permalink raw reply
* Re: linux-next: manual merge of the mmc tree with the imx-mxs tree
From: Shawn Guo @ 2016-11-10 1:35 UTC (permalink / raw)
To: Ulf Hansson
Cc: Stephen Rothwell, Shawn Guo, linux-next, linux-kernel, Yangbo Lu,
Hongtao Jia
In-Reply-To: <20161110115004.431c171e@canb.auug.org.au>
Hi Ulf,
On Thu, Nov 10, 2016 at 11:50:04AM +1100, Stephen Rothwell wrote:
> Hi Ulf,
>
> Today's linux-next merge of the mmc tree got a conflict in:
>
> arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
>
> between commit:
>
> 784e94eeb377 ("arm64: dts: ls2080a: Add TMU device tree support for LS2080A")
>
> from the imx-mxs tree and commit:
>
> 61ab9ffac1b9 ("ARM64: dts: ls2080a: add device configuration node")
Is there a reason why this dts patch has to go through mmc tree? We
normally have them go via arm-soc tree.
Shawn
>
> from the mmc tree.
^ permalink raw reply
* Re: linux-next: build warning after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-11-10 2:56 UTC (permalink / raw)
To: Andrew Morton; +Cc: Huang Shijie, linux-next, linux-kernel, nd
In-Reply-To: <20161109132153.60da86bfe834249ef7b294e9@linux-foundation.org>
Hi Andrew,
On Wed, 9 Nov 2016 13:21:53 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 9 Nov 2016 15:18:24 +0800 Huang Shijie <shijie.huang@arm.com> wrote:
>
> > On Wed, Nov 09, 2016 at 03:10:06PM +1100, Stephen Rothwell wrote:
> > Hi Stephen,
> > > Hi Andrew,
> > >
> > > After merging the akpm-current tree, today's linux-next build (powerpc
> > > ppc64_defconfig) produced this warning:
> > >
> > > mm/hugetlb.c:1166:21: warning: 'alloc_gigantic_page' defined but not used [-Wunused-function]
> > > static struct page *alloc_gigantic_page(int nid, unsigned int order)
> > The warning should be fixed by the patch (or next version of this patch):
> > http://marc.info/?l=linux-mm&m=147867535926059&w=2
>
> I'll drop "mm/hugetlb.c: rename some allocation functions" for now.
> Please change it to fix this warning then add it to the surplus-page
> series when resending that.
I have dropped it from linux-next today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Nov 10
From: Stephen Rothwell @ 2016-11-10 3:50 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20161109:
The asm-generic tree gained a conflict against Linus' tree.
The net-next tree gained conflicts against the net and netfilter trees.
The drm-misc tree lost its build failure.
The sound-asoc tree lost its build failure.
The mmc tree gained a conflict against the imx-mxs tree.
Non-merge commits (relative to Linus' tree): 4874
5328 files changed, 302355 insertions(+), 99335 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 246 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 (27bcd37e0240 Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (cc6acc11cad1 kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL)
Merging arc-current/for-curr (0a0a047def15 ARCv2: MCIP: Use IDU_M_DISTRI_DEST mode if there is only 1 destination core)
Merging arm-current/fixes (6127d124ee4e ARM: wire up new pkey syscalls)
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (b65f63ec547e powerpc/oops: Fix missing pr_cont()s in instruction dump)
Merging sparc/master (0c183d92b20b Merge tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging net/master (cdb26d3387f0 net: bgmac: fix reversed checks for clock control flag)
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed)
Merging netfilter/master (58c78e104d93 netfilter: nf_tables: fix oops when inserting an element into a verdict map)
Merging ipvs/master (b73b8a1ba598 netfilter: nft_dup: do not use sreg_dev if the user doesn't specify it)
Merging wireless-drivers/master (d3532ea6ce4e brcmfmac: avoid maybe-uninitialized warning in brcmf_cfg80211_start_ap)
Merging mac80211/master (269ebce4531b xen-netfront: cast grant table reference first to type int)
Merging sound-current/for-linus (6809cd682b82 ALSA: info: Return error for invalid read/write)
Merging pci-current/for-linus (16d917b130d7 PCI: Don't attempt to claim shadow copies of ROM)
Merging driver-core.current/driver-core-linus (bdacd1b426db driver core: fix smatch warning on dev->bus check)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (7309aa847ead cdc-acm: fix uninitialized variable)
Merging usb-gadget-fixes/fixes (fd9afd3cbe40 usb: gadget: u_ether: remove interrupt throttling)
Merging usb-serial-fixes/usb-linus (9bfef729a3d1 USB: serial: ftdi_sio: add support for TI CC3200 LaunchPad)
Merging usb-chipidea-fixes/ci-for-usb-stable (991d5add50a5 usb: chipidea: host: fix NULL ptr dereference during shutdown)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (68fae2f3df45 staging: nvec: remove managed resource from PS2 driver)
Merging char-misc.current/char-misc-linus (f6b2db084b65 vmbus: make sysfs names consistent with PCI)
Merging input-current/for-linus (324ae0958cab Input: psmouse - cleanup Focaltech code)
Merging crypto-current/master (6d4952d9d9d4 hwrng: core - Don't use a stack buffer in add_early_randomness())
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-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 (51717929d835 mfd: intel_soc_pmic_bxtwc: Fix usbc interrupt)
Merging drm-intel-fixes/for-linux-next-fixes (54905ab5fe7a drm/i915: Limit Valleyview and earlier to only using mappable scanout)
Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (1001354ca341 Linux 4.9-rc1)
Merging arm/for-next (f167e1f561ae Merge branches 'fixes', 'misc', 'sa1100-base' and 'syscalls' into for-next)
Merging arm-perf/for-next/perf (1001354ca341 Linux 4.9-rc1)
Merging arm-soc/for-next (1e1ce567d3a6 ARM: SoC: Document merges)
Merging pinctrl/for-next (b5e88cff3ceb Merge branch 'devel' into for-next)
Merging amlogic/for-next (8c8a1078e8a3 Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (391823c4373c Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (e6e1aa531aa6 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (2312974a29a8 Merge branch 'mvebu/dt64-fix' into mvebu/for-next)
Merging omap/for-next (6e32e0eda2c9 Merge branch 'omap-for-v4.10/cpuidle' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (c49806e0fa1e Merge branch 'arm64-for-5.0' into all-for-5.0)
Merging renesas/next (2718ccacfc8c Merge branches 'arm64-dt-for-v4.10' and 'dt-for-v4.10' into next)
Merging rockchip/for-next (db8b073d569e Merge branch 'v4.10-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (1acb537b2fd1 Merge branch 'next/dt' into for-next)
Merging tegra/for-next (817d74019bab Merge branch for-4.10/arm/defconfig into for-next)
Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (c78874f116be tty: serial: make crisv10 explicitly non-modular)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (25ba49085c4f m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (98a87d21afd5 m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (3f56647d2d68 Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8)
Merging powerpc/next (08bf75ba852e powerpc/mm/hash64: Fix might_have_hea() check)
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (847e0700121b s390: remove unneeded dependency for gen_facilities)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (d4eccafcaf33 xtensa: clean up printk usage for boot/crash logging)
Merging befs/for-next (3c8a965ad630 befs: remove signatures from comments)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (2a782f537899 Merge branch 'for-next-next-4.9-20161108' into for-next-20161108)
Merging ceph/master (5130ccea7cf4 ceph: fix non static symbol warning)
Merging cifs/for-next (faad81c4f581 CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix())
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (e952813e210b ext2: avoid bogus -Wmaybe-uninitialized warning)
Merging ext4/dev (d74f3d25289a ext4: add missing KERN_CONT to a few more debugging uses)
Merging f2fs/dev (751e1d334e73 f2fs: return directly if block has been removed from the victim)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0ce267ff95a0 fuse: fix root dentry initialization)
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs)
Merging nfsd/nfsd-next (56094edd1797 sunrpc: GFP_KERNEL should be GFP_NOFS in crypto code)
Merging orangefs/for-next (dc0336214eb0 orangefs: clean up debugfs)
Merging overlayfs/overlayfs-next (b454c10e53ca ovl: split super.c)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir())
Merging xfs/for-next (84716639acc3 Merge branch 'xfs-4.10-misc-fixes-1' into for-next)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
Merging pci/next (1001354ca341 Linux 4.9-rc1)
Merging pstore/for-next/pstore (07d9a380680d Linux 4.9-rc2)
Merging hid/for-next (003ba7361116 Merge branch 'for-4.10/upstream' into for-next)
Merging i2c/i2c/for-next (bc33b0ca11e3 Linux 4.9-rc4)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (c8d2bc9bc39e Linux 4.8)
Merging hwmon-staging/hwmon-next (c2d95c252f65 hwmon: (adm1275) Enable adm1278 VOUT sampling)
Merging jc_docs/docs-next (d55003d86e0c USB: fix typo in documentation)
Merging v4l-dvb/master (778de0140232 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (d6555d53674f Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (3105f234e0ab thermal/powerclamp: correct cpu support check)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (8e6e596b06db Merge branch 'sfc-udp-rss')
CONFLICT (content): Merge conflict in net/netlink/genetlink.c
CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (08733a0cb7de netfilter: handle NF_REPEAT from nf_conntrack_in())
Merging ipvs-next/master (75a608d8d3b2 ipvs: Decrement ttl)
Merging wireless-drivers-next/master (9afdd6128c39 cw1200: Don't leak memory if krealloc failes)
Merging bluetooth/master (52069883235a Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer)
Merging mac80211-next/master (17197236d62c enic: set skb->hash type properly)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging rdma-leon-test/testing/rdma-next (33b4f7c41bae Merge branch 'testing/queue-next' into testing/rdma-next)
CONFLICT (content): Merge conflict in drivers/infiniband/core/roce_gid_mgmt.c
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (64ad46379fcf mtd: bcm47xxsflash: use uncached MMIO access for BCM53573)
Merging nand/nand/next (83f48f80de8a mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo)
Merging crypto/master (89277a7d0ed4 crypto: cryptd - Remove unused but set variable 'tfm')
Merging drm/drm-next (afdd548f742c Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (6a5d1db98ef1 drm/i915: Spin until breadcrumb threads are complete)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-tegra/drm/tegra/for-next (cc09cb6da9b0 drm/tegra: gem: Remove some dead code)
Merging drm-misc/topic/drm-misc (4b514e10157a drm: Make DRM_DEBUG_MM depend on STACKTRACE_SUPPORT)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (e64053f05eb9 drm: mali-dp: Clear CVAL when leaving config mode)
Merging sunxi/sunxi/for-next (bc5952be2d42 Merge branch 'sunxi/dt64-for-4.10' into sunxi/for-next)
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (74e3368de87d Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus)
Merging sound/for-next (4ce8e6a51abf ALSA: hda - Fix typo)
Merging sound-asoc/for-next (397256545911 Merge remote-tracking branches 'asoc/topic/wm8978', 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (a467a672cf09 MAINTAINERS: Begin module maintainer transition)
Merging input/next (406d5a2de071 Input: da9062 - update bindings docs to account for da9061)
Merging block/for-next (50392ad4dc6a Merge branch 'for-4.10/block' into for-next)
Merging lightnvm/for-next (b759d3ddb52f lightnvm: rrpc: split bios of size > 256kb)
Merging device-mapper/for-next (5c5eb3db2893 dm cache metadata: DM_CACHE_FEATURE_INCOMPAT_SEP_DIRTY_BITS)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (b1c8ff01a275 mmc: sdhci-of-esdhc: fix host version for T4240-R1.0-R2.0)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (be306c298980 md: define mddev flags, recovery flags and r1bio state bits using enums)
Merging mfd/for-mfd-next (77f298a18ff8 mfd: sun4i-gpadc: Fix 'cast from pointer to integer of different size' warning)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (44fccac4ff17 power: supply: lp8788: remove an unneeded NULL check)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (264091ba0387 Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/fixed' and 'regulator/topic/tps6507x' into regulator-next)
Merging security/next (07d9a380680d Linux 4.9-rc2)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (07d9a380680d Linux 4.9-rc2)
Merging tpmdd/next (7839a496de6d char: tpm: fix kerneldoc tpm2_unseal_trusted name typo)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (bea64033dd7b iommu/vt-d: Fix dead-locks in disable_dmar_iommu() path)
Merging dwmw2-iommu/master (5b3c5c539eac iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors)
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
Merging audit/next (b4eb4f7f1a97 audit: less stack usage for /proc/*/loginuid)
Merging devicetree/for-next (87e5fc99b028 DT: irqchip: renesas-irqc: document R8A7743/5 support)
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (dd832aaffbaf Merge remote-tracking branches 'spi/topic/omap', 'spi/topic/rspi', 'spi/topic/s3c64xx', 'spi/topic/spidev' and 'spi/topic/sunxi' into spi-next)
Merging tip/auto-latest (b2eca6314533 Merge branch 'linus')
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (90e493d7d51c EDAC, altera: Disable IRQs while injecting SDRAM errors)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
Merging rcu/rcu/next (7bbb80d5f612 rcu: Maintain special bits at bottom of ->dynticks counter)
Merging kvm/linux-next (6314a17fec5c Merge tag 'tags/for-kvmgt' into HEAD)
Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (999c9af9e3a2 xen: make use of xenbus_read_unsigned() in xenbus)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (401df5ace9d6 intel_pmc_core: Add KBL CPUID support)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (75a5efdad172 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (6f48ef64097b ipmi: Pick up slave address from SMBIOS on an ACPI device)
Merging driver-core/driver-core-next (baa8809f6097 PM / runtime: Optimize the use of device links)
Merging tty/tty-next (5131dcd78108 Merge 4.9-rc3 into tty-next)
CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree.
$ git rm -f Documentation/VGA-softcursor.txt
Merging usb/usb-next (11f107f708fd usb: storage: drop freezer.h usage)
Merging usb-gadget/next (a909d3e63699 Linux 4.9-rc3)
Merging usb-serial/usb-next (a98b69002a16 USB: serial: ch341: add debug output for chip version)
Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
Merging phy-next/next (7809cd2ce6ab phy: meson: add USB2 PHY support for Meson8b and GXBB)
Merging staging/staging-next (993403b97981 staging: lustre: fixed shadowed variable in socklnd_cb.c)
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merging char-misc/char-misc-next (3372592a140d Drivers: hv: vmbus: On the read path cleanup the logic to interrupt the host)
Merging extcon/extcon-next (56182a830cbf extcon: usb-gpio: Add VBUS detection support)
Merging slave-dma/next (8d197083fd9f Merge branch 'topic/qcom' into next)
Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
Merging scsi/for-next (ce769f7be3c4 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (4861ee15f2b7 scsi: ufs: Use the resource-managed function to add devfreq device)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufs-qcom.c
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (c05b7b88dd3c Merge branch 'for-4.10' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
Merging rpmsg/for-next (9641800e7ea2 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b38b2dfcf2a3 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging userns/for-next (2e41414828bb mm: Add a user_ns owner to mm_struct and fix ptrace permission checks)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (172ff5a22d4c clk: ti: make clk-dra7-atl explicitly non-modular)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1001354ca341 Linux 4.9-rc1)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (dcc37f904443 processor.h: remove cpu_relax_lowlatency)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (7f73c6f7d72a coresight: Add support for ARM Coresight STM-500)
Merging rtc/rtc-next (72d3d79f8da9 rtc: fix typos in Kconfig)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (52e73eb2872c device-dax: fix percpu_ref_exit ordering)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (08f9f8e62434 ipc/shm.c: coding style fixes)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: kexec_file: allow arch-specific memory walking for kexec_add_buffer
Applying: kexec_file: change kexec_add_buffer to take kexec_buf as argument
Applying: kexec_file: factor out kexec_locate_mem_hole from kexec_add_buffer
Applying: powerpc: change places using CONFIG_KEXEC to use CONFIG_KEXEC_CORE instead
Applying: powerpc: factor out relocation code in module_64.c
Applying: powerpc: implement kexec_file_load
Applying: powerpc: add functions to read ELF files of any endianness
Applying: powerpc: add support for loading ELF kernels with kexec_file_load
Applying: powerpc: add purgatory for kexec_file_load implementation
Applying: powerpc: enable CONFIG_KEXEC_FILE in powerpc server defconfigs
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Merging akpm/master (9d9dff31b790 sparc: implement watchdog_nmi_enable and watchdog_nmi_disable)
^ permalink raw reply
* next-20161110 build: 0 failures 1 warnings (next-20161110)
From: Build bot for Mark Brown @ 2016-11-10 6:48 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161110
Git describe: next-20161110
Commit: 6e637d6fd5 Add linux-next specific files for 20161110
Build Time: 88 min 18 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 1
Section Mismatches: 4
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
0 warnings 2 mismatches : arm64-allmodconfig
1 warnings 2 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 1
1 ../drivers/tty/serial/pxa.c:944:1: warning: 'serial_pxa_init' is deprecated [-Wdeprecated-declarations]
Section Mismatch Summary: 4
1 WARNING: vmlinux.o(.text+0x78c114): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: vmlinux.o(.text+0x544400): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: drivers/built-in.o(.text+0x1a2564): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: drivers/built-in.o(.text+0x10fa98): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 0 warnings, 2 section mismatches
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x1a2564): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
WARNING: vmlinux.o(.text+0x78c114): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 2 section mismatches
Warnings:
../drivers/tty/serial/pxa.c:944:1: warning: 'serial_pxa_init' is deprecated [-Wdeprecated-declarations]
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x10fa98): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
WARNING: vmlinux.o(.text+0x544400): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* RCU: dyntick_idle warnings
From: Sergey Senozhatsky @ 2016-11-10 7:57 UTC (permalink / raw)
To: Paul E. McKenney
Cc: Josh Triplett, Steven Rostedt, Mathieu Desnoyers, Andy Lutomirski,
linux-kernel, linux-next, Sergey Senozhatsky, Sergey Senozhatsky
Hello Paul,
x86_64, linux-next 20161110
WARN_ON_ONCE(!(special & RCU_DYNTICK_CTRL_CTR));
[ 0.436242] ------------[ cut here ]------------
[ 0.436307] WARNING: CPU: 3 PID: 0 at kernel/rcu/tree.c:380 rcu_momentary_dyntick_idle+0xa7/0xb8
[ 0.436381] Modules linked in:
[ 0.436437] CPU: 3 PID: 0 Comm: swapper/3 Not tainted 4.9.0-rc4-next-20161110-dbg-00001-g0d7df5d-dirty #863
[ 0.436513] Hardware name: SAMSUNG ELECTRONICS CO.,LTD Samsung DeskTop System/Samsung DeskTop System, BIOS 05CC 04/09/2010
[ 0.436595] Call Trace:
[ 0.436651] dump_stack+0x4d/0x63
[ 0.436706] __warn+0xb8/0xd3
[ 0.436760] warn_slowpath_null+0x18/0x1a
[ 0.436815] rcu_momentary_dyntick_idle+0xa7/0xb8
[ 0.436872] rcu_note_context_switch+0x2c8/0x2d5
[ 0.436930] __schedule+0x62/0x3b6
[ 0.436984] schedule+0x84/0x95
[ 0.437038] schedule_preempt_disabled+0x10/0x19
[ 0.437095] cpu_startup_entry+0x18c/0x191
[ 0.437152] start_secondary+0xef/0xf2
[ 0.437207] start_cpu+0x5/0x14
[ 0.437263] ---[ end trace c0bbb435a1f86b8a ]---
WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
[ 0.895911] ------------[ cut here ]------------
[ 0.895966] WARNING: CPU: 0 PID: 1 at kernel/rcu/tree.c:1116 rcu_nmi_exit+0x63/0x82
[ 0.896026] Modules linked in:^Ac
[ 0.896078] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 4.9.0-rc4-next-20161110-dbg-00001-g0d7df5d-dirty #863
[ 0.896157] Hardware name: SAMSUNG ELECTRONICS CO.,LTD Samsung DeskTop System/Samsung DeskTop System, BIOS 05CC 04/09/2010
[ 0.896236] Call Trace:
[ 0.896287] <NMI>
[ 0.896338] dump_stack+0x4d/0x63
[ 0.896390] __warn+0xb8/0xd3
[ 0.896442] warn_slowpath_null+0x18/0x1a
[ 0.896495] rcu_nmi_exit+0x63/0x82
[ 0.896548] do_nmi+0x2b4/0x31f
[ 0.896600] end_repeat_nmi+0x1a/0x1e
[ 0.896652] RIP: 0010:ioread32+0xb/0x2f
[ 0.896705] RSP: 0000:ffffc900000176c0 EFLAGS: 00000296^Ac
[ 0.896762] RAX: 0000000000000004 RBX: ffff880132868a80 RCX: 0000000000000000
[ 0.896820] RDX: 0000000000000003 RSI: ffffc9000100e180 RDI: ffffc9000100e180
[ 0.896879] RBP: ffffc900000176c8 R08: 000000000000000a R09: 000000000000b885
[ 0.896938] R10: ffffc900000178e8 R11: ffff8801330b0080 R12: 00000000fffb6f2e
[ 0.896996] R13: 0000000000000006 R14: 000000000000005b R15: ffff88013288f848
[ 0.897055] ? ioread32+0xb/0x2f
[ 0.897107] ? ioread32+0xb/0x2f
[ 0.897160] <EOE>
[ 0.897210] ? nv50_i2c_bus_sense_scl+0x1f/0x24
[ 0.897265] nvkm_i2c_bus_getscl+0xa/0xc
[ 0.897318] sclhi+0x36/0x6a
[ 0.897369] i2c_outb+0x49/0xcf
[ 0.897422] try_address+0x30/0x6f
[ 0.897475] bit_xfer+0x23a/0x402
[ 0.897527] __i2c_transfer+0x156/0x18b
[ 0.897581] i2c_transfer+0x6e/0x8c
[ 0.897634] ? nvkm_fantog_create+0xcd/0xcd
[ 0.897688] nvkm_i2c_bus_probe+0x141/0x200
[ 0.897741] ? extdev_table+0xa7/0xc6
[ 0.897793] nvkm_therm_ic_ctor+0x141/0x14f
[ 0.897847] ? nvkm_therm_ic_ctor+0x141/0x14f
[ 0.897900] ? nvbios_rd08+0x1a/0x30
[ 0.897953] ? nvbios_therm_sensor_parse+0x97/0x1ca
[ 0.898008] nvkm_therm_oneinit+0x19/0x3b
[ 0.898061] nvkm_subdev_init+0x89/0x195
[ 0.898114] nvkm_device_init+0x145/0x204
[ 0.898167] nvkm_udevice_init+0x2f/0x4a
[ 0.898220] nvkm_object_init+0x71/0x15d
[ 0.898273] nvkm_ioctl_new+0x1aa/0x27a
[ 0.898326] ? nvkm_client_notify+0x22/0x22
[ 0.898380] ? nvkm_udevice_rd08+0x1f/0x1f
[ 0.898434] nvkm_ioctl+0x174/0x1d0
[ 0.898487] nvkm_client_ioctl+0xd/0xf
[ 0.898540] nvif_object_ioctl+0x42/0x44
[ 0.898594] nvif_object_init+0xc4/0x104
[ 0.898647] nvif_device_init+0xd/0x2b
[ 0.898700] nouveau_drm_load+0x269/0x89e
[ 0.898753] drm_dev_register+0x7f/0xc0
[ 0.898806] drm_get_pci_dev+0xf3/0x1bd
[ 0.898860] nouveau_drm_probe+0x1a2/0x1c1
[ 0.898913] pci_device_probe+0x7e/0xe6
[ 0.898966] driver_probe_device+0x130/0x284
[ 0.899020] __driver_attach+0x6a/0x8c
[ 0.899074] ? driver_probe_device+0x284/0x284
[ 0.899128] bus_for_each_dev+0x68/0x80
[ 0.899181] driver_attach+0x19/0x1b
[ 0.899234] bus_add_driver+0xe9/0x1d9
[ 0.899287] driver_register+0x83/0xba
[ 0.899340] ? ttm_init+0x5d/0x5d
[ 0.899393] __pci_register_driver+0x47/0x49
[ 0.899446] drm_pci_init+0x47/0xc8
[ 0.899500] ? ttm_init+0x5d/0x5d
[ 0.899552] ? set_debug_rodata+0x12/0x12
[ 0.899605] nouveau_drm_init+0x1db/0x1dd
[ 0.899658] do_one_initcall+0x8b/0x10e
[ 0.899711] ? set_debug_rodata+0x12/0x12
[ 0.899765] kernel_init_freeable+0x123/0x1ab
[ 0.899819] ? rest_init+0x7d/0x7d
[ 0.899871] kernel_init+0x9/0xeb
[ 0.899924] ret_from_fork+0x22/0x30
[ 0.899977] ---[ end trace c0bbb435a1f86b8b ]---
-ss
^ permalink raw reply
* Re: RCU: dyntick_idle warnings
From: Paul E. McKenney @ 2016-11-10 14:54 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Josh Triplett, Steven Rostedt, Mathieu Desnoyers, Andy Lutomirski,
linux-kernel, linux-next, Sergey Senozhatsky
In-Reply-To: <20161110075719.GA502@swordfish>
On Thu, Nov 10, 2016 at 04:57:19PM +0900, Sergey Senozhatsky wrote:
> Hello Paul,
>
> x86_64, linux-next 20161110
>
> WARN_ON_ONCE(!(special & RCU_DYNTICK_CTRL_CTR));
>
> [ 0.436242] ------------[ cut here ]------------
> [ 0.436307] WARNING: CPU: 3 PID: 0 at kernel/rcu/tree.c:380 rcu_momentary_dyntick_idle+0xa7/0xb8
> [ 0.436381] Modules linked in:
> [ 0.436437] CPU: 3 PID: 0 Comm: swapper/3 Not tainted 4.9.0-rc4-next-20161110-dbg-00001-g0d7df5d-dirty #863
> [ 0.436513] Hardware name: SAMSUNG ELECTRONICS CO.,LTD Samsung DeskTop System/Samsung DeskTop System, BIOS 05CC 04/09/2010
> [ 0.436595] Call Trace:
> [ 0.436651] dump_stack+0x4d/0x63
> [ 0.436706] __warn+0xb8/0xd3
> [ 0.436760] warn_slowpath_null+0x18/0x1a
> [ 0.436815] rcu_momentary_dyntick_idle+0xa7/0xb8
> [ 0.436872] rcu_note_context_switch+0x2c8/0x2d5
> [ 0.436930] __schedule+0x62/0x3b6
> [ 0.436984] schedule+0x84/0x95
> [ 0.437038] schedule_preempt_disabled+0x10/0x19
> [ 0.437095] cpu_startup_entry+0x18c/0x191
> [ 0.437152] start_secondary+0xef/0xf2
> [ 0.437207] start_cpu+0x5/0x14
> [ 0.437263] ---[ end trace c0bbb435a1f86b8a ]---
>
>
>
> WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
>
> [ 0.895911] ------------[ cut here ]------------
> [ 0.895966] WARNING: CPU: 0 PID: 1 at kernel/rcu/tree.c:1116 rcu_nmi_exit+0x63/0x82
> [ 0.896026] Modules linked in:^Ac
> [ 0.896078] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 4.9.0-rc4-next-20161110-dbg-00001-g0d7df5d-dirty #863
> [ 0.896157] Hardware name: SAMSUNG ELECTRONICS CO.,LTD Samsung DeskTop System/Samsung DeskTop System, BIOS 05CC 04/09/2010
> [ 0.896236] Call Trace:
> [ 0.896287] <NMI>
> [ 0.896338] dump_stack+0x4d/0x63
> [ 0.896390] __warn+0xb8/0xd3
> [ 0.896442] warn_slowpath_null+0x18/0x1a
> [ 0.896495] rcu_nmi_exit+0x63/0x82
> [ 0.896548] do_nmi+0x2b4/0x31f
> [ 0.896600] end_repeat_nmi+0x1a/0x1e
> [ 0.896652] RIP: 0010:ioread32+0xb/0x2f
> [ 0.896705] RSP: 0000:ffffc900000176c0 EFLAGS: 00000296^Ac
> [ 0.896762] RAX: 0000000000000004 RBX: ffff880132868a80 RCX: 0000000000000000
> [ 0.896820] RDX: 0000000000000003 RSI: ffffc9000100e180 RDI: ffffc9000100e180
> [ 0.896879] RBP: ffffc900000176c8 R08: 000000000000000a R09: 000000000000b885
> [ 0.896938] R10: ffffc900000178e8 R11: ffff8801330b0080 R12: 00000000fffb6f2e
> [ 0.896996] R13: 0000000000000006 R14: 000000000000005b R15: ffff88013288f848
> [ 0.897055] ? ioread32+0xb/0x2f
> [ 0.897107] ? ioread32+0xb/0x2f
> [ 0.897160] <EOE>
> [ 0.897210] ? nv50_i2c_bus_sense_scl+0x1f/0x24
> [ 0.897265] nvkm_i2c_bus_getscl+0xa/0xc
> [ 0.897318] sclhi+0x36/0x6a
> [ 0.897369] i2c_outb+0x49/0xcf
> [ 0.897422] try_address+0x30/0x6f
> [ 0.897475] bit_xfer+0x23a/0x402
> [ 0.897527] __i2c_transfer+0x156/0x18b
> [ 0.897581] i2c_transfer+0x6e/0x8c
> [ 0.897634] ? nvkm_fantog_create+0xcd/0xcd
> [ 0.897688] nvkm_i2c_bus_probe+0x141/0x200
> [ 0.897741] ? extdev_table+0xa7/0xc6
> [ 0.897793] nvkm_therm_ic_ctor+0x141/0x14f
> [ 0.897847] ? nvkm_therm_ic_ctor+0x141/0x14f
> [ 0.897900] ? nvbios_rd08+0x1a/0x30
> [ 0.897953] ? nvbios_therm_sensor_parse+0x97/0x1ca
> [ 0.898008] nvkm_therm_oneinit+0x19/0x3b
> [ 0.898061] nvkm_subdev_init+0x89/0x195
> [ 0.898114] nvkm_device_init+0x145/0x204
> [ 0.898167] nvkm_udevice_init+0x2f/0x4a
> [ 0.898220] nvkm_object_init+0x71/0x15d
> [ 0.898273] nvkm_ioctl_new+0x1aa/0x27a
> [ 0.898326] ? nvkm_client_notify+0x22/0x22
> [ 0.898380] ? nvkm_udevice_rd08+0x1f/0x1f
> [ 0.898434] nvkm_ioctl+0x174/0x1d0
> [ 0.898487] nvkm_client_ioctl+0xd/0xf
> [ 0.898540] nvif_object_ioctl+0x42/0x44
> [ 0.898594] nvif_object_init+0xc4/0x104
> [ 0.898647] nvif_device_init+0xd/0x2b
> [ 0.898700] nouveau_drm_load+0x269/0x89e
> [ 0.898753] drm_dev_register+0x7f/0xc0
> [ 0.898806] drm_get_pci_dev+0xf3/0x1bd
> [ 0.898860] nouveau_drm_probe+0x1a2/0x1c1
> [ 0.898913] pci_device_probe+0x7e/0xe6
> [ 0.898966] driver_probe_device+0x130/0x284
> [ 0.899020] __driver_attach+0x6a/0x8c
> [ 0.899074] ? driver_probe_device+0x284/0x284
> [ 0.899128] bus_for_each_dev+0x68/0x80
> [ 0.899181] driver_attach+0x19/0x1b
> [ 0.899234] bus_add_driver+0xe9/0x1d9
> [ 0.899287] driver_register+0x83/0xba
> [ 0.899340] ? ttm_init+0x5d/0x5d
> [ 0.899393] __pci_register_driver+0x47/0x49
> [ 0.899446] drm_pci_init+0x47/0xc8
> [ 0.899500] ? ttm_init+0x5d/0x5d
> [ 0.899552] ? set_debug_rodata+0x12/0x12
> [ 0.899605] nouveau_drm_init+0x1db/0x1dd
> [ 0.899658] do_one_initcall+0x8b/0x10e
> [ 0.899711] ? set_debug_rodata+0x12/0x12
> [ 0.899765] kernel_init_freeable+0x123/0x1ab
> [ 0.899819] ? rest_init+0x7d/0x7d
> [ 0.899871] kernel_init+0x9/0xeb
> [ 0.899924] ret_from_fork+0x22/0x30
> [ 0.899977] ---[ end trace c0bbb435a1f86b8b ]---
Hello, Sergey,
Should be fixed by 0ea13930e9a8 ("rcu: Maintain special bits at bottom
of ->dynticks counter"), which should be in -next today.
And thank you for your testing efforts!
Thanx, Paul
^ permalink raw reply
* Re: [linux-next] RCU: dyntick_idle warnings
From: Sergey Senozhatsky @ 2016-11-11 0:27 UTC (permalink / raw)
To: Paul E. McKenney
Cc: Sergey Senozhatsky, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Andy Lutomirski, linux-kernel, linux-next,
Sergey Senozhatsky
In-Reply-To: <20161110145456.GA4127@linux.vnet.ibm.com>
On (11/10/16 06:54), Paul E. McKenney wrote:
[..]
> Hello, Sergey,
>
> Should be fixed by 0ea13930e9a8 ("rcu: Maintain special bits at bottom
> of ->dynticks counter"), which should be in -next today.
>
> And thank you for your testing efforts!
Thanks, Paul! will give it a try.
-ss
^ permalink raw reply
* linux-next: Tree for Nov 11
From: Stephen Rothwell @ 2016-11-11 4:00 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20161110:
Non-merge commits (relative to Linus' tree): 5178
5669 files changed, 326526 insertions(+), 103299 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 246 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 (27bcd37e0240 Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (cc6acc11cad1 kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL)
Merging arc-current/for-curr (0a0a047def15 ARCv2: MCIP: Use IDU_M_DISTRI_DEST mode if there is only 1 destination core)
Merging arm-current/fixes (6127d124ee4e ARM: wire up new pkey syscalls)
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (b65f63ec547e powerpc/oops: Fix missing pr_cont()s in instruction dump)
Merging sparc/master (0c183d92b20b Merge tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging net/master (23dd8315485a Merge branch 'mlxsw-fixes')
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed)
Merging netfilter/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master)
Merging ipvs/master (b73b8a1ba598 netfilter: nft_dup: do not use sreg_dev if the user doesn't specify it)
Merging wireless-drivers/master (d3532ea6ce4e brcmfmac: avoid maybe-uninitialized warning in brcmf_cfg80211_start_ap)
Merging mac80211/master (269ebce4531b xen-netfront: cast grant table reference first to type int)
Merging sound-current/for-linus (2ecb704a1290 ALSA: hda - add a new condition to check if it is thinkpad)
Merging pci-current/for-linus (4d3222f7071c arm64: dts: rockchip: add three new resets for rk3399 PCIe controller)
Merging driver-core.current/driver-core-linus (bdacd1b426db driver core: fix smatch warning on dev->bus check)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (18266403f3fe USB: cdc-acm: fix TIOCMIWAIT)
Merging usb-gadget-fixes/fixes (fd9afd3cbe40 usb: gadget: u_ether: remove interrupt throttling)
Merging usb-serial-fixes/usb-linus (9bfef729a3d1 USB: serial: ftdi_sio: add support for TI CC3200 LaunchPad)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (68fae2f3df45 staging: nvec: remove managed resource from PS2 driver)
Merging char-misc.current/char-misc-linus (b13d14339baa ppdev: fix double-free of pp->pdev->name)
Merging input-current/for-linus (324ae0958cab Input: psmouse - cleanup Focaltech code)
Merging crypto-current/master (6d4952d9d9d4 hwrng: core - Don't use a stack buffer in add_early_randomness())
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-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 (51717929d835 mfd: intel_soc_pmic_bxtwc: Fix usbc interrupt)
Merging drm-intel-fixes/for-linux-next-fixes (54905ab5fe7a drm/i915: Limit Valleyview and earlier to only using mappable scanout)
Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (1001354ca341 Linux 4.9-rc1)
Merging arm/for-next (f167e1f561ae Merge branches 'fixes', 'misc', 'sa1100-base' and 'syscalls' into for-next)
Merging arm-perf/for-next/perf (1001354ca341 Linux 4.9-rc1)
Merging arm-soc/for-next (1e1ce567d3a6 ARM: SoC: Document merges)
Merging pinctrl/for-next (b5e88cff3ceb Merge branch 'devel' into for-next)
Merging amlogic/for-next (5753584390e4 Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (391823c4373c Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (e6e1aa531aa6 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (2312974a29a8 Merge branch 'mvebu/dt64-fix' into mvebu/for-next)
Merging omap/for-next (16be064c79c2 Merge branch 'omap-for-v4.10/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (c49806e0fa1e Merge branch 'arm64-for-5.0' into all-for-5.0)
Merging renesas/next (45e329290511 Merge branch 'dt-for-v4.10' into next)
Merging rockchip/for-next (db8b073d569e Merge branch 'v4.10-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (1acb537b2fd1 Merge branch 'next/dt' into for-next)
Merging tegra/for-next (817d74019bab Merge branch for-4.10/arm/defconfig into for-next)
Merging arm64/for-next/core (094339443e6e arm64: percpu: kill off final ACCESS_ONCE() uses)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (c78874f116be tty: serial: make crisv10 explicitly non-modular)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (25ba49085c4f m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (98a87d21afd5 m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (3f56647d2d68 Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8)
Merging powerpc/next (08bf75ba852e powerpc/mm/hash64: Fix might_have_hea() check)
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (847e0700121b s390: remove unneeded dependency for gen_facilities)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (d4eccafcaf33 xtensa: clean up printk usage for boot/crash logging)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (2a782f537899 Merge branch 'for-next-next-4.9-20161108' into for-next-20161108)
Merging ceph/master (264048afab27 libceph: initialize last_linger_id with a large integer)
Merging cifs/for-next (faad81c4f581 CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix())
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (e952813e210b ext2: avoid bogus -Wmaybe-uninitialized warning)
Merging ext4/dev (d74f3d25289a ext4: add missing KERN_CONT to a few more debugging uses)
Merging f2fs/dev (751e1d334e73 f2fs: return directly if block has been removed from the victim)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0ce267ff95a0 fuse: fix root dentry initialization)
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs)
Merging nfsd/nfsd-next (56094edd1797 sunrpc: GFP_KERNEL should be GFP_NOFS in crypto code)
Merging orangefs/for-next (dc0336214eb0 orangefs: clean up debugfs)
Merging overlayfs/overlayfs-next (b454c10e53ca ovl: split super.c)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir())
Merging xfs/for-next (0fc204e2eb64 Merge branch 'xfs-4.10-misc-fixes-1' into for-next)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
Merging pci/next (1001354ca341 Linux 4.9-rc1)
Merging pstore/for-next/pstore (07d9a380680d Linux 4.9-rc2)
Merging hid/for-next (297dc03fe248 Merge branch 'for-4.10/i2c-hid' into for-next)
Merging i2c/i2c/for-next (481f190c52ba Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (c8d2bc9bc39e Linux 4.8)
Merging hwmon-staging/hwmon-next (c2d95c252f65 hwmon: (adm1275) Enable adm1278 VOUT sampling)
Merging jc_docs/docs-next (d55003d86e0c USB: fix typo in documentation)
Merging v4l-dvb/master (778de0140232 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (53fc2c7021d4 Merge branch 'device-properties' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (3105f234e0ab thermal/powerclamp: correct cpu support check)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (6b8609d85946 Merge branch 'hns-fixes')
CONFLICT (content): Merge conflict in net/netlink/genetlink.c
CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (56a62e2218f5 netfilter: conntrack: fix NF_REPEAT handling)
Merging ipvs-next/master (75a608d8d3b2 ipvs: Decrement ttl)
Merging wireless-drivers-next/master (9afdd6128c39 cw1200: Don't leak memory if krealloc failes)
Merging bluetooth/master (52069883235a Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer)
Merging mac80211-next/master (17197236d62c enic: set skb->hash type properly)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging rdma-leon-test/testing/rdma-next (33b4f7c41bae Merge branch 'testing/queue-next' into testing/rdma-next)
CONFLICT (content): Merge conflict in drivers/infiniband/core/roce_gid_mgmt.c
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (64ad46379fcf mtd: bcm47xxsflash: use uncached MMIO access for BCM53573)
Merging nand/nand/next (83f48f80de8a mtd: nand: socrates: use nand_scan() for nand_scan_ident/tail() combo)
Merging crypto/master (89277a7d0ed4 crypto: cryptd - Remove unused but set variable 'tfm')
Merging drm/drm-next (d8c1abd968f1 Merge tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (8be8f4a9a9ce Merge tag 'gvt-next-kvmgt-framework' of https://github.com/01org/gvt-linux into drm-intel-next-queued)
Merging drm-tegra/drm/tegra/for-next (cc09cb6da9b0 drm/tegra: gem: Remove some dead code)
Merging drm-misc/topic/drm-misc (4b514e10157a drm: Make DRM_DEBUG_MM depend on STACKTRACE_SUPPORT)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (e64053f05eb9 drm: mali-dp: Clear CVAL when leaving config mode)
Merging sunxi/sunxi/for-next (2b4f9ae797bc Merge branches 'sunxi/clk-fixes-for-4.9', 'sunxi/drm-fixes-for-4.9' and 'sunxi/dt-for-4.10' into sunxi/for-next)
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (74e3368de87d Merge remote-tracking branches 'regmap/fix/header' and 'regmap/fix/macro' into regmap-linus)
Merging sound/for-next (4ce8e6a51abf ALSA: hda - Fix typo)
Merging sound-asoc/for-next (ff894eed0e09 Merge remote-tracking branches 'asoc/topic/wm8753', 'asoc/topic/wm8978', 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (a467a672cf09 MAINTAINERS: Begin module maintainer transition)
Merging input/next (406d5a2de071 Input: da9062 - update bindings docs to account for da9061)
Merging block/for-next (a7a9d06bd9f1 Merge branch 'for-4.10/block' into for-next)
Merging lightnvm/for-next (b759d3ddb52f lightnvm: rrpc: split bios of size > 256kb)
Merging device-mapper/for-next (5c5eb3db2893 dm cache metadata: DM_CACHE_FEATURE_INCOMPAT_SEP_DIRTY_BITS)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (a56e2edf8bab mmc: sdhci-iproc: support standard byte register accesses)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (6119e6792bca md: remove md_super_wait() call after bitmap_flush())
Merging mfd/for-mfd-next (77f298a18ff8 mfd: sun4i-gpadc: Fix 'cast from pointer to integer of different size' warning)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (44fccac4ff17 power: supply: lp8788: remove an unneeded NULL check)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (9f8ab80e5833 Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/bypass', 'regulator/topic/fixed' and 'regulator/topic/tps6507x' into regulator-next)
Merging security/next (07d9a380680d Linux 4.9-rc2)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (07d9a380680d Linux 4.9-rc2)
Merging tpmdd/next (7839a496de6d char: tpm: fix kerneldoc tpm2_unseal_trusted name typo)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (bea64033dd7b iommu/vt-d: Fix dead-locks in disable_dmar_iommu() path)
Merging dwmw2-iommu/master (5b3c5c539eac iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors)
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
Merging audit/next (b4eb4f7f1a97 audit: less stack usage for /proc/*/loginuid)
Merging devicetree/for-next (13f0cab7a28f of/platform: clarify of_find_device_by_node refcounting)
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (dd832aaffbaf Merge remote-tracking branches 'spi/topic/omap', 'spi/topic/rspi', 'spi/topic/s3c64xx', 'spi/topic/spidev' and 'spi/topic/sunxi' into spi-next)
Merging tip/auto-latest (b2eca6314533 Merge branch 'linus')
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (90e493d7d51c EDAC, altera: Disable IRQs while injecting SDRAM errors)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
Merging rcu/rcu/next (0ea13930e9a8 rcu: Maintain special bits at bottom of ->dynticks counter)
Merging kvm/linux-next (6314a17fec5c Merge tag 'tags/for-kvmgt' into HEAD)
Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (0f06ac3b6616 xen-netback: fix error handling output)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (401df5ace9d6 intel_pmc_core: Add KBL CPUID support)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (75a5efdad172 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (6f48ef64097b ipmi: Pick up slave address from SMBIOS on an ACPI device)
Merging driver-core/driver-core-next (baa8809f6097 PM / runtime: Optimize the use of device links)
Merging tty/tty-next (26ba68d2f81b tty: typo in comments in drivers/tty/vt/keyboard.c)
CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree.
$ git rm -f Documentation/VGA-softcursor.txt
Merging usb/usb-next (bb2d387c4d90 USB: cdc-acm: use get_icount tty operation)
Merging usb-gadget/next (1214b9567086 USB: phy: am335x-control: fix device and of_node leaks)
Merging usb-serial/usb-next (a98b69002a16 USB: serial: ch341: add debug output for chip version)
Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
Merging phy-next/next (7809cd2ce6ab phy: meson: add USB2 PHY support for Meson8b and GXBB)
Merging staging/staging-next (424a4b595e35 staging: greybus: use get_icount tty operation)
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merging char-misc/char-misc-next (f2ed287bcc90 char/pcmcia: add scr24x_cs chip card interface driver)
Merging extcon/extcon-next (56182a830cbf extcon: usb-gpio: Add VBUS detection support)
Merging slave-dma/next (8d197083fd9f Merge branch 'topic/qcom' into next)
Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
Merging scsi/for-next (8db0ce476654 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (4861ee15f2b7 scsi: ufs: Use the resource-managed function to add devfreq device)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (c05b7b88dd3c Merge branch 'for-4.10' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
Merging rpmsg/for-next (676bf0989b05 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b38b2dfcf2a3 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging userns/for-next (2e41414828bb mm: Add a user_ns owner to mm_struct and fix ptrace permission checks)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (81ab3279c5e1 Merge branch 'clk-qcom-rpm' into clk-next)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1001354ca341 Linux 4.9-rc1)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (dcc37f904443 processor.h: remove cpu_relax_lowlatency)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (7f73c6f7d72a coresight: Add support for ARM Coresight STM-500)
Merging rtc/rtc-next (72d3d79f8da9 rtc: fix typos in Kconfig)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (52e73eb2872c device-dax: fix percpu_ref_exit ordering)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (08f9f8e62434 ipc/shm.c: coding style fixes)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: kexec_file: allow arch-specific memory walking for kexec_add_buffer
Applying: kexec_file: change kexec_add_buffer to take kexec_buf as argument
Applying: kexec_file: factor out kexec_locate_mem_hole from kexec_add_buffer
Applying: powerpc: change places using CONFIG_KEXEC to use CONFIG_KEXEC_CORE instead
Applying: powerpc: factor out relocation code in module_64.c
Applying: powerpc: implement kexec_file_load
Applying: powerpc: add functions to read ELF files of any endianness
Applying: powerpc: add support for loading ELF kernels with kexec_file_load
Applying: powerpc: add purgatory for kexec_file_load implementation
Applying: powerpc: enable CONFIG_KEXEC_FILE in powerpc server defconfigs
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Merging akpm/master (4b6f977ea0e7 sparc: implement watchdog_nmi_enable and watchdog_nmi_disable)
^ permalink raw reply
* next-20161111 build: 0 failures 0 warnings (next-20161111)
From: Build bot for Mark Brown @ 2016-11-11 7:10 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161111
Git describe: next-20161111
Commit: 37634f05ef Add linux-next specific files for 20161111
Build Time: 87 min 29 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 0
Section Mismatches: 4
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
0 warnings 2 mismatches : arm64-allmodconfig
0 warnings 2 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Section Mismatch Summary: 4
1 WARNING: vmlinux.o(.text+0x79ba1c): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: vmlinux.o(.text+0x548320): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: drivers/built-in.o(.text+0x1a356c): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
1 WARNING: drivers/built-in.o(.text+0x1105d8): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 0 warnings, 2 section mismatches
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x1a356c): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
WARNING: vmlinux.o(.text+0x79ba1c): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 0 warnings, 2 section mismatches
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x1105d8): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
WARNING: vmlinux.o(.text+0x548320): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-mkp tree with the block tree
From: Martin K. Petersen @ 2016-11-11 19:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Martin K. Petersen, Jens Axboe, linux-next, linux-kernel,
Christoph Hellwig
In-Reply-To: <20161109135414.283a9ac5@canb.auug.org.au>
>>>>> "Stephen" == Stephen Rothwell <sfr@canb.auug.org.au> writes:
Stephen,
Stephen> This latter commit also exists as commit 2266d5678ad1 in the
Stephen> scsi tree, but unfortunately, the scsi-mkp tree was rebased
Stephen> overnight, so now the two patches are not the same commit :-( A
Stephen> significant path of what was rebased overnight has already been
Stephen> merged into the scsi tree ... so please tidy up your tree WRT
Stephen> the scsi tree. This conflict would not exist if the rebase had
Stephen> not been done.
James' tree is usually a week or two behind mine. I almost never rebase
mid-cycle but in this case we had a data corruption bug fix that went to
Linus for 4.9 that a driver update depended on.
In any case. It seems like the fact that the two SCSI trees may be out
of sync could be an ongoing problem. So maybe you should just drop my
tree again. I was just hoping to get visibility into potential merge
problems sooner...
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the netfilter tree
From: David Miller @ 2016-11-13 4:43 UTC (permalink / raw)
To: pablo
Cc: sfr, netdev, netfilter-devel, linux-next, linux-kernel,
xiyou.wangcong, johannes.berg
In-Reply-To: <20161110003117.GA4285@salvia>
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 10 Nov 2016 01:31:17 +0100
> I think I cannot help to address this conflict myself.
>
> 8fbfef7f505b is in my nf tree, while 489111e5c25b is in net-next. So
> you will hit this conflict by when you pull net into net-next.
>
> So please keep this patch from Stephen to resolve the conflict in your
> radar to solve this.
I will, thank you.
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Or Gerlitz @ 2016-11-13 12:27 UTC (permalink / raw)
To: Stephen Rothwell, David Miller
Cc: Networking, linux-next, Linux Kernel, Or Gerlitz, Saeed Mahameed,
Hadar Hen Zion
In-Reply-To: <20161110105030.3724fe28@canb.auug.org.au>
On Thu, Nov 10, 2016 at 1:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>
> between commit:
> ee39fbc4447d ("net/mlx5: E-Switch, Set the actions for offloaded rules properly")
> from the net tree and commit:
> 66958ed906b8 ("net/mlx5: Support encap id when setting new steering entry")
> from the net-next tree.
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen, the fix is correct. Dave will hit the conflict the
next time he rebases
net-next on net and will solve it there. Hence the conflict will not
show up in linux-next
once you re-peek net-next.
Or.
> diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> index d239f5d0ea36,50fe8e8861bb..000000000000
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
> @@@ -57,14 -58,14 +58,15 @@@ mlx5_eswitch_add_offloaded_rule(struct
> if (esw->mode != SRIOV_OFFLOADS)
> return ERR_PTR(-EOPNOTSUPP);
>
> - flow_act.action = attr->action;
> + /* per flow vlan pop/push is emulated, don't set that into the firmware */
> - action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
> ++ flow_act.action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);
>
> - if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
> - dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
> - dest.vport_num = attr->out_rep->vport;
> - action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
> - } else if (action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {
> + if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
> + dest[i].type = MLX5_FLOW_DESTINATION_TYPE_VPORT;
> + dest[i].vport_num = attr->out_rep->vport;
> + i++;
> + }
> + if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {
> counter = mlx5_fc_create(esw->dev, true);
> if (IS_ERR(counter))
> return ERR_CAST(counter);
^ permalink raw reply
* linux-next: build warning in Linus' tree
From: Stephen Rothwell @ 2016-11-13 22:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Linus
Hi all,
Starting with Linus' tree, today's linux-next build (x86_64 allmodconfig) produced
this warning:
WARNING: modpost: missing MODULE_LICENSE() in drivers/media/dvb-frontends/gp8psk-fe.o
Introduced by commit
7a0786c19d65 ("gp8psk: Fix DVB frontend attach")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: unable to fetch the arm tree
From: Stephen Rothwell @ 2016-11-13 22:29 UTC (permalink / raw)
To: Russell King; +Cc: linux-next, linux-kernel
Hi Russell,
I could not fetch the arm or arm-current trees
(git://git.armlinux.org.uk/~rmk/linux-arm.git) this morning:
fatal: remote error: access denied or repository not exported: ~rmk/linux-arm.git
I will use the previous versions that I have.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: unable to fetch the watchdog tree
From: Stephen Rothwell @ 2016-11-13 22:34 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-next, linux-kernel
Hi Wim,
For the past few days (nearly a week, sorry) fetching the watchdog tree
(git://www.linux-watchdog.org/linux-watchdog-next.git#master) has
resulted in a hung connection.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the pm tree
From: Stephen Rothwell @ 2016-11-13 23:40 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Akshay Adiga
Hi Rafael,
After merging the pm tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
drivers/cpufreq/powernv-cpufreq.c: In function 'gpstate_timer_handler':
drivers/cpufreq/powernv-cpufreq.c:642:5: warning: 'lpstate_idx' may be used uninitialized in this function [-Wmaybe-uninitialized]
if (gpstate_idx != gpstates->last_lpstate_idx)
^
Introduced by commit
20b15b766354 ("cpufreq: powernv: Use PMCR to verify global and local pstate")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warning after merge of the pm tree
From: Rafael J. Wysocki @ 2016-11-14 0:03 UTC (permalink / raw)
To: Stephen Rothwell, Akshay Adiga; +Cc: linux-next, linux-kernel, Linux PM list
In-Reply-To: <20161114104009.57b7e64b@canb.auug.org.au>
On Monday, November 14, 2016 10:40:09 AM Stephen Rothwell wrote:
> Hi Rafael,
Hi Stephen,
> After merging the pm tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> drivers/cpufreq/powernv-cpufreq.c: In function 'gpstate_timer_handler':
> drivers/cpufreq/powernv-cpufreq.c:642:5: warning: 'lpstate_idx' may be used uninitialized in this function [-Wmaybe-uninitialized]
> if (gpstate_idx != gpstates->last_lpstate_idx)
> ^
>
> Introduced by commit
>
> 20b15b766354 ("cpufreq: powernv: Use PMCR to verify global and local pstate")
Thanks for the notice!
Akshay, any thoughts?
Thanks,
Rafael
^ permalink raw reply
* linux-next: manual merge of the sound tree with the jc_docs tree
From: Stephen Rothwell @ 2016-11-14 0:15 UTC (permalink / raw)
To: Takashi Iwai, Jonathan Corbet
Cc: linux-next, linux-kernel, Jarkko Sakkinen, SeongJae Park
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in:
Documentation/index.rst
between commits:
799a545bb938 ("tpm: move documentation under Documentation/security")
ba42c574fc8b ("Documentation: Add HOWTO Korean translation into rst based build system")
from the jc_docs tree and commit:
8551914a5e19 ("ALSA: doc: ReSTize alsa-driver-api document")
from the sound tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/index.rst
index 733bd9013541,115c551da5f5..000000000000
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -57,16 -18,8 +57,17 @@@ needed)
media/index
gpu/index
80211/index
+ security/index
+ sound/index
+Korean translations
+-------------------
+
+.. toctree::
+ :maxdepth: 1
+
+ translations/ko_KR/index
+
Indices and tables
==================
^ permalink raw reply
* linux-next: manual merge of the sound tree with the jc_docs tree
From: Stephen Rothwell @ 2016-11-14 0:18 UTC (permalink / raw)
To: Takashi Iwai, Jonathan Corbet
Cc: linux-next, linux-kernel, Mauro Carvalho Chehab
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in:
Documentation/sound/alsa/alsa-parameters.txt
between commit:
8c27ceff3604 ("docs: fix locations of several documents that got moved")
from the jc_docs tree and commit:
3a5182c04a02 ("ALSA: doc: Remove alsa-parameters.txt")
from the sound tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2016-11-14 0:28 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Richard Fitzgerald
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/wm_adsp.c: In function 'wm_coeff_write_acked_control':
sound/soc/codecs/wm_adsp.c:791:8: error: implicit declaration of function 'wm_coeff_base_reg' [-Werror=implicit-function-declaration]
ret = wm_coeff_base_reg(ctl, ®);
^
Caused by commit
f4f0c4c60c39 ("ASoC: wm_adsp: Signal firmware shutdown through event control")
I have used the sound-asoc tree from next-20161111 for today.
--
Cheers,
Stephen Rothwell
^ 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