* Re: linux-next: manual merge of the mali-dp tree with the drm-misc tree
From: Liviu Dudau @ 2016-11-04 16:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, linux-kernel, DRI, linux-next
In-Reply-To: <20161105035503.4e7f39a6@canb.auug.org.au>
On Sat, Nov 05, 2016 at 03:55:03AM +1100, Stephen Rothwell wrote:
> Hi Liviu,
>
> On Fri, 4 Nov 2016 15:48:02 +0000 Liviu Dudau <Liviu.Dudau@arm.com> wrote:
> >
> > Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by
> > alone should be good. Baoyou's patch is in my tree to stop him repeatedly
> > send me the same patch over and over again :) But yes, I will add my
> > Signed-off-by for that one.
>
> Sorry, but this is not sufficient. Please read section 11 of
> Documentation/SubmittingPatches (or
> Documentation/process/submitting-patches.rst where it has been moved
> recently). If you are in the path of a patch to Linus, you must add a
> Signed-off-by line, and as the person who committed those patches to
> the tree, you are in the path.
Thanks for correcting me. I will add my Signed-off-bys to the relevant
patches.
Best regards,
Liviu
> --
> Cheers,
> Stephen Rothwell
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* linux-next: no release today
From: Stephen Rothwell @ 2016-11-07 5:16 UTC (permalink / raw)
To: linux-next; +Cc: LKML
Hi all,
There will be no linx-next release today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-08 1:25 UTC (permalink / raw)
To: David Miller, Networking
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/netlink/genetlink.c
between commit:
00ffc1ba02d8 ("genetlink: fix a memory leak on error path")
from the net tree and commit:
2ae0f17df1cd ("genetlink: use idr to track 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/netlink/genetlink.c
index 49c28e8ef01b,bbd3bff885a1..000000000000
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@@ -402,11 -360,17 +360,17 @@@ int genl_register_family(struct genl_fa
} else
family->attrbuf = NULL;
+ family->id = idr_alloc(&genl_fam_idr, family,
+ start, end + 1, GFP_KERNEL);
+ if (family->id < 0) {
+ err = family->id;
- goto errout_locked;
++ goto errout_free;
+ }
+
err = genl_validate_assign_mc_groups(family);
if (err)
- goto errout_free;
+ goto errout_remove;
- list_add_tail(&family->family_list, genl_family_chain(family->id));
genl_unlock_all();
/* send all events */
@@@ -417,14 -381,13 +381,15 @@@
return 0;
+ errout_remove:
+ idr_remove(&genl_fam_idr, family->id);
+errout_free:
+ kfree(family->attrbuf);
errout_locked:
genl_unlock_all();
- errout:
return err;
}
- EXPORT_SYMBOL(__genl_register_family);
+ EXPORT_SYMBOL(genl_register_family);
/**
* genl_unregister_family - unregister generic netlink family
^ permalink raw reply
* linux-next: manual merge of the rdma-leon-test tree with the net-next tree
From: Stephen Rothwell @ 2016-11-08 2:06 UTC (permalink / raw)
To: Leon Romanovsky, David Miller, Networking
Cc: linux-next, linux-kernel, David Ahern
Hi Leon,
Today's linux-next merge of the rdma-leon-test tree got a conflict in:
drivers/infiniband/core/roce_gid_mgmt.c
between commit:
453d39329ad0 ("IB/core: Flip to the new dev walk API")
from the net-next tree and commit:
e4b4d6b5d8c2 ("IB/core: Remove debug prints after allocation failure")
from the rdma-leon-test 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/infiniband/core/roce_gid_mgmt.c
index 3a64a0881882,c86ddcea7675..000000000000
--- a/drivers/infiniband/core/roce_gid_mgmt.c
+++ b/drivers/infiniband/core/roce_gid_mgmt.c
@@@ -437,28 -434,6 +434,26 @@@ static void callback_for_addr_gid_devic
&parsed->gid_attr);
}
+struct upper_list {
+ struct list_head list;
+ struct net_device *upper;
+};
+
+static int netdev_upper_walk(struct net_device *upper, void *data)
+{
+ struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+ struct list_head *upper_list = data;
+
- if (!entry) {
- pr_info("roce_gid_mgmt: couldn't allocate entry to delete ndev\n");
++ if (!entry)
+ return 0;
- }
+
+ list_add_tail(&entry->list, upper_list);
+ dev_hold(upper);
+ entry->upper = upper;
+
+ return 0;
+}
+
static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
void *cookie,
void (*handle_netdev)(struct ib_device *ib_dev,
^ permalink raw reply
* linux-next: manual merge of the kspp tree with Linus' tree
From: Stephen Rothwell @ 2016-11-08 2:31 UTC (permalink / raw)
To: Kees Cook; +Cc: linux-next, linux-kernel, Emese Revfy
Hi Kees,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the kspp tree got a conflict in:
mm/page_alloc.c
scripts/gcc-plugins/latent_entropy_plugin.c
between commits:
38addce8b600 ("gcc-plugins: Add latent_entropy plugin")
0766f788eb72 ("latent_entropy: Mark functions with __latent_entropy")
58bea4144d23 ("latent_entropy: Fix wrong gcc code generation with 64 bit variables")
from Linus' tree and commits:
2a5448668a3c ("gcc-plugins: Add latent_entropy plugin")
09dd109d8241 ("latent_entropy: Mark functions with __latent_entropy")
from the kspp tree.
I fixed it up (I used the version from Linus' tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
Kees, maybe you could clean up the kspp tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2016-11-08 2:47 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Chen-Yu Tsai
Hi all,
After merging the sound-asoc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
sound/soc/sunxi/sun4i-codec.c:1188:2: error: unknown field 'has_reset' specified in initializer
.has_reset = true,
^
sound/soc/sunxi/sun4i-codec.c:1188:15: warning: excess elements in struct initializer
.has_reset = true,
^
sound/soc/sunxi/sun4i-codec.c:1188:15: note: (near initialization for 'sun6i_a31_codec_quirks')
Caused by commit
8d9e4c9e993f ("ASoC: sun4i-codec: Add support for A31 playback through headphone output")
I have used the sound-asoc tree from next-20161028 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Chen-Yu Tsai @ 2016-11-08 3:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Chen-Yu Tsai
In-Reply-To: <20161108134723.3b4fc5d5@canb.auug.org.au>
Hi,
On Tue, Nov 8, 2016 at 10:47 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the sound-asoc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> sound/soc/sunxi/sun4i-codec.c:1188:2: error: unknown field 'has_reset' specified in initializer
> .has_reset = true,
> ^
> sound/soc/sunxi/sun4i-codec.c:1188:15: warning: excess elements in struct initializer
> .has_reset = true,
> ^
> sound/soc/sunxi/sun4i-codec.c:1188:15: note: (near initialization for 'sun6i_a31_codec_quirks')
>
> Caused by commit
>
> 8d9e4c9e993f ("ASoC: sun4i-codec: Add support for A31 playback through headphone output")
>
> I have used the sound-asoc tree from next-20161028 for today.
sound-asoc is missing patch
ASoC: sun4i-codec: Add support for optional reset control to quirks
http://www.spinics.net/lists/alsa-devel/msg56289.html
which commit 8d9e4c9e993f ("ASoC: sun4i-codec: Add support for A31 playback
through headphone output") depends on. This was part of the same series that
I posted:
http://www.spinics.net/lists/alsa-devel/msg56283.html
A new version of the remaining patches was posted yesterday:
http://www.spinics.net/lists/alsa-devel/msg56443.html
The build failure should be resolved once Mark merges the remaining patches,
though some reordering might be needed to maintain bisectability.
Regards
ChenYu
^ permalink raw reply
* linux-next: build failure after merge of the block tree
From: Stephen Rothwell @ 2016-11-08 3:21 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Ming Lei, Christoph Hellwig
Hi Jens,
After merging the block tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
block/blk-flush.c: In function 'flush_data_end_io':
block/blk-flush.c:369:20: error: 'REQ_STARTED' undeclared (first use in this function)
rq->cmd_flags &= ~REQ_STARTED;
^
Caused by commit
e806402130c9 ("block: split out request-only flags into a new namespace")
interacting with commit
94d7dea448fa ("block: flush: fix IO hang in case of flood fua req")
from Linus' tree (v4.9-rc3).
I have applied the following merge fix patch for today (I don't know if
this is correct, but it does build):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Nov 2016 14:08:03 +1100
Subject: [PATCH] block: fixup for "split out request-only flags into a new namespace"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
block/blk-flush.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 0a02e765fa14..0bef7432d725 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -366,7 +366,7 @@ static void flush_data_end_io(struct request *rq, int error)
elv_completed_request(q, rq);
/* for avoiding double accounting */
- rq->cmd_flags &= ~REQ_STARTED;
+ rq->rq_flags &= ~RQF_STARTED;
/*
* After populating an empty queue, kick it to avoid stall. Read
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: build failure after merge of the block tree
From: Jens Axboe @ 2016-11-08 3:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Ming Lei, Christoph Hellwig
In-Reply-To: <20161108142140.3232b3b2@canb.auug.org.au>
On 11/07/2016 08:21 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> block/blk-flush.c: In function 'flush_data_end_io':
> block/blk-flush.c:369:20: error: 'REQ_STARTED' undeclared (first use in this function)
> rq->cmd_flags &= ~REQ_STARTED;
> ^
>
> Caused by commit
>
> e806402130c9 ("block: split out request-only flags into a new namespace")
>
> interacting with commit
>
> 94d7dea448fa ("block: flush: fix IO hang in case of flood fua req")
>
> from Linus' tree (v4.9-rc3).
>
> I have applied the following merge fix patch for today (I don't know if
> this is correct, but it does build):
It's correct, it needs to be applied if merging with master. It will
throw a real conflict as well, but this one tends to fly under the radar
since it merges cleanly.
I'll merge master into my for-next so you don't have to carry extra
patches for this.
--
Jens Axboe
^ permalink raw reply
* linux-next: manual merge of the tip tree with the drm-intel tree
From: Stephen Rothwell @ 2016-11-08 4:25 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Daniel Vetter, Intel Graphics, DRI
Cc: linux-next, linux-kernel, Chris Wilson
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_shrinker.c
between commits:
1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
from the drm-intel tree and commit:
3ab7c086d5ec ("locking/drm: Kill mutex trickery")
c7faee2109f9 ("locking/drm: Fix i915_gem_shrinker_lock() locking")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c
index a6fc1bdc48af,e9bd2a81d03a..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@@ -35,33 -35,6 +35,15 @@@
#include "i915_drv.h"
#include "i915_trace.h"
- static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
- {
- if (!mutex_is_locked(mutex))
- return false;
-
- #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
- return mutex->owner == task;
- #else
- /* Since UP may be pre-empted, we cannot assume that we own the lock */
- return false;
- #endif
- }
-
+static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock)
+{
- if (!mutex_trylock(&dev->struct_mutex)) {
- if (!mutex_is_locked_by(&dev->struct_mutex, current))
- return false;
-
- *unlock = false;
- } else {
- *unlock = true;
- }
++ if (!mutex_trylock(&dev->struct_mutex))
++ return false;
+
++ *unlock = true;
+ return true;
+}
+
static bool any_vma_pinned(struct drm_i915_gem_object *obj)
{
struct i915_vma *vma;
^ permalink raw reply
* linux-next: manual merge of the tty tree with the jc_docs tree
From: Stephen Rothwell @ 2016-11-08 5:30 UTC (permalink / raw)
To: Greg KH, Jonathan Corbet
Cc: linux-next, linux-kernel, Mauro Carvalho Chehab, Jiri Slaby
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
Documentation/VGA-softcursor.txt
between commits:
27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup")
9d85025b0418 ("docs-rst: create an user's manual book")
from the jc_docs tree and commit:
b9c8b7fc252c ("vgacon: remove prehistoric macros")
from the tty tree.
I fixed it up (I deleted it - since 9d85025b0418 moved it - but that
means it may need fixing up in its new location to match any relevant
changes in b9c8b7fc252c) and can carry the fix as necessary. This is
now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the scsi tree with the block tree
From: Stephen Rothwell @ 2016-11-08 5:48 UTC (permalink / raw)
To: James Bottomley, Jens Axboe
Cc: linux-next, linux-kernel, Christoph Hellwig, Gilad Broner,
Martin K. Petersen, Subhash Jadavani
Hi James,
Today's linux-next merge of the scsi tree got a conflict in:
drivers/scsi/ufs/ufshcd.c
between commit:
e806402130c9 ("block: split out request-only flags into a new namespace")
from the block tree and commit:
2266d5678ad1 ("scsi: ufs: fix sense buffer size to 18 bytes")
from the scsi 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/scsi/ufs/ufshcd.c
index cf549871c1ee,304adce3bdbe..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -5589,8 -5642,8 +5642,8 @@@ ufshcd_send_request_sense(struct ufs_hb
}
ret = scsi_execute_req_flags(sdp, cmd, DMA_FROM_DEVICE, buffer,
- SCSI_SENSE_BUFFERSIZE, NULL,
+ UFSHCD_REQ_SENSE_SIZE, NULL,
- msecs_to_jiffies(1000), 3, NULL, REQ_PM);
+ msecs_to_jiffies(1000), 3, NULL, 0, RQF_PM);
if (ret)
pr_err("%s: failed with err %d\n", __func__, ret);
^ permalink raw reply
* linux-next: manual merge of the libata tree with the block tree
From: Stephen Rothwell @ 2016-11-08 5:58 UTC (permalink / raw)
To: Tejun Heo, Jens Axboe
Cc: linux-next, linux-kernel, Adam Manzanares, Christoph Hellwig
Hi Tejun,
Today's linux-next merge of the libata tree got a conflict in:
block/blk-core.c
between commits:
e806402130c9 ("block: split out request-only flags into a new namespace")
ef295ecf090d ("block: better op and flags encoding")
from the block tree and commit:
5dc8b362a237 ("block: Add iocontext priority to request")
from the libata 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
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@@ -1152,11 -1153,11 +1152,12 @@@ static struct request *__get_request(st
blk_rq_init(q, rq);
blk_rq_set_rl(rq, rl);
+ blk_rq_set_prio(rq, ioc);
- req_set_op_attrs(rq, op, op_flags | REQ_ALLOCED);
+ rq->cmd_flags = op;
+ rq->rq_flags = rq_flags;
/* init elvpriv */
- if (op_flags & REQ_ELVPRIV) {
+ if (rq_flags & RQF_ELVPRIV) {
if (unlikely(et->icq_cache && !icq)) {
if (ioc)
icq = ioc_create_icq(ioc, q, gfp_mask);
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Cong Wang @ 2016-11-08 6:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, linux-next, LKML, Johannes Berg
In-Reply-To: <20161108122537.40fa6e58@canb.auug.org.au>
On Mon, Nov 7, 2016 at 5:25 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/netlink/genetlink.c
>
> between commit:
>
> 00ffc1ba02d8 ("genetlink: fix a memory leak on error path")
>
> from the net tree and commit:
>
> 2ae0f17df1cd ("genetlink: use idr to track 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.
Looks good to me.
Thanks!
^ permalink raw reply
* linux-next: build failure after merge of the rtc tree
From: Stephen Rothwell @ 2016-11-08 6:41 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: linux-next, linux-kernel, Paul Cercueil
Hi Alexandre,
After merging the rtc tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
Caused by commit
f9eb69d1ae2f ("rtc: jz4740: Add support for acting as the system power controller")
I have used the rtc tree from next-20161028 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Nov 8
From: Stephen Rothwell @ 2016-11-08 7:38 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20161028:
New tree: scsi-mkp
The net-next tree gained a conflict against the net tree.
The rdma-leon-test tree gained a conflict against the net-next tree.
The kspp tree gained conflicts against Linus' tree.
The sound-asoc tree gained a build failure, so I used the version from
next-20161028.
The block tree gained a build failure for which I applied a merge
fix patch.
The tip tree gained a conflict against the drm-intel tree.
The tty tree gained a conflict against the jc_docs tree.
The scsi tree gained a conflict against the block tree.
The libata tree gained a conflict against the block tree.
The rtc tree gained a build failure, so I used the version from
next-20161028.
Non-merge commits (relative to Linus' tree): 4249
5008 files changed, 288505 insertions(+), 93898 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 (b58ec8b58247 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
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 (4efca4ed05cb kbuild: modversions for EXPORT_SYMBOL() for asm)
Merging arc-current/for-curr (922cc171998a ARC: timer: rtc: implement read loop in "C" vs. inline asm)
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 (fb479e44a9e2 powerpc/64s: relocation, register save fixes for system reset interrupt)
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 (20b2b24f91f7 bpf: fix map not being uncharged during map creation failure)
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed)
Merging netfilter/master (b73b8a1ba598 netfilter: nft_dup: do not use sreg_dev if the user doesn't specify it)
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 (f8f93bc9d2a2 Merge tag 'asoc-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (416379f9ebde PCI: designware: Check for iATU unroll support after initializing host)
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 (d69fff18a69a ARM: SoC: Document merges)
Merging pinctrl/for-next (71891d6cdb66 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 (989fa9a23114 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5c984dad0ff1 Merge branch 'omap-for-v4.9/fixes' 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 (cb6723083247 Merge branch 'dt-for-v4.10' into next)
Merging rockchip/for-next (f9e4dfbd058c Merge branch 'v4.10-armsoc/dts32' 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 (b33c7bb9d59c Merge branch 'next/dt' into for-next)
Merging tegra/for-next (3e2469a8617d 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 (d1f7e8f85b51 s390: squash facilities_src.h into gen_facilities.c)
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 (54626da80217 Merge branch 'for-next-next-4.9-20161024' into for-next-20161024)
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 (29c452d4449b Revert "f2fs: do not recover from previous remained wrong dnodes")
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 (b77428b12b55 xfs: defer should abort intent items if the trans roll fails)
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 (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
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 (9d2cccdd6c22 Merge branch 'doc-tweaks' into docs-next)
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 (fc13fd398625 Merge branch 'udp-fwd-mem-sched-on-dequeue')
CONFLICT (content): Merge conflict in net/netlink/genetlink.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 (3f8247c8c480 Merge tag 'iwlwifi-next-for-kalle-2016-10-25-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
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 (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
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 (7aa6ca61ee55 drm/i915: Mark CPU cache as dirty when used for rendering)
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 (55edf41b699b drm: define drm_compat_ioctl NULL on CONFIG_COMPAT=n and reduce #ifdefs)
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 (ed8b0c0f93fd drm/arm: mark symbols static where possible)
Merging sunxi/sunxi/for-next (bc5952be2d42 Merge branch 'sunxi/dt64-for-4.10' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
CONFLICT (add/add): Merge conflict in scripts/gcc-plugins/latent_entropy_plugin.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
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 (f8f93bc9d2a2 Merge tag 'asoc-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (2fd876810ed6 Merge remote-tracking branch 'asoc/topic/wm9713' into asoc-next)
$ git reset --hard HEAD^
Merging next-20161028 version of sound-asoc
CONFLICT (content): Merge conflict in sound/soc/samsung/s3c24xx-i2s.c
[master 8649b6ef7ba6] next-20161028/sound-asoc
Merging modules/modules-next (a467a672cf09 MAINTAINERS: Begin module maintainer transition)
Merging input/next (8dd5e0b364e5 Input: da9063 - fix module autoload when registered via OF)
Merging block/for-next (4ef0bfba89a8 Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in block/blk-mq.c
Applying: block: fixup for "split out request-only flags into a new namespace"
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 (22c55ad7026c mmc: sh_mobile_sdhi: Add r7s72100 support)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (85c9ccd4f026 md/bitmap: Don't write bitmap while earlier writes might be in-flight)
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 (121c4e997cee 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 (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
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 (3ab554413ec4 Merge remote-tracking branches 'spi/topic/omap', 'spi/topic/rspi', 'spi/topic/spidev' and 'spi/topic/sunxi' into spi-next)
Merging tip/auto-latest (fe9e43357c01 Merge branch 'x86/cache')
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 (2e7e001e1cc3 squash! rcu: Abstract extended quiescent state determination)
Merging kvm/linux-next (ad3610919e6f kvm: x86: avoid atomic operations on APICv vmentry)
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 (33e4eed03974 leds: Add user LED driver for NIC78bx device)
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 (16a142954a55 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (63cbfd47b6f4 scsi: smartpqi: switch to pci_alloc_irq_vectors)
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 (a9d72eeb1308 Merge branch 'for-4.9-fixes' 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
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 (8e9e3f5ba9ec Documentation: bindings: fix twl-rtc documentation)
$ git reset --hard HEAD^
Merging next-20161028 version of rtc
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 (def07cd2dc46 mm/cma.c: check the max limit for cma allocation)
$ 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
Merging akpm/master (ebda68710b05 ima: platform-independent hash value)
^ permalink raw reply
* Re: linux-next: manual merge of the rdma-leon-test tree with the net-next tree
From: Leon Romanovsky @ 2016-11-08 8:39 UTC (permalink / raw)
To: Stephen Rothwell, Doug Ledford
Cc: David Miller, Networking, linux-next, linux-kernel, David Ahern
In-Reply-To: <20161108130623.4b9b4403@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2021 bytes --]
On Tue, Nov 08, 2016 at 01:06:23PM +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> Today's linux-next merge of the rdma-leon-test tree got a conflict in:
>
> drivers/infiniband/core/roce_gid_mgmt.c
>
> between commit:
>
> 453d39329ad0 ("IB/core: Flip to the new dev walk API")
>
> from the net-next tree and commit:
>
> e4b4d6b5d8c2 ("IB/core: Remove debug prints after allocation failure")
>
> from the rdma-leon-test 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.
Thanks Stephen,
Doug,
Please be aware that you will get this conflict too, since David has
different drivers/infiniband/core/roce_gid_mgmt.c file than you have.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/infiniband/core/roce_gid_mgmt.c
> index 3a64a0881882,c86ddcea7675..000000000000
> --- a/drivers/infiniband/core/roce_gid_mgmt.c
> +++ b/drivers/infiniband/core/roce_gid_mgmt.c
> @@@ -437,28 -434,6 +434,26 @@@ static void callback_for_addr_gid_devic
> &parsed->gid_attr);
> }
>
> +struct upper_list {
> + struct list_head list;
> + struct net_device *upper;
> +};
> +
> +static int netdev_upper_walk(struct net_device *upper, void *data)
> +{
> + struct upper_list *entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
> + struct list_head *upper_list = data;
> +
> - if (!entry) {
> - pr_info("roce_gid_mgmt: couldn't allocate entry to delete ndev\n");
> ++ if (!entry)
> + return 0;
> - }
> +
> + list_add_tail(&entry->list, upper_list);
> + dev_hold(upper);
> + entry->upper = upper;
> +
> + return 0;
> +}
> +
> static void handle_netdev_upper(struct ib_device *ib_dev, u8 port,
> void *cookie,
> void (*handle_netdev)(struct ib_device *ib_dev,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the tty tree with the jc_docs tree
From: Greg KH @ 2016-11-08 10:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, linux-next, linux-kernel, Mauro Carvalho Chehab,
Jiri Slaby
In-Reply-To: <20161108163013.24d165f3@canb.auug.org.au>
On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> Documentation/VGA-softcursor.txt
>
> between commits:
>
> 27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup")
> 9d85025b0418 ("docs-rst: create an user's manual book")
>
> from the jc_docs tree and commit:
>
> b9c8b7fc252c ("vgacon: remove prehistoric macros")
>
> from the tty tree.
>
> I fixed it up (I deleted it - since 9d85025b0418 moved it - but that
> means it may need fixing up in its new location to match any relevant
> changes in b9c8b7fc252c) 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.
Thanks, I'll work on sending a documentation patch after 4.10-rc1 to fix
this up.
greg k-h
^ permalink raw reply
* next-20161108 build: 2 failures 1 warnings (next-20161108)
From: Build bot for Mark Brown @ 2016-11-08 10:39 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161108
Git describe: next-20161108
Commit: fa0208c825 Add linux-next specific files for 20161108
Build Time: 80 min 11 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 1
Warnings: 1
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
arm-allmodconfig
../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 1
2 ../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
Warnings Summary: 1
1 ../drivers/tty/serial/pxa.c:944:1: warning: 'serial_pxa_init' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches
Errors:
../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 1 warnings, 0 section mismatches
Errors:
../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
Warnings:
../drivers/tty/serial/pxa.c:944:1: warning: 'serial_pxa_init' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
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
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the drm-intel tree
From: Daniel Vetter @ 2016-11-08 10:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Peter Zijlstra, Daniel Vetter, Intel Graphics, linux-kernel, DRI,
linux-next, H. Peter Anvin, Thomas Gleixner, Ingo Molnar
In-Reply-To: <20161108152541.096711bb@canb.auug.org.au>
On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> FIXME: Add owner of second tree to To:
> Add author(s)/SOB of conflicting commits.
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_shrinker.c
>
> between commits:
>
> 1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
>
> from the drm-intel tree and commit:
>
> 3ab7c086d5ec ("locking/drm: Kill mutex trickery")
> c7faee2109f9 ("locking/drm: Fix i915_gem_shrinker_lock() locking")
Hm, this seems to be the older versions that nuke the recursive locking
trickery entirely, I thought we had version in-flight that kept that? I
know that the i915 (and msm locking fwiw) is horrible since essentially
it's a recursive BKL, and we're working (slowly, after all getting rid of
the BKL wasn't simple either) to fix this. But meanwhile I'm assuming that
we'll still need this to be able to get out of low memory situations in
i915. Has that part simply not yet landed?
Thanks, Daniel
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c
> index a6fc1bdc48af,e9bd2a81d03a..000000000000
> --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
> +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
> @@@ -35,33 -35,6 +35,15 @@@
> #include "i915_drv.h"
> #include "i915_trace.h"
>
> - static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
> - {
> - if (!mutex_is_locked(mutex))
> - return false;
> -
> - #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
> - return mutex->owner == task;
> - #else
> - /* Since UP may be pre-empted, we cannot assume that we own the lock */
> - return false;
> - #endif
> - }
> -
> +static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock)
> +{
> - if (!mutex_trylock(&dev->struct_mutex)) {
> - if (!mutex_is_locked_by(&dev->struct_mutex, current))
> - return false;
> -
> - *unlock = false;
> - } else {
> - *unlock = true;
> - }
> ++ if (!mutex_trylock(&dev->struct_mutex))
> ++ return false;
> +
> ++ *unlock = true;
> + return true;
> +}
> +
> static bool any_vma_pinned(struct drm_i915_gem_object *obj)
> {
> struct i915_vma *vma;
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* Re: next-20161108 build: 2 failures 1 warnings (next-20161108)
From: Stephen Rothwell @ 2016-11-08 11:58 UTC (permalink / raw)
To: Build bot for Mark Brown, Stephen Warren, Colin Cross,
Olof Johansson, Thierry Reding
Cc: kernel-build-reports, linaro-kernel, linux-next, Mirza Krak,
Marcel Ziswiler, Jon Hunter
In-Reply-To: <E1c43nx-0006yU-De@optimist>
Hi all,
On Tue, 08 Nov 2016 10:39:01 +0000 Build bot for Mark Brown <broonie@kernel.org> wrote:
>
> arm64-allmodconfig
> ../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
>
> arm-allmodconfig
> ../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
Caused by commit
4f95e6a5c9e4 ("bus: Add support for Tegra Generic Memory Interface")
from the tegra tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the drm-intel tree
From: Peter Zijlstra @ 2016-11-08 13:24 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Intel Graphics, DRI, linux-next, linux-kernel, Chris Wilson
In-Reply-To: <20161108104403.mi3onjfn65etrrtu@phenom.ffwll.local>
On Tue, Nov 08, 2016 at 11:44:03AM +0100, Daniel Vetter wrote:
> On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > FIXME: Add owner of second tree to To:
> > Add author(s)/SOB of conflicting commits.
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > drivers/gpu/drm/i915/i915_gem_shrinker.c
> >
> > between commits:
> >
> > 1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
> >
> > from the drm-intel tree and commit:
> >
> > 3ab7c086d5ec ("locking/drm: Kill mutex trickery")
> > c7faee2109f9 ("locking/drm: Fix i915_gem_shrinker_lock() locking")
>
> Hm, this seems to be the older versions that nuke the recursive locking
> trickery entirely, I thought we had version in-flight that kept that? I
> know that the i915 (and msm locking fwiw) is horrible since essentially
> it's a recursive BKL, and we're working (slowly, after all getting rid of
> the BKL wasn't simple either) to fix this. But meanwhile I'm assuming that
> we'll still need this to be able to get out of low memory situations in
> i915. Has that part simply not yet landed?
You're talking about:
lkml.kernel.org/r/20161007154351.GL3117@twins.programming.kicks-ass.net
? I got no feedback from you DRM guys on that so I kinda forgot about
that in the hope we'd not have to do this at all.
I can try and resurrect, that I suppose.
Now, I know you're working on getting rid of this entirely for i915, but
what about that MSM driver? Will we continue to need it there, is
anybody actually maintaining that thing?
^ permalink raw reply
* Re: next-20161108 build: 2 failures 1 warnings (next-20161108)
From: Arnd Bergmann @ 2016-11-08 14:56 UTC (permalink / raw)
To: kernel-build-reports
Cc: Stephen Rothwell, Build bot for Mark Brown, Stephen Warren,
Colin Cross, Olof Johansson, Thierry Reding, linaro-kernel,
Mirza Krak, Marcel Ziswiler, Jon Hunter, linux-next
In-Reply-To: <20161108225858.17b3440d@canb.auug.org.au>
On Tuesday, November 8, 2016 10:58:58 PM CET Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 08 Nov 2016 10:39:01 +0000 Build bot for Mark Brown <broonie@kernel.org> wrote:
> >
> > arm64-allmodconfig
> > ../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
> >
> > arm-allmodconfig
> > ../drivers/bus/tegra-gmi.c:97:11: error: 'dev' undeclared (first use in this function)
>
> Caused by commit
>
> 4f95e6a5c9e4 ("bus: Add support for Tegra Generic Memory Interface")
>
> from the tegra tree.
>
Sent a fix now, along with 22 more patches for new warnings and build errrors
in linux-next.
Arnd
^ permalink raw reply
* Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree
From: Daniel Vetter @ 2016-11-08 16:09 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Intel Graphics, DRI, linux-next, linux-kernel, Chris Wilson,
Joonas Lahtinen, Rob Clark
In-Reply-To: <20161108132448.GG3117@twins.programming.kicks-ass.net>
On Tue, Nov 08, 2016 at 02:24:48PM +0100, Peter Zijlstra wrote:
> On Tue, Nov 08, 2016 at 11:44:03AM +0100, Daniel Vetter wrote:
> > On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > FIXME: Add owner of second tree to To:
> > > Add author(s)/SOB of conflicting commits.
> > >
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > drivers/gpu/drm/i915/i915_gem_shrinker.c
> > >
> > > between commits:
> > >
> > > 1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
> > >
> > > from the drm-intel tree and commit:
> > >
> > > 3ab7c086d5ec ("locking/drm: Kill mutex trickery")
> > > c7faee2109f9 ("locking/drm: Fix i915_gem_shrinker_lock() locking")
> >
> > Hm, this seems to be the older versions that nuke the recursive locking
> > trickery entirely, I thought we had version in-flight that kept that? I
> > know that the i915 (and msm locking fwiw) is horrible since essentially
> > it's a recursive BKL, and we're working (slowly, after all getting rid of
> > the BKL wasn't simple either) to fix this. But meanwhile I'm assuming that
> > we'll still need this to be able to get out of low memory situations in
> > i915. Has that part simply not yet landed?
>
> You're talking about:
>
> lkml.kernel.org/r/20161007154351.GL3117@twins.programming.kicks-ass.net
>
> ? I got no feedback from you DRM guys on that so I kinda forgot about
> that in the hope we'd not have to do this at all.
Yes. Chris/Joonas, pls give this is a spin and review.
>
> I can try and resurrect, that I suppose.
>
> Now, I know you're working on getting rid of this entirely for i915, but
> what about that MSM driver? Will we continue to need it there, is
> anybody actually maintaining that thing?
Rob Clark is, and since he's a one-man gpu driver team with other
responsibilities it might take even longer than for i915 :(
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply
* Re: linux-next: manual merge of the scsi tree with the block tree
From: James Bottomley @ 2016-11-08 16:17 UTC (permalink / raw)
To: Stephen Rothwell, Jens Axboe
Cc: linux-next, linux-kernel, Christoph Hellwig, Gilad Broner,
Martin K. Petersen, Subhash Jadavani
In-Reply-To: <20161108164804.0aef27e8@canb.auug.org.au>
On Tue, 2016-11-08 at 16:48 +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the scsi tree got a conflict in:
>
> drivers/scsi/ufs/ufshcd.c
>
> between commit:
>
> e806402130c9 ("block: split out request-only flags into a new
> namespace")
>
> from the block tree and commit:
>
> 2266d5678ad1 ("scsi: ufs: fix sense buffer size to 18 bytes")
>
> from the scsi 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.
Thanks for doing this. I think this is exactly the type of easily
resolvable conflict Linus likes to fix himself, so keeping the trees
separate seems the best options.
Regards,
James
^ 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