Re: pull-request: mac80211 2014-12-18

Re: pull-request: mac80211 2014-12-18

[David Miller]

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 18 Dec 2014 15:10:22 +0100

> Also from me a first pull request - we have a number of really old
> issues that happened to crop up now with new work (or just more testing)
> in the right areas as well as some small bugs newly introduced in 3.19.
> 
> Let me know if there are any problems.

Pulled, but:

1) Don't put things into a merge commit, I take the text from your
   pull request email and that becomes the merge commit contents.
   Put it in your pull request email.

2) I want every pull request I get at least CC:'d to netdev.

> The following changes since commit 5fbea33740aeb948422d7b7e8aafbeac362264b2:
> 
>   r8169:update rtl8168g pcie ephy parameter (2014-12-11 21:38:52 -0500)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-davem-2014-12-18
> 
> for you to fetch changes up to 28a9bc68124c319b2b3dc861e80828a8865fd1ba:
> 
>   mac80211: free management frame keys when removing station (2014-12-17 14:00:17 +0100)

Re: pull-request: mac80211 2014-12-18

[Johannes Berg]

On Thu, 2014-12-18 at 15:35 -0500, David Miller wrote:

> 1) Don't put things into a merge commit, I take the text from your
>    pull request email and that becomes the merge commit contents.
>    Put it in your pull request email.

Hmm, ok - not sure I fully understand. I don't think I created a merge
commit, so did you mean the tag? I thought a (signed) tag with contents
was now the preferred way to send pull requests, but I can also send a
signed email without a tag for you to merge a branch? Or would you
prefer a signed tag but empty (is that even possible?) with the text in
the email?

> 2) I want every pull request I get at least CC:'d to netdev.

Ok, sure.

Thanks,
johannes

Re: pull-request: mac80211 2014-12-18

[David Miller]

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 18 Dec 2014 21:54:29 +0100

> On Thu, 2014-12-18 at 15:35 -0500, David Miller wrote:
> 
>> 1) Don't put things into a merge commit, I take the text from your
>>    pull request email and that becomes the merge commit contents.
>>    Put it in your pull request email.
> 
> Hmm, ok - not sure I fully understand. I don't think I created a merge
> commit, so did you mean the tag? I thought a (signed) tag with contents
> was now the preferred way to send pull requests, but I can also send a
> signed email without a tag for you to merge a branch? Or would you
> prefer a signed tag but empty (is that even possible?) with the text in
> the email?

Anything you do I guess is fine with me, but I'm going to edit the
content that ends up in the merge commit regardless.

>> 2) I want every pull request I get at least CC:'d to netdev.
> 
> Ok, sure.

Thanks.