Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* pull-request: ieee802154 for net 2021-08-11
@ 2021-08-11 20:04 Stefan Schmidt
  2021-08-12 16:16 ` Jakub Kicinski
  0 siblings, 1 reply; 3+ messages in thread
From: Stefan Schmidt @ 2021-08-11 20:04 UTC (permalink / raw)
  To: davem, kuba; +Cc: linux-wpan, alex.aring, netdev

Hello Dave, Jakub.

An update from ieee802154 for your *net* tree.

Mostly fixes coming from bot reports. Dongliang Mu tackled some syzkaller
reports in hwsim again and Takeshi Misawa a memory leak  in  ieee802154 raw.

regards
Stefan Schmidt

The following changes since commit 37c86c4a0bfc2faaf0ed959db9de814c85797f09:

  Merge branch 'ks8795-vlan-fixes' (2021-08-10 09:58:15 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git tags/ieee802154-for-davem-2021-08-11

for you to fetch changes up to e48599df715793053407dcc2352ff6ba210b0869:

  Merge remote-tracking branch 'net/master' into merge-test (2021-08-10 12:45:20 +0200)

----------------------------------------------------------------
Dongliang Mu (2):
      ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi
      ieee802154: hwsim: fix GPF in hwsim_new_edge_nl

Stefan Schmidt (1):
      Merge remote-tracking branch 'net/master' into merge-test

Takeshi Misawa (1):
      net: Fix memory leak in ieee802154_raw_deliver

 drivers/net/ieee802154/mac802154_hwsim.c | 6 +++---
 net/ieee802154/socket.c                  | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: pull-request: ieee802154 for net 2021-08-11
  2021-08-11 20:04 pull-request: ieee802154 for net 2021-08-11 Stefan Schmidt
@ 2021-08-12 16:16 ` Jakub Kicinski
  2021-08-12 18:40   ` Stefan Schmidt
  0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2021-08-12 16:16 UTC (permalink / raw)
  To: Stefan Schmidt; +Cc: davem, linux-wpan, alex.aring, netdev

On Wed, 11 Aug 2021 22:04:17 +0200 Stefan Schmidt wrote:
> Stefan Schmidt (1):
>       Merge remote-tracking branch 'net/master' into merge-test

Hi Stefan, would it be possible to toss this Merge commit and resubmit?
I don't think it's a common practice to merge the target tree before
submitting a PR?

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: pull-request: ieee802154 for net 2021-08-11
  2021-08-12 16:16 ` Jakub Kicinski
@ 2021-08-12 18:40   ` Stefan Schmidt
  0 siblings, 0 replies; 3+ messages in thread
From: Stefan Schmidt @ 2021-08-12 18:40 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: davem, linux-wpan, alex.aring, netdev

Hello.

On 12.08.21 18:16, Jakub Kicinski wrote:
> On Wed, 11 Aug 2021 22:04:17 +0200 Stefan Schmidt wrote:
>> Stefan Schmidt (1):
>>        Merge remote-tracking branch 'net/master' into merge-test
> 
> Hi Stefan, would it be possible to toss this Merge commit and resubmit?
> I don't think it's a common practice to merge the target tree before
> submitting a PR?

Its not and it was an error on my side (starting my pull script from the 
branch where I tested the merge for conflicts).

Fixed now and send a new PR.

regards
Stefan Schmidt

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-12 18:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-11 20:04 pull-request: ieee802154 for net 2021-08-11 Stefan Schmidt
2021-08-12 16:16 ` Jakub Kicinski
2021-08-12 18:40   ` Stefan Schmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).