* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-16 23:36 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Jarod Wilson, Sunil Goutham
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/cavium/thunder/nicvf_main.c
between commit:
712c31853440 ("net: thunderx: Program LMAC credits based on MTU")
from the net tree and commit:
109cc16526c6 ("ethernet/cavium: use core min/max MTU checking")
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/cavium/thunder/nicvf_main.c
index 8a37012c9c89,b192712c93b7..000000000000
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@@ -1292,19 -1312,10 +1292,13 @@@ static int nicvf_change_mtu(struct net_
{
struct nicvf *nic = netdev_priv(netdev);
- if (new_mtu > NIC_HW_MAX_FRS)
- return -EINVAL;
-
- if (new_mtu < NIC_HW_MIN_FRS)
- return -EINVAL;
-
+ netdev->mtu = new_mtu;
+
+ if (!netif_running(netdev))
+ return 0;
+
if (nicvf_update_hw_max_frs(nic, new_mtu))
return -EINVAL;
- netdev->mtu = new_mtu;
- nic->mtu = new_mtu;
return 0;
}
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-16 23:46 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Michael Weiser, Giuseppe CAVALLARO
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
between commit:
ba1ffd74df74 ("stmmac: fix PTP support for GMAC4")
from the net tree and commit:
f8be0d78be6e ("net: ethernet: stmmac: change dma descriptors to __le32")
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/stmicro/stmmac/dwmac4_descs.c
index a601f8d43b75,bec72d3103a1..000000000000
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@@ -211,18 -205,14 +212,18 @@@ static void dwmac4_rd_enable_tx_timesta
static int dwmac4_wrback_get_tx_timestamp_status(struct dma_desc *p)
{
- return (le32_to_cpu(p->des3) & TDES3_TIMESTAMP_STATUS)
- >> TDES3_TIMESTAMP_STATUS_SHIFT;
+ /* Context type from W/B descriptor must be zero */
- if (p->des3 & TDES3_CONTEXT_TYPE)
++ if (le32_to_cpu(p->des3) & TDES3_CONTEXT_TYPE)
+ return -EINVAL;
+
+ /* Tx Timestamp Status is 1 so des0 and des1'll have valid values */
- if (p->des3 & TDES3_TIMESTAMP_STATUS)
++ if (le32_to_cpu(p->des3) & TDES3_TIMESTAMP_STATUS)
+ return 0;
+
+ return 1;
}
-/* NOTE: For RX CTX bit has to be checked before
- * HAVE a specific function for TX and another one for RX
- */
-static u64 dwmac4_wrback_get_timestamp(void *desc, u32 ats)
+static inline u64 dwmac4_get_timestamp(void *desc, u32 ats)
{
struct dma_desc *p = (struct dma_desc *)desc;
u64 ns;
@@@ -234,54 -224,12 +235,54 @@@
return ns;
}
-static int dwmac4_context_get_rx_timestamp_status(void *desc, u32 ats)
+static int dwmac4_rx_check_timestamp(void *desc)
+{
+ struct dma_desc *p = (struct dma_desc *)desc;
+ u32 own, ctxt;
+ int ret = 1;
+
- own = p->des3 & RDES3_OWN;
- ctxt = ((p->des3 & RDES3_CONTEXT_DESCRIPTOR)
++ own = le32_to_cpu(p->des3) & RDES3_OWN;
++ ctxt = ((le32_to_cpu(p->des3) & RDES3_CONTEXT_DESCRIPTOR)
+ >> RDES3_CONTEXT_DESCRIPTOR_SHIFT);
+
+ if (likely(!own && ctxt)) {
+ if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff))
+ /* Corrupted value */
+ ret = -EINVAL;
+ else
+ /* A valid Timestamp is ready to be read */
+ ret = 0;
+ }
+
+ /* Timestamp not ready */
+ return ret;
+}
+
+static int dwmac4_wrback_get_rx_timestamp_status(void *desc, u32 ats)
{
struct dma_desc *p = (struct dma_desc *)desc;
+ int ret = -EINVAL;
+
+ /* Get the status from normal w/b descriptor */
- if (likely(p->des3 & TDES3_RS1V)) {
- if (likely(p->des1 & RDES1_TIMESTAMP_AVAILABLE)) {
++ if (likely(le32_to_cpu(p->des3) & TDES3_RS1V)) {
++ if (likely(le32_to_cpu(p->des1) & RDES1_TIMESTAMP_AVAILABLE)) {
+ int i = 0;
+
+ /* Check if timestamp is OK from context descriptor */
+ do {
+ ret = dwmac4_rx_check_timestamp(desc);
+ if (ret < 0)
+ goto exit;
+ i++;
- return (le32_to_cpu(p->des1) & RDES1_TIMESTAMP_AVAILABLE)
- >> RDES1_TIMESTAMP_AVAILABLE_SHIFT;
+ } while ((ret == 1) || (i < 10));
+
+ if (i == 10)
+ ret = -EBUSY;
+ }
+ }
+exit:
+ return ret;
}
static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-16 23:48 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Josef Bacik, Thomas Graf
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/bpf_verifier.h
between commit:
f23cc643f9ba ("bpf: fix range arithmetic for bpf map access")
from the net tree and commit:
57a09bf0a416 ("bpf: Detect identical PTR_TO_MAP_VALUE_OR_NULL registers")
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 include/linux/bpf_verifier.h
index 6aaf425cebc3,ac5b393ee6b2..000000000000
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@@ -22,8 -22,8 +22,9 @@@ struct bpf_reg_state
* Used to determine if any memory access using this register will
* result in a bad access.
*/
- u64 min_value, max_value;
+ s64 min_value;
+ u64 max_value;
+ u32 id;
union {
/* valid when type == CONST_IMM | PTR_TO_STACK | UNKNOWN_VALUE */
s64 imm;
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-11-16 23:51 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Josef Bacik, Tobias Klauser
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
f23cc643f9ba ("bpf: fix range arithmetic for bpf map access")
from the net tree and commit:
de464375daf0 ("bpf: Remove unused but set variables")
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 kernel/bpf/verifier.c
index 6a936159c6e0,89f787ca47ef..000000000000
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -212,12 -229,13 +229,13 @@@ static void print_verifier_state(struc
else if (t == CONST_PTR_TO_MAP || t == PTR_TO_MAP_VALUE ||
t == PTR_TO_MAP_VALUE_OR_NULL ||
t == PTR_TO_MAP_VALUE_ADJ)
- verbose("(ks=%d,vs=%d)",
+ verbose("(ks=%d,vs=%d,id=%u)",
reg->map_ptr->key_size,
- reg->map_ptr->value_size);
+ reg->map_ptr->value_size,
+ reg->id);
if (reg->min_value != BPF_REGISTER_MIN_RANGE)
- verbose(",min_value=%llu",
- (unsigned long long)reg->min_value);
+ verbose(",min_value=%lld",
+ (long long)reg->min_value);
if (reg->max_value != BPF_REGISTER_MAX_RANGE)
verbose(",max_value=%llu",
(unsigned long long)reg->max_value);
@@@ -1477,9 -1498,7 +1499,8 @@@ static void adjust_reg_min_max_vals(str
struct bpf_insn *insn)
{
struct bpf_reg_state *regs = env->cur_state.regs, *dst_reg;
- u64 min_val = BPF_REGISTER_MIN_RANGE, max_val = BPF_REGISTER_MAX_RANGE;
+ s64 min_val = BPF_REGISTER_MIN_RANGE;
+ u64 max_val = BPF_REGISTER_MAX_RANGE;
- bool min_set = false, max_set = false;
u8 opcode = BPF_OP(insn->code);
dst_reg = ®s[insn->dst_reg];
^ permalink raw reply
* linux-next: manual merge of the drm tree with the arm tree
From: Stephen Rothwell @ 2016-11-17 1:39 UTC (permalink / raw)
To: Dave Airlie, Russell King
Cc: linux-next, linux-kernel, Baoyou Xie, Daniel Vetter
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i2c/tda998x_drv.c
between commit:
5d564ba2705d ("drm/i2c: tda998x: group audio functions together")
from the arm tree and commit:
c20ea8fd4986 ("drm/i2c/tda998x: mark symbol static where possible")
from the drm tree.
I fixed it up (see below - its a much simpler conflict than it appears
to be 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/i2c/tda998x_drv.c
index bf5eec0c1b4f,027521f30b6e..000000000000
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -824,281 -819,58 +824,282 @@@ tda998x_configure_audio(struct tda998x_
return tda998x_write_aif(priv, ¶ms->cea);
}
-/* DRM encoder functions */
+static int tda998x_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ struct tda998x_priv *priv = dev_get_drvdata(dev);
+ int i, ret;
+ struct tda998x_audio_params audio = {
+ .sample_width = params->sample_width,
+ .sample_rate = params->sample_rate,
+ .cea = params->cea,
+ };
+
+ memcpy(audio.status, params->iec.status,
+ min(sizeof(audio.status), sizeof(params->iec.status)));
-static void tda998x_encoder_set_config(struct tda998x_priv *priv,
- const struct tda998x_encoder_params *p)
+ switch (daifmt->fmt) {
+ case HDMI_I2S:
+ if (daifmt->bit_clk_inv || daifmt->frame_clk_inv ||
+ daifmt->bit_clk_master || daifmt->frame_clk_master) {
+ dev_err(dev, "%s: Bad flags %d %d %d %d\n", __func__,
+ daifmt->bit_clk_inv, daifmt->frame_clk_inv,
+ daifmt->bit_clk_master,
+ daifmt->frame_clk_master);
+ return -EINVAL;
+ }
+ for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
+ if (priv->audio_port[i].format == AFMT_I2S)
+ audio.config = priv->audio_port[i].config;
+ audio.format = AFMT_I2S;
+ break;
+ case HDMI_SPDIF:
+ for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
+ if (priv->audio_port[i].format == AFMT_SPDIF)
+ audio.config = priv->audio_port[i].config;
+ audio.format = AFMT_SPDIF;
+ break;
+ default:
+ dev_err(dev, "%s: Invalid format %d\n", __func__, daifmt->fmt);
+ return -EINVAL;
+ }
+
+ if (audio.config == 0) {
+ dev_err(dev, "%s: No audio configutation found\n", __func__);
+ return -EINVAL;
+ }
+
+ mutex_lock(&priv->audio_mutex);
+ if (priv->supports_infoframes && priv->sink_has_audio)
+ ret = tda998x_configure_audio(priv, &audio);
+ else
+ ret = 0;
+
+ if (ret == 0)
+ priv->audio_params = audio;
+ mutex_unlock(&priv->audio_mutex);
+
+ return ret;
+}
+
+static void tda998x_audio_shutdown(struct device *dev, void *data)
{
- priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) |
- (p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) |
- VIP_CNTRL_0_SWAP_B(p->swap_b) |
- (p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0);
- priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) |
- (p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) |
- VIP_CNTRL_1_SWAP_D(p->swap_d) |
- (p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0);
- priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) |
- (p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) |
- VIP_CNTRL_2_SWAP_F(p->swap_f) |
- (p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0);
+ struct tda998x_priv *priv = dev_get_drvdata(dev);
- priv->audio_params = p->audio_params;
+ mutex_lock(&priv->audio_mutex);
+
+ reg_write(priv, REG_ENA_AP, 0);
+
+ priv->audio_params.format = AFMT_UNUSED;
+
+ mutex_unlock(&priv->audio_mutex);
}
- int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable)
-static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
++static int
++tda998x_audio_digital_mute(struct device *dev, void *data, bool enable)
{
- struct tda998x_priv *priv = enc_to_tda998x_priv(encoder);
+ struct tda998x_priv *priv = dev_get_drvdata(dev);
- /* we only care about on or off: */
- if (mode != DRM_MODE_DPMS_ON)
- mode = DRM_MODE_DPMS_OFF;
+ mutex_lock(&priv->audio_mutex);
- if (mode == priv->dpms)
- return;
+ tda998x_audio_mute(priv, enable);
- switch (mode) {
- case DRM_MODE_DPMS_ON:
- /* enable video ports, audio will be enabled later */
- reg_write(priv, REG_ENA_VP_0, 0xff);
- reg_write(priv, REG_ENA_VP_1, 0xff);
- reg_write(priv, REG_ENA_VP_2, 0xff);
- /* set muxing after enabling ports: */
- reg_write(priv, REG_VIP_CNTRL_0, priv->vip_cntrl_0);
- reg_write(priv, REG_VIP_CNTRL_1, priv->vip_cntrl_1);
- reg_write(priv, REG_VIP_CNTRL_2, priv->vip_cntrl_2);
- break;
- case DRM_MODE_DPMS_OFF:
- /* disable video ports */
- reg_write(priv, REG_ENA_VP_0, 0x00);
- reg_write(priv, REG_ENA_VP_1, 0x00);
- reg_write(priv, REG_ENA_VP_2, 0x00);
- break;
+ mutex_unlock(&priv->audio_mutex);
+ return 0;
+}
+
+static int tda998x_audio_get_eld(struct device *dev, void *data,
+ uint8_t *buf, size_t len)
+{
+ struct tda998x_priv *priv = dev_get_drvdata(dev);
+
+ mutex_lock(&priv->audio_mutex);
+ memcpy(buf, priv->connector.eld,
+ min(sizeof(priv->connector.eld), len));
+ mutex_unlock(&priv->audio_mutex);
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+ .hw_params = tda998x_audio_hw_params,
+ .audio_shutdown = tda998x_audio_shutdown,
+ .digital_mute = tda998x_audio_digital_mute,
+ .get_eld = tda998x_audio_get_eld,
+};
+
+static int tda998x_audio_codec_init(struct tda998x_priv *priv,
+ struct device *dev)
+{
+ struct hdmi_codec_pdata codec_data = {
+ .ops = &audio_codec_ops,
+ .max_i2s_channels = 2,
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++) {
+ if (priv->audio_port[i].format == AFMT_I2S &&
+ priv->audio_port[i].config != 0)
+ codec_data.i2s = 1;
+ if (priv->audio_port[i].format == AFMT_SPDIF &&
+ priv->audio_port[i].config != 0)
+ codec_data.spdif = 1;
+ }
+
+ priv->audio_pdev = platform_device_register_data(
+ dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+ &codec_data, sizeof(codec_data));
+
+ return PTR_ERR_OR_ZERO(priv->audio_pdev);
+}
+
+/* DRM connector functions */
+
+static int tda998x_connector_dpms(struct drm_connector *connector, int mode)
+{
+ if (drm_core_check_feature(connector->dev, DRIVER_ATOMIC))
+ return drm_atomic_helper_connector_dpms(connector, mode);
+ else
+ return drm_helper_connector_dpms(connector, mode);
+}
+
+static int tda998x_connector_fill_modes(struct drm_connector *connector,
+ uint32_t maxX, uint32_t maxY)
+{
+ struct tda998x_priv *priv = conn_to_tda998x_priv(connector);
+ int ret;
+
+ mutex_lock(&priv->audio_mutex);
+ ret = drm_helper_probe_single_connector_modes(connector, maxX, maxY);
+
+ if (connector->edid_blob_ptr) {
+ struct edid *edid = (void *)connector->edid_blob_ptr->data;
+
+ priv->sink_has_audio = drm_detect_monitor_audio(edid);
+ } else {
+ priv->sink_has_audio = false;
+ }
+ mutex_unlock(&priv->audio_mutex);
+
+ return ret;
+}
+
+static enum drm_connector_status
+tda998x_connector_detect(struct drm_connector *connector, bool force)
+{
+ struct tda998x_priv *priv = conn_to_tda998x_priv(connector);
+ u8 val = cec_read(priv, REG_CEC_RXSHPDLEV);
+
+ return (val & CEC_RXSHPDLEV_HPD) ? connector_status_connected :
+ connector_status_disconnected;
+}
+
+static void tda998x_connector_destroy(struct drm_connector *connector)
+{
+ drm_connector_cleanup(connector);
+}
+
+static const struct drm_connector_funcs tda998x_connector_funcs = {
+ .dpms = tda998x_connector_dpms,
+ .reset = drm_atomic_helper_connector_reset,
+ .fill_modes = tda998x_connector_fill_modes,
+ .detect = tda998x_connector_detect,
+ .destroy = tda998x_connector_destroy,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static int read_edid_block(void *data, u8 *buf, unsigned int blk, size_t length)
+{
+ struct tda998x_priv *priv = data;
+ u8 offset, segptr;
+ int ret, i;
+
+ offset = (blk & 1) ? 128 : 0;
+ segptr = blk / 2;
+
+ reg_write(priv, REG_DDC_ADDR, 0xa0);
+ reg_write(priv, REG_DDC_OFFS, offset);
+ reg_write(priv, REG_DDC_SEGM_ADDR, 0x60);
+ reg_write(priv, REG_DDC_SEGM, segptr);
+
+ /* enable reading EDID: */
+ priv->wq_edid_wait = 1;
+ reg_write(priv, REG_EDID_CTRL, 0x1);
+
+ /* flag must be cleared by sw: */
+ reg_write(priv, REG_EDID_CTRL, 0x0);
+
+ /* wait for block read to complete: */
+ if (priv->hdmi->irq) {
+ i = wait_event_timeout(priv->wq_edid,
+ !priv->wq_edid_wait,
+ msecs_to_jiffies(100));
+ if (i < 0) {
+ dev_err(&priv->hdmi->dev, "read edid wait err %d\n", i);
+ return i;
+ }
+ } else {
+ for (i = 100; i > 0; i--) {
+ msleep(1);
+ ret = reg_read(priv, REG_INT_FLAGS_2);
+ if (ret < 0)
+ return ret;
+ if (ret & INT_FLAGS_2_EDID_BLK_RD)
+ break;
+ }
+ }
+
+ if (i == 0) {
+ dev_err(&priv->hdmi->dev, "read edid timeout\n");
+ return -ETIMEDOUT;
}
- priv->dpms = mode;
+ ret = reg_read_range(priv, REG_EDID_DATA_0, buf, length);
+ if (ret != length) {
+ dev_err(&priv->hdmi->dev, "failed to read edid block %d: %d\n",
+ blk, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tda998x_connector_get_modes(struct drm_connector *connector)
+{
+ struct tda998x_priv *priv = conn_to_tda998x_priv(connector);
+ struct edid *edid;
+ int n;
+
+ /*
+ * If we get killed while waiting for the HPD timeout, return
+ * no modes found: we are not in a restartable path, so we
+ * can't handle signals gracefully.
+ */
+ if (tda998x_edid_delay_wait(priv))
+ return 0;
+
+ if (priv->rev == TDA19988)
+ reg_clear(priv, REG_TX4, TX4_PD_RAM);
+
+ edid = drm_do_get_edid(connector, read_edid_block, priv);
+
+ if (priv->rev == TDA19988)
+ reg_set(priv, REG_TX4, TX4_PD_RAM);
+
+ if (!edid) {
+ dev_warn(&priv->hdmi->dev, "failed to read EDID\n");
+ return 0;
+ }
+
+ drm_mode_connector_update_edid_property(connector, edid);
+ n = drm_add_edid_modes(connector, edid);
+ drm_edid_to_eld(connector, edid);
+
+ kfree(edid);
+
+ return n;
}
static int tda998x_connector_mode_valid(struct drm_connector *connector,
^ permalink raw reply
* linux-next: manual merge of the block tree with the btrfs-kdave tree
From: Stephen Rothwell @ 2016-11-17 2:01 UTC (permalink / raw)
To: Jens Axboe, David Sterba; +Cc: linux-next, linux-kernel, Christoph Hellwig
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/btrfs/extent_io.c
fs/btrfs/inode.c
between commit:
01a1400f8545 ("btrfs: only check bio size to see if a repair bio should have the failfast flag")
from the btrfs-kdave tree and commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/btrfs/extent_io.c
index 5694d60adad9,1e67723c27a1..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2403,10 -2403,8 +2403,8 @@@ static int bio_readpage_error(struct bi
return -EIO;
}
- if (failed_bio->bi_vcnt > 1)
+ if (failed_bio->bi_iter.bi_size > BTRFS_I(inode)->root->sectorsize)
- read_mode = READ_SYNC | REQ_FAILFAST_DEV;
- else
- read_mode = READ_SYNC;
+ read_mode |= REQ_FAILFAST_DEV;
phy_offset >>= inode->i_sb->s_blocksize_bits;
bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,
diff --cc fs/btrfs/inode.c
index 7e8603c74f43,a4c879671b9d..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -7924,10 -7933,10 +7924,8 @@@ static int dio_read_error(struct inode
return -EIO;
}
- if ((failed_bio->bi_vcnt > 1)
- || (failed_bio->bi_io_vec->bv_len
- > BTRFS_I(inode)->root->sectorsize))
+ if (failed_bio->bi_iter.bi_size > BTRFS_I(inode)->root->sectorsize)
- read_mode = READ_SYNC | REQ_FAILFAST_DEV;
- else
- read_mode = READ_SYNC;
+ read_mode |= REQ_FAILFAST_DEV;
isector = start - btrfs_io_bio(failed_bio)->logical;
isector >>= inode->i_sb->s_blocksize_bits;
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-mkp tree with the block tree
From: Stephen Rothwell @ 2016-11-17 2:44 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Jens Axboe, linux-next, linux-kernel, Christoph Hellwig
In-Reply-To: <yq1vavtkd03.fsf@sermon.lab.mkp.net>
Hi Martin,
On Fri, 11 Nov 2016 14:55:24 -0500 "Martin K. Petersen" <martin.petersen@oracle.com> wrote:
>
> 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...
I'll keep it for now and see how it goes ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the block tree with the btrfs-kdave tree
From: Jens Axboe @ 2016-11-17 2:49 UTC (permalink / raw)
To: Stephen Rothwell, David Sterba
Cc: linux-next, linux-kernel, Christoph Hellwig
In-Reply-To: <20161117130134.682bb6b4@canb.auug.org.au>
On 11/16/2016 07:01 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/btrfs/extent_io.c
> fs/btrfs/inode.c
>
> between commit:
>
> 01a1400f8545 ("btrfs: only check bio size to see if a repair bio should have the failfast flag")
>
> from the btrfs-kdave tree and commit:
>
> 70fd76140a6c ("block,fs: use REQ_* flags directly")
>
> from the block 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 don't have the full context here, but this:
diff --cc fs/btrfs/extent_io.c
index 5694d60adad9,1e67723c27a1..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -2403,10 -2403,8 +2403,8 @@@ static int bio_readpage_error(struct bi
return -EIO;
}
- if (failed_bio->bi_vcnt > 1)
+ if (failed_bio->bi_iter.bi_size > BTRFS_I(inode)->root->sectorsize)
- read_mode = READ_SYNC | REQ_FAILFAST_DEV;
- else
- read_mode = READ_SYNC;
+ read_mode |= REQ_FAILFAST_DEV;
phy_offset >>= inode->i_sb->s_blocksize_bits;
bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,
doesn't look correct, if bio_readpage_error() is called from the
->bi_end_io() handler. bi_size is generally zeroed at that time.
--
Jens Axboe
^ permalink raw reply
* linux-next: manual merge of the tip tree with the drm tree
From: Stephen Rothwell @ 2016-11-17 2:59 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Dave Airlie
Cc: linux-next, linux-kernel, Chris Wilson
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_shrinker.c
between commit:
1233e2db199d ("drm/i915: Move object backing storage manipulation to its own locking")
from the drm tree and commit:
3ab7c086d5ec ("locking/drm: Kill mutex trickery")
c7faee2109f9 ("locking/drm: Fix i915_gem_shrinker_lock() locking")
0f5225b024d4 ("locking/mutex, drm: Introduce mutex_trylock_recursive()")
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,c450076d2f9b..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@@ -35,33 -35,6 +35,24 @@@
#include "i915_drv.h"
#include "i915_trace.h"
- static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
++static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock)
+{
- if (!mutex_is_locked(mutex))
++ switch (mutex_trylock_recursive(&dev->struct_mutex)) {
++ case MUTEX_TRYLOCK_FAILED:
+ 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;
++ case MUTEX_TRYLOCK_SUCCESS:
++ *unlock = true;
++ return true;
+
++ case MUTEX_TRYLOCK_RECURSIVE:
+ *unlock = false;
- } else {
- *unlock = true;
++ return true;
+ }
+
- return true;
++ BUG();
+}
+
static bool any_vma_pinned(struct drm_i915_gem_object *obj)
{
struct i915_vma *vma;
^ permalink raw reply
* linux-next: manual merge of the tip tree with the net-next tree
From: Stephen Rothwell @ 2016-11-17 3:04 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
David Miller, Networking
Cc: linux-next, linux-kernel, Nicolas Pitre, Thomas Lendacky
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/net/ethernet/amd/Kconfig
between commits:
e78332b2285d ("amd-xgbe: Add ECC status support for the device memory")
abf0a1c2b26a ("amd-xgbe: Add support for SFP+ modules")
from the net-next tree and commit:
d1cbfd771ce8 ("ptp_clock: Allow for it to be optional")
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/net/ethernet/amd/Kconfig
index 7ab6efbe4189,713ea7ad22c3..000000000000
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@@ -173,13 -173,11 +173,13 @@@ config SUNLANC
config AMD_XGBE
tristate "AMD 10GbE Ethernet driver"
- depends on ((OF_NET && OF_ADDRESS) || ACPI) && HAS_IOMEM && HAS_DMA
- depends on ARM64 || COMPILE_TEST
+ depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM && HAS_DMA
+ depends on X86 || ARM64 || COMPILE_TEST
select BITREVERSE
select CRC32
- select PTP_1588_CLOCK
+ select PHYLIB
+ select AMD_XGBE_HAVE_ECC if X86
+ imply PTP_1588_CLOCK
---help---
This driver supports the AMD 10GbE Ethernet device found on an
AMD SoC.
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2016-11-17 3:22 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
David Miller, Networking
Cc: linux-next, linux-kernel, Christian Borntraeger, Eric Dumazet
Hi all,
After merging the tip tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
net/core/dev.c: In function 'sk_busy_loop':
net/core/dev.c:5065:3: error: implicit declaration of function 'cpu_relax_lowlatency' [-Werror=implicit-function-declaration]
cpu_relax_lowlatency();
^
Caused by commit
5bd0b85ba8bb ("locking/core, arch: Remove cpu_relax_lowlatency()")
interacting with commit
217f69743681 ("net: busy-poll: allow preemption in sk_busy_loop()")
from the net-next tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Nov 2016 14:13:05 +1100
Subject: [PATCH] net: busy-poll: fix up for cpu_relax_lowlatency() removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/core/dev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index d29d538ec5ad..6b9f8eb55b62 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5062,7 +5062,7 @@ bool sk_busy_loop(struct sock *sk, int nonblock)
return rc;
goto restart;
}
- cpu_relax_lowlatency();
+ cpu_relax();
}
if (napi_poll)
busy_poll_stop(napi, have_poll_lock);
--
2.10.2
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the kvm tree with the tip tree
From: Stephen Rothwell @ 2016-11-17 3:50 UTC (permalink / raw)
To: Marcelo Tosatti, Gleb Natapov, KVM, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Fenghua Yu, He Chen
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/x86/kernel/cpu/scattered.c
between commit:
4ab1586488cb ("x86/cpufeature: Add RDT CPUID feature bits")
from the tip tree and commits:
47f10a36003e ("x86/cpuid: Cleanup cpuid_regs definitions")
47bdf3378d62 ("x86/cpuid: Provide get_scattered_cpuid_leaf()")
from the kvm 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/x86/kernel/cpu/scattered.c
index 49fb680bb0e5,d1316f9c8329..000000000000
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@@ -17,11 -17,17 +17,20 @@@ struct cpuid_bit
u32 sub_leaf;
};
- enum cpuid_regs {
- CR_EAX = 0,
- CR_ECX,
- CR_EDX,
- CR_EBX
+ /* Please keep the leaf sorted by cpuid_bit.level for faster search. */
+ static const struct cpuid_bit cpuid_bits[] = {
+ { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 },
+ { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 },
++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 },
++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 },
++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },
+ { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 },
+ { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 },
+ { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 },
+ { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 },
+ { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 },
+ { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
+ { 0, 0, 0, 0, 0 }
};
void init_scattered_cpuid_features(struct cpuinfo_x86 *c)
^ permalink raw reply
* linux-next: Tree for Nov 17
From: Stephen Rothwell @ 2016-11-17 6:08 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
There will be no linux-next releases on Friday (tomorrow) or Monday.
Changes since 20161116:
The net-next tree gained conflicts against the net tree.
The drm tree gained a conflict against the arm tree.
The block tree gained conflicts against the btrfs-kdave tree.
The tip tree gained conflicts against the drm and net-next trees and a
build failure for which I applied a merge fix patch.
The kvm tree gained a conflict against the tip tree.
Non-merge commits (relative to Linus' tree): 6305
6661 files changed, 401169 insertions(+), 146155 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 244 trees (counting Linus' and 34 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (81bcfe5e48f9 Merge tag 'trace-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
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 (c6a385539175 kbuild: Steal gcc's pie from the very beginning)
Merging arc-current/for-curr (a25f0944ba9b Linux 4.9-rc5)
Merging arm-current/fixes (256ff1cf6b44 ARM: 8628/1: dma-mapping: preallocate DMA-debug hash tables in core_initcall)
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 (c0a36013639b powerpc/64: Fix setting of AIL in hypervisor mode)
Merging sparc/master (87a349f9cc09 sparc64: fix compile warning section mismatch in find_node())
Merging net/master (963abe5c8a02 virtio-net: add a missing synchronize_net())
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 (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master)
Merging wireless-drivers/master (d3532ea6ce4e brcmfmac: avoid maybe-uninitialized warning in brcmf_cfg80211_start_ap)
Merging mac80211/master (4fb7f8af1f4c mac80211_hwsim: fix beacon delta calculation)
Merging sound-current/for-linus (6ff1a25318eb ALSA: usb-audio: Fix use-after-free of usb_device at disconnect)
Merging pci-current/for-linus (bc79c9851a76 PCI: VMD: Update filename to reflect move)
Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (a5d906bb261c usb: chipidea: move the lock initialization to core file)
Merging usb-gadget-fixes/fixes (fd9afd3cbe40 usb: gadget: u_ether: remove interrupt throttling)
Merging usb-serial-fixes/usb-linus (2ab13292d7a3 USB: serial: cp210x: add ID for the Zone DPMX)
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 (a25f0944ba9b Linux 4.9-rc5)
Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5)
Merging input-current/for-linus (324ae0958cab Input: psmouse - cleanup Focaltech code)
Merging crypto-current/master (83d2c9a9c17b crypto: caam - do not register AES-XTS mode on LP units)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
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 (722f191080de mfd: core: Fix device reference leak in mfd_clone_cell)
Merging drm-intel-fixes/for-linux-next-fixes (bc9db5ad3253 drm/i915: Assume non-DP++ port if dvo_port is HDMI and there's no AUX ch specified in the VBT)
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 (5083ce2bc728 clocksource: import ARC timer driver)
Merging arm/for-next (7386fbabc539 Merge branch '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 (c25f2ea54aba Merge branch 'devel' into for-next)
Merging amlogic/for-next (6743126ab0cc 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 (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-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 (242a001e48b7 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (219c43db9c6e Merge branch 'mvebu/dt64-fix' into mvebu/for-next)
Merging omap/for-next (d17e0ffd79a2 Merge branch 'omap-for-v4.10/defconfig' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (22240bf2e1b8 Merge tag 'qcom-arm64-for-4.10' into all-for-4.10)
Merging renesas/next (3c671ff48f97 Merge branch 'soc-for-v4.10' into next)
Merging rockchip/for-next (bbccbbe00835 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 (581e20420200 Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (377450d5b9f8 Merge branch for-4.10/arm64/defconfig into for-next)
Merging arm64/for-next/core (c02433dd6de3 arm64: split thread_info from task stack)
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 (8284a776890f 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 (0e27d27e0d6d selftests/powerpc: Return false instead of -1 in require_paranoia_below())
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 (ef280c859f4c s390: move sys_call_table and last_break from thread_info to thread_struct)
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 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c)
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 (8b7ed75a8a8b Merge branch 'for-next-next-4.9-20161116' into for-next-20161116)
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 (f6d84f8ae294 ext4: remove parameter from ext4_xattr_ibody_set())
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 (59c3b76cc61d fuse: fix fuse_write_end() if zero bytes were copied)
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 (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs)
Merging nfsd/nfsd-next (7ba630f54ca6 nfsd: constify reply_cache_stats_operations structure)
Merging orangefs/for-next (19ff7fcc76e6 orangefs: add .owner to debugfs file_operations)
Merging overlayfs/overlayfs-next (76c50adf1853 ovl: check namelen)
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 (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe)
Merging hid/for-next (1e5bea536e18 Merge branch 'for-4.10/intel-ish' 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 (f5ff9b63d494 MAINTAINERS: The Chinese documentation moved)
Merging v4l-dvb/master (36f94a5cf0f9 Merge tag 'v4.9-rc5' into patchwork)
Merging pm/linux-next (089689caa2b1 Merge branch 'acpi-cppc-fixes' 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 (1629dd4f763c cadence: Add LSO support.)
CONFLICT (content): Merge conflict in kernel/bpf/verifier.c
CONFLICT (content): Merge conflict in include/linux/bpf_verifier.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/thunder/nicvf_main.c
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (7d384846b998 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (8d8e20e2d7bb 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 (9a1a1c08dc28 crypto: caam - merge identical ahash_final/finup shared desc)
Merging drm/drm-next (b7c0e47d9824 Merge tag 'drm-vc4-next-2016-11-16' of https://github.com/anholt/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i2c/tda998x_drv.c
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (27745e829a5c drm/i915/execlists: Use a local lock for dfs_link access)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/topic/drm-misc (beaf5af48034 drm/fence: add out-fences 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 (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (d8b243fb20e3 Merge tags 'sunxi-clk-for-4.10' and 'sunxi-dt-late-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 (43e575fabbaa ALSA: core: Fix kernel-doc warnings)
CONFLICT (modify/delete): Documentation/sound/alsa/alsa-parameters.txt deleted in sound/for-next and modified in HEAD. Version HEAD of Documentation/sound/alsa/alsa-parameters.txt left in tree.
CONFLICT (content): Merge conflict in Documentation/index.rst
$ git rm -f Documentation/sound/alsa/alsa-parameters.txt
Merging sound-asoc/for-next (4e97b0f775bc Merge remote-tracking branch 'asoc/topic/wm9713' into asoc-next)
Merging input/next (fac96cc9f867 Input: raydium_i2c_ts - fix spelling mistake in dev_err message)
Merging block/for-next (f87c539052a6 Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging lightnvm/for-next (b759d3ddb52f lightnvm: rrpc: split bios of size > 256kb)
Merging device-mapper/for-next (445319ca539a dm mpath: add checks for priority group count to avoid invalid memory access)
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 (6ab531499fa5 mfd: intel_soc_pmic_bxtwc: Fix a typo in MODULE_DEVICE_TABLE())
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 (92615cde1acd Merge remote-tracking branches 'regulator/topic/lp873x', 'regulator/topic/max77620', 'regulator/topic/pwm' and 'regulator/topic/tps6507x' into regulator-next)
Merging security/next (185c0f26c026 Merge commit 'v4.9-rc5' into next)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (8931c3bdb3bf SELinux: Use GFP_KERNEL for selinux_parse_opts_str().)
Merging tpmdd/next (4d388433e85f tpm: Check the bios_dir entry for NULL before accessing it)
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 (8443075eacb5 audit: tame initialization warning len_abuf in audit_log_execve_info)
Merging devicetree/for-next (4fb373dfabee 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 (165cc6ccfffa Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (c129105599a1 Merge branch 'locking/core')
CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Applying: net: busy-poll: fix up for cpu_relax_lowlatency() removal
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 (8176170e03db EDAC, xgene: Fix spelling mistake in error messages)
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 (9183b76a762e rcu: Only dump stalled-tasks stacks if there was a real stall)
Merging kvm/linux-next (813ae37e6aed Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next)
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/scattered.c
Merging kvm-arm/next (fd5ebf99f814 arm/arm64: KVM: Clean up useless code in kvm_timer_enable)
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 (d56df12ccd51 MAINTAINERS: Add LED subsystem co-maintainer)
Merging ipmi/for-next (426f07e89458 ipmi: Fix sequence number handling)
Merging driver-core/driver-core-next (dfea747d2aba drivers: base: cacheinfo: support DT overrides for cache properties)
CONFLICT (content): Merge conflict in drivers/base/power/main.c
Merging tty/tty-next (b81064547338 mxs-auart: count FIFO overrun errors)
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 (c95a9f83711b usb: xhci-mem: use passed in GFP flags instead of GFP_KERNEL)
Merging usb-gadget/next (93f700f6276b usb: dwc3: Workaround for irq mask issue)
Merging usb-serial/usb-next (2fbd69c4e333 USB: serial: fix invalid user-pointer checks)
Merging usb-chipidea-next/ci-for-usb-next (3be3251db088 usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
Merging phy-next/next (b632b5eaab4a phy: rockchip-inno-usb2: select USB_COMMON)
Merging staging/staging-next (2c52b1efd693 Merge tag 'iio-for-4.10c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
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 (c55d240003ae lkdtm: Prevent the compiler from optimising lkdtm_CORRUPT_STACK())
Merging extcon/extcon-next (56182a830cbf extcon: usb-gpio: Add VBUS detection support)
Merging slave-dma/next (9758edab6672 Merge branch 'topic/qcom' into next)
Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
Merging scsi/for-next (9b48028234ad Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (af15769ffab1 scsi: mvsas: fix command_active typo)
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 (1314ed74840c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
CONFLICT (content): Merge conflict in drivers/remoteproc/Kconfig
Merging gpio/for-next (1728a227c1ff 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 (9a881bc55d7b clk: Hi6220: enable stub clock driver for ARCH_HISI)
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 (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (4cb19355ea19 device-dax: fail all private mapping attempts)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (c2cda3bbc654 ipc/shm.c: coding style fixes)
CONFLICT (content): Merge conflict in mm/memcontrol.c
$ 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 (b3b1e8fc4b17 sparc: implement watchdog_nmi_enable and watchdog_nmi_disable)
^ permalink raw reply
* Re: linux-next: manual merge of the rpmsg tree with the slave-dma tree
From: Bjorn Andersson @ 2016-11-17 6:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Vinod Koul, linux-next, linux-kernel, Peter Griffin
In-Reply-To: <20161114162026.0511e0db@canb.auug.org.au>
On Sun 13 Nov 21:20 PST 2016, Stephen Rothwell wrote:
> Hi Bjorn,
>
Hi Stephen,
> Today's linux-next merge of the rpmsg tree got a conflict in:
>
> drivers/remoteproc/Kconfig
>
> between commit:
>
> bb6869b21478 ("remoteproc: st_slim_rproc: add a slimcore rproc driver")
>
> from the slave-dma tree and commit:
>
> 99d93470dcb4 ("remoteproc: qcom_wcnss: Fix circular module dependency")
>
> from the rpmsg 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 the fix and the report of the dependency issue of
QCOM_ADSP_PIL.
I have merged the problematic topic branch from Vinod into my tree and
fixed up the discrepancies. So you should be able to drop this
workaround and you should not see the ADSP issue.
Regards,
Bjorn
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/remoteproc/Kconfig
> index 14d5d2d43a38,5fcbefcb8636..000000000000
> --- a/drivers/remoteproc/Kconfig
> +++ b/drivers/remoteproc/Kconfig
> @@@ -100,10 -95,9 +96,9 @@@ config QCOM_WCNSS_PI
> tristate "Qualcomm WCNSS Peripheral Image Loader"
> depends on OF && ARCH_QCOM
> depends on QCOM_SMEM
> + depends on REMOTEPROC
> select QCOM_MDT_LOADER
> select QCOM_SCM
> - select QCOM_WCNSS_IRIS
> - select REMOTEPROC
> help
> Say y here to support the Peripheral Image Loader for the Qualcomm
> Wireless Connectivity Subsystem.
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the tip tree
From: Thomas Gleixner @ 2016-11-17 7:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Marcelo Tosatti, Gleb Natapov, KVM, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Fenghua Yu, He Chen
In-Reply-To: <20161117145035.3891820c@canb.auug.org.au>
On Thu, 17 Nov 2016, Stephen Rothwell wrote:
> + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */
> + static const struct cpuid_bit cpuid_bits[] = {
> + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 },
> + { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 },
> ++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 },
> ++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 },
> ++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },
> + { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 },
> + { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 },
> + { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 },
> + { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 },
> + { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 },
> + { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
> + { 0, 0, 0, 0, 0 }
> };
This should be
> + static const struct cpuid_bit cpuid_bits[] = {
> + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 },
> + { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 },
> + { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 },
> + { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 },
> + { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 },
> ++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 },
> ++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 },
> ++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },
> + { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 },
> + { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 },
> + { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
> + { 0, 0, 0, 0, 0 }
> };
tip will carry a proper resolution today.
Thanks,
tglx
^ permalink raw reply
* next-20161117 build: 0 failures 3 warnings (next-20161117)
From: Build bot for Mark Brown @ 2016-11-17 9:20 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161117
Git describe: next-20161117
Commit: e3b16de6a5 Add linux-next specific files for 20161117
Build Time: 84 min 54 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 1
Warnings: 3
Section Mismatches: 4
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
10 warnings 2 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
10 warnings 2 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
20 drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
Warnings Summary: 3
16 ../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
4 ../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1194:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
4 ../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
Section Mismatch Summary: 4
1 WARNING: vmlinux.o(.text+0x797db4): 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+0x54b098): 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+0x1a376c): 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+0x10f9c8): 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-allnoconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 2 errors, 10 warnings, 2 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
Warnings:
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1194:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x1a376c): 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+0x797db4): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 2 errors, 2 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
Warnings:
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1194:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 2 errors, 10 warnings, 2 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
Warnings:
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1194:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
../drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h:67:0: warning: "mutex_lock_interruptible" redefined
Section Mismatches:
WARNING: drivers/built-in.o(.text+0x10f9c8): 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+0x54b098): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name()
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 2 errors, 2 warnings, 0 section mismatches
Errors:
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
Warnings:
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pinctrl/sunxi/pinctrl-sunxi.c:1194:8: warning: 'best_div' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
^ permalink raw reply
* Re: linux-next: manual merge of the block tree with the btrfs-kdave tree
From: Christoph Hellwig @ 2016-11-17 13:23 UTC (permalink / raw)
To: Jens Axboe
Cc: Stephen Rothwell, David Sterba, linux-next, linux-kernel,
Christoph Hellwig
In-Reply-To: <5d5a631b-e18e-aa2b-67bb-e2df6d8bef15@kernel.dk>
On Wed, Nov 16, 2016 at 07:49:29PM -0700, Jens Axboe wrote:
> doesn't look correct, if bio_readpage_error() is called from the
> ->bi_end_io() handler. bi_size is generally zeroed at that time.
At least some of these bios are magic btrfs-internal ones that never
reach the block layer. But I don't think all are, and both the new
code and one of the old cases are broken. David, can you drop
this one patch for now, and I'll restart the discussion on the
failfast behavior on the btrfs list?
^ permalink raw reply
* Re: linux-next: manual merge of the kvm tree with the tip tree
From: Stephen Rothwell @ 2016-11-17 21:31 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Marcelo Tosatti, Gleb Natapov, KVM, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Fenghua Yu, He Chen
In-Reply-To: <alpine.DEB.2.20.1611170805510.3697@nanos>
Hi Thomas,
On Thu, 17 Nov 2016 08:07:27 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Thu, 17 Nov 2016, Stephen Rothwell wrote:
> > + /* Please keep the leaf sorted by cpuid_bit.level for faster search. */
> > + static const struct cpuid_bit cpuid_bits[] = {
> > + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 },
> > + { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 },
> > ++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 },
> > ++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 },
> > ++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },
> > + { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 },
> > + { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 },
> > + { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 },
> > + { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 },
> > + { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 },
> > + { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
> > + { 0, 0, 0, 0, 0 }
> > };
>
> This should be
>
> > + static const struct cpuid_bit cpuid_bits[] = {
> > + { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 },
> > + { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 },
> > + { X86_FEATURE_INTEL_PT, CPUID_EBX, 25, 0x00000007, 0 },
> > + { X86_FEATURE_AVX512_4VNNIW, CPUID_EDX, 2, 0x00000007, 0 },
> > + { X86_FEATURE_AVX512_4FMAPS, CPUID_EDX, 3, 0x00000007, 0 },
> > ++ { X86_FEATURE_CAT_L3, CPUID_EBX, 1, 0x00000010, 0 },
> > ++ { X86_FEATURE_CAT_L2, CPUID_EBX, 2, 0x00000010, 0 },
> > ++ { X86_FEATURE_CDP_L3, CPUID_ECX, 2, 0x00000010, 1 },
> > + { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 },
> > + { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 },
> > + { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 },
> > + { 0, 0, 0, 0, 0 }
> > };
Thanks for letting me know.
> tip will carry a proper resolution today.
Too easy.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the block tree with the btrfs-kdave tree
From: David Sterba @ 2016-11-18 17:47 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Jens Axboe, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20161117132301.GA26525@lst.de>
On Thu, Nov 17, 2016 at 02:23:01PM +0100, Christoph Hellwig wrote:
> On Wed, Nov 16, 2016 at 07:49:29PM -0700, Jens Axboe wrote:
> > doesn't look correct, if bio_readpage_error() is called from the
> > ->bi_end_io() handler. bi_size is generally zeroed at that time.
>
> At least some of these bios are magic btrfs-internal ones that never
> reach the block layer. But I don't think all are, and both the new
> code and one of the old cases are broken. David, can you drop
> this one patch for now, and I'll restart the discussion on the
> failfast behavior on the btrfs list?
Ok, updated in today's for-next snapshot.
^ permalink raw reply
* Re: linux-next: Tree for Nov 17
From: Paul Gortmaker @ 2016-11-18 22:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger.kernel.org, LKML
In-Reply-To: <20161117170851.70c20904@canb.auug.org.au>
On Thu, Nov 17, 2016 at 1:08 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> There will be no linux-next releases on Friday (tomorrow) or Monday.
>
> Changes since 20161116:
FYI, I saw this warning appear today (make allmodconfig; multi arch)
drivers/remoteproc/Kconfig:3:error: recursive dependency detected!
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/remoteproc/Kconfig:3: symbol REMOTEPROC is selected by QCOM_ADSP_PIL
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/remoteproc/Kconfig:81: symbol QCOM_ADSP_PIL depends on REMOTEPROC
A zombie bot "git bisect run" blames this commit/merge:
Paul.
--
commit de9e059739efe4c762cde105fd312c0f66794678
Merge: d31d45e068e6 1314ed74840c
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Nov 17 15:57:18 2016 +1100
Merge remote-tracking branch 'rpmsg/for-next'
diff --cc drivers/remoteproc/Kconfig
index 14d5d2d43a38,c199b360067f..9c41128750ca
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -100,10 -106,9 +107,9 @@@ config QCOM_WCNSS_PI
tristate "Qualcomm WCNSS Peripheral Image Loader"
depends on OF && ARCH_QCOM
depends on QCOM_SMEM
+ depends on REMOTEPROC
select QCOM_MDT_LOADER
select QCOM_SCM
- select QCOM_WCNSS_IRIS
- select REMOTEPROC
help
Say y here to support the Peripheral Image Loader for the Qualcomm
Wireless Connectivity Subsystem.
>
> The net-next tree gained conflicts against the net tree.
>
> The drm tree gained a conflict against the arm tree.
>
> The block tree gained conflicts against the btrfs-kdave tree.
>
> The tip tree gained conflicts against the drm and net-next trees and a
> build failure for which I applied a merge fix patch.
>
> The kvm tree gained a conflict against the tip tree.
>
> Non-merge commits (relative to Linus' tree): 6305
> 6661 files changed, 401169 insertions(+), 146155 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 244 trees (counting Linus' and 34 trees of bug
> fix patches pending for the current merge release).
>
> Stats about the size of the tree over time can be seen at
> http://neuling.org/linux-next-size.html .
>
> Status of my local build tests will be at
> http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
> advice about cross compilers/configs that work, we are always open to add
> more builds.
>
> Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
> Gortmaker for triage and bug fixes.
>
> --
> Cheers,
> Stephen Rothwell
>
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the jc_docs tree
From: Jonathan Corbet @ 2016-11-18 23:33 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, linux-next, linux-kernel, Jarkko Sakkinen,
SeongJae Park
In-Reply-To: <s5ha8d2ebhy.wl-tiwai@suse.de>
On Mon, 14 Nov 2016 09:01:13 +0100
Takashi Iwai <tiwai@suse.de> wrote:
> > In this case, I would have liked the chance to comment. This
> > documentation belongs in the driver-api document, not the top-level one.
> > So, in an ideal world, I'd like to see this stuff moved there, preferably
> > with the patches going though the docs tree.
>
> If there needs any other changes, feel free to merge my
> topic/restize-docs branch into yours and keep working there:
> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/resize-docs
OK, I've done that, so this series will show up in docs-next; hopefully
the merge conflicts will be resolved in the process.
I had said that I really wanted to move it all under driver-api and put
it into that manual, but, looking at what's there, it's not that simple.
The driver API parts of that manual belong there, but some of the
information is user-oriented. A long-term goal is to separate out those
two types of information so that interested readers can more easily find
the information relevant to them. But that won't happen for 4.10..:) So
I'll leave things as they are for now.
(Note also that the driver API manual already has a section on sound
devices:
http://static.lwn.net/kerneldoc/driver-api/sound.html
This came from the driver DocBook conversion a while back. At some point
we should really pull all that stuff together into a single document).
Thanks again for doing this conversion,
jon
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the jc_docs tree
From: Jarkko Sakkinen @ 2016-11-19 0:22 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Takashi Iwai, Stephen Rothwell, linux-next, linux-kernel,
SeongJae Park
In-Reply-To: <20161118163312.46505e6f@lwn.net>
On Fri, Nov 18, 2016 at 04:33:12PM -0700, Jonathan Corbet wrote:
> On Mon, 14 Nov 2016 09:01:13 +0100
> Takashi Iwai <tiwai@suse.de> wrote:
>
> > > In this case, I would have liked the chance to comment. This
> > > documentation belongs in the driver-api document, not the top-level one.
> > > So, in an ideal world, I'd like to see this stuff moved there, preferably
> > > with the patches going though the docs tree.
> >
> > If there needs any other changes, feel free to merge my
> > topic/restize-docs branch into yours and keep working there:
> > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/resize-docs
>
> OK, I've done that, so this series will show up in docs-next; hopefully
> the merge conflicts will be resolved in the process.
>
> I had said that I really wanted to move it all under driver-api and put
> it into that manual, but, looking at what's there, it's not that simple.
> The driver API parts of that manual belong there, but some of the
> information is user-oriented. A long-term goal is to separate out those
> two types of information so that interested readers can more easily find
> the information relevant to them. But that won't happen for 4.10..:) So
> I'll leave things as they are for now.
>
> (Note also that the driver API manual already has a section on sound
> devices:
>
> http://static.lwn.net/kerneldoc/driver-api/sound.html
>
> This came from the driver DocBook conversion a while back. At some point
> we should really pull all that stuff together into a single document).
>
> Thanks again for doing this conversion,
>
> jon
Given that there is now a directory for TPM rst documentation do you
still want all changes to your tree or is it sufficient to just cc
linux-doc?
Thanks for fixing the issues!
/Jarkko
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the jc_docs tree
From: Jonathan Corbet @ 2016-11-19 0:39 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: Takashi Iwai, Stephen Rothwell, linux-next, linux-kernel,
SeongJae Park
In-Reply-To: <20161119002218.6k5snf7srxhds4ah@intel.com>
On Fri, 18 Nov 2016 16:22:18 -0800
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote:
> Given that there is now a directory for TPM rst documentation do you
> still want all changes to your tree or is it sufficient to just cc
> linux-doc?
For stuff in security/tpm? It makes my life easier if documentation
patches come through my tree, but it's never going to be the case that
they all take that path. I'm becoming increasingly insistent that changes
to the top-level makefiles and index.rst files need to come this way;
that way, Stephen doesn't need to send me so many polite merge-conflict
emails :)
For the rest, a CC is appreciated so that I know what's going on, but if
it works better for subsystem-specific documentation patches to go
through the relevant subsystem trees, then that's how it should be done.
Thanks,
jon
^ permalink raw reply
* Re: linux-next: unable to fetch the watchdog tree
From: Stephen Rothwell @ 2016-11-21 22:49 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-next, linux-kernel
In-Reply-To: <20161114152615.GA16294@spo001.leaseweb.nl>
Hi Wim,
On Mon, 14 Nov 2016 16:26:16 +0100 Wim Van Sebroeck <wim@iguana.be> wrote:
>
> This has been fixed. Thanks for notifying me about it.
>
> Kind regards,
> Wim.
>
> > 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.
It's happening again :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the rockchip tree with the arm-soc tree
From: Stephen Rothwell @ 2016-11-21 23:19 UTC (permalink / raw)
To: Heiko Stuebner, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Neil Armstrong, Kevin Hilman, Andy Yan
Hi Heiko,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs")
from the arm-soc tree and commit:
5295a3157348 ("arm64: defconfig: enable RK808 components")
from the rockchip 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/configs/defconfig
index 2640e193a8c4,731cc6ade789..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -297,23 -293,10 +299,24 @@@ CONFIG_REGULATOR_MAX77620=
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_SMD_RPM=y
CONFIG_REGULATOR_QCOM_SPMI=y
+ CONFIG_REGULATOR_RK808=y
CONFIG_REGULATOR_S2MPS11=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_DVB_NET is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_RENESAS_FCP=m
+CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_DRM=m
CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_RCAR_DU=m
+CONFIG_DRM_RCAR_HDMI=y
+CONFIG_DRM_RCAR_LVDS=y
+CONFIG_DRM_RCAR_VSP=y
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_I2C_ADV7511=m
@@@ -408,7 -393,7 +414,8 @@@ CONFIG_XEN_GRANT_DEV_ALLOC=
CONFIG_COMMON_CLK_SCPI=y
CONFIG_COMMON_CLK_CS2000_CP=y
CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_COMMON_CLK_PWM=y
+ CONFIG_COMMON_CLK_RK808=y
CONFIG_CLK_QORIQ=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_MSM_GCC_8916=y
@@@ -423,13 -406,13 +430,15 @@@ CONFIG_ARM_SMMU=
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD=y
CONFIG_QCOM_SMD_RPM=y
+ CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
+CONFIG_ARCH_TEGRA_186_SOC=y
CONFIG_EXTCON_USB_GPIO=y
CONFIG_PWM=y
+ CONFIG_PWM_ROCKCHIP=y
CONFIG_PWM_TEGRA=m
+CONFIG_PWM_MESON=m
CONFIG_COMMON_RESET_HI6220=y
CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_HI6220_USB=y
^ 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