The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_irq.c | 8 --
drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 -
drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 35 ----------
net/bluetooth/smp.c | 8 --
net/core/rtnetlink.c | 6 -
5 files changed, 61 deletions(-)
diff -puN drivers/gpu/drm/i915/i915_irq.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_irq.c
--- a/drivers/gpu/drm/i915/i915_irq.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_irq.c
@@ -3096,19 +3096,11 @@ gen11_gu_misc_irq_ack(struct drm_i915_pr
if (!(master_ctl & GEN11_GU_MISC_IRQ))
return 0;
-<<<<<<< HEAD
iir = raw_reg_read(regs, GEN11_GU_MISC_IIR);
if (likely(iir))
raw_reg_write(regs, GEN11_GU_MISC_IIR, iir);
-=======
-
- iir = raw_reg_read(regs, GEN11_GU_MISC_IIR);
- if (likely(iir))
- raw_reg_write(regs, GEN11_GU_MISC_IIR, iir);
-
->>>>>>> linux-next/akpm-base
return iir;
}
diff -puN drivers/net/ethernet/netronome/nfp/nfp_net_common.c~linux-next-git-rejects drivers/net/ethernet/netronome/nfp/nfp_net_common.c
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -2097,11 +2097,7 @@ static void nfp_ctrl_poll(unsigned long
spin_lock(&r_vec->lock);
nfp_net_tx_complete(r_vec->tx_ring, 0);
__nfp_ctrl_tx_queued(r_vec);
-<<<<<<< HEAD
- spin_unlock_bh(&r_vec->lock);
-=======
spin_unlock(&r_vec->lock);
->>>>>>> linux-next/akpm-base
if (nfp_ctrl_rx(r_vec)) {
nfp_net_irq_unmask(r_vec->nfp_net, r_vec->irq_entry);
diff -puN drivers/net/wireless/mediatek/mt76/mt76x0/main.c~linux-next-git-rejects drivers/net/wireless/mediatek/mt76/mt76x0/main.c
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c~linux-next-git-rejects
+++ a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@ -50,42 +50,7 @@ static void mt76x0_stop(struct ieee80211
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt76x0_mac_stop(dev);
-<<<<<<< HEAD
- mutex_unlock(&dev->mutex);
-}
-
-
-static int mt76x0_add_interface(struct ieee80211_hw *hw,
- struct ieee80211_vif *vif)
-{
- struct mt76x0_dev *dev = hw->priv;
- struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_priv;
- unsigned int idx;
-
- idx = ffs(~dev->vif_mask);
- if (!idx || idx > 8)
- return -ENOSPC;
-
- idx--;
- dev->vif_mask |= BIT(idx);
-
- mvif->idx = idx;
- mvif->group_wcid.idx = GROUP_WCID(idx);
- mvif->group_wcid.hw_key_idx = -1;
-
- return 0;
-}
-
-static void mt76x0_remove_interface(struct ieee80211_hw *hw,
- struct ieee80211_vif *vif)
-{
- struct mt76x0_dev *dev = hw->priv;
- struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_priv;
-
- dev->vif_mask &= ~BIT(mvif->idx);
-=======
mutex_unlock(&dev->mt76.mutex);
->>>>>>> linux-next/akpm-base
}
static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
diff -puN net/bluetooth/smp.c~linux-next-git-rejects net/bluetooth/smp.c
--- a/net/bluetooth/smp.c~linux-next-git-rejects
+++ a/net/bluetooth/smp.c
@@ -2430,19 +2430,11 @@ int smp_cancel_and_remove_pairing(struct
err = hci_remove_ltk(hdev, bdaddr, addr_type);
hci_remove_irk(hdev, bdaddr, addr_type);
-<<<<<<< HEAD
hcon = hci_conn_hash_lookup_le(hdev, bdaddr, addr_type);
if (!hcon)
goto done;
-=======
-
- hcon = hci_conn_hash_lookup_le(hdev, bdaddr, addr_type);
- if (!hcon)
- goto done;
-
->>>>>>> linux-next/akpm-base
conn = hcon->l2cap_data;
if (!conn)
goto done;
diff -puN net/core/rtnetlink.c~linux-next-git-rejects net/core/rtnetlink.c
--- a/net/core/rtnetlink.c~linux-next-git-rejects
+++ a/net/core/rtnetlink.c
@@ -1910,15 +1910,9 @@ static int rtnl_dump_ifinfo(struct sk_bu
if (nlmsg_parse(cb->nlh, hdrlen, tb, IFLA_MAX,
ifla_policy, NULL) >= 0) {
-<<<<<<< HEAD
- if (tb[IFLA_IF_NETNSID]) {
- netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);
- tgt_net = get_target_net(skb->sk, netnsid);
-=======
if (tb[IFLA_TARGET_NETNSID]) {
netnsid = nla_get_s32(tb[IFLA_TARGET_NETNSID]);
tgt_net = rtnl_get_net_ns_capable(skb->sk, netnsid);
->>>>>>> linux-next/akpm-base
if (IS_ERR(tgt_net))
return PTR_ERR(tgt_net);
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
mm-mremap-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
mm-brk-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
