On Thu, Mar 08, 2018 at 01:07:03PM +1100, Stephen Rothwell wrote:
> The resolution now looks like below (there were more changes to this
> file in the net-next tree). It will keep changing every time this file
> is touched :-(
Ugh, sorry for that, Stephen.
Considering how much of a hassle this a
On Thu, Mar 8, 2018 at 10:07 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 5 Mar 2018 12:40:54 +1100 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the selinux tree got a conflict in:
>>
>> net/sctp/socket.c
>>
>> between several refactoring commits from the net-next tree and
On Thu, Mar 8, 2018 at 9:00 PM, Paul Moore wrote:
> On Wed, Mar 7, 2018 at 9:07 PM, Stephen Rothwell
> wrote:
>> Hi all,
>>
>> On Mon, 5 Mar 2018 12:40:54 +1100 Stephen Rothwell
>> wrote:
>>>
>>> Today's linux-next merge of the selinux tree got a conflict in:
>>>
>>> net/sctp/socket.c
>>>
>>
On Wed, Mar 7, 2018 at 9:07 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 5 Mar 2018 12:40:54 +1100 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the selinux tree got a conflict in:
>>
>> net/sctp/socket.c
>>
>> between several refactoring commits from the net-next tree and c
Hi all,
On Mon, 5 Mar 2018 12:40:54 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> net/sctp/socket.c
>
> between several refactoring commits from the net-next tree and commit:
>
> 2277c7cd75e3 ("sctp: Add LSM hooks")
>
> from the sel
On Wed, Mar 7, 2018 at 3:26 PM, David Miller wrote:
> From: Paul Moore
> Date: Wed, 7 Mar 2018 15:20:33 -0500
>
>>> So you would only have to wait until my tree went in before
>>> sending your pull request.
>>
>> So you would want me to rebase selinux/next on top of Linus' tree in
>> the middle o
From: Paul Moore
Date: Wed, 7 Mar 2018 15:20:33 -0500
>> So you would only have to wait until my tree went in before
>> sending your pull request.
>
> So you would want me to rebase selinux/next on top of Linus' tree in
> the middle of the merge window? I'm sure that isn't what you meant,
> but
From: Paul Moore
Date: Wed, 7 Mar 2018 15:20:33 -0500
> I suppose the right thing would have been for net-next
> to pull selinux/next, yes?
Nope.
On Wed, Mar 7, 2018 at 12:45 PM, David Miller wrote:
> From: Paul Moore
> Date: Wed, 7 Mar 2018 12:27:52 -0500
>
>> I'm not sure we could have cleanly separated the core network stack
>> changes from the rest of the SELinux/SCTP enablement, regardless it's
>> a bit late at this point. The only o
From: Paul Moore
Date: Wed, 7 Mar 2018 12:27:52 -0500
> I'm not sure we could have cleanly separated the core network stack
> changes from the rest of the SELinux/SCTP enablement, regardless it's
> a bit late at this point. The only other thought would have been to
> simply push Xin Long's clean
On Wed, Mar 7, 2018 at 11:41 AM, David Miller wrote:
> From: Paul Moore
> Date: Wed, 7 Mar 2018 11:34:31 -0500
>> On Mon, Mar 5, 2018 at 2:03 AM, Xin Long wrote:
>>> On Mon, Mar 5, 2018 at 9:40 AM, Stephen Rothwell
>>> wrote:
Hi Paul,
Today's linux-next merge of the selinux tree
From: Paul Moore
Date: Wed, 7 Mar 2018 11:34:31 -0500
> On Mon, Mar 5, 2018 at 2:03 AM, Xin Long wrote:
>> On Mon, Mar 5, 2018 at 9:40 AM, Stephen Rothwell
>> wrote:
>>> Hi Paul,
>>>
>>> Today's linux-next merge of the selinux tree got a conflict in:
>>>
>>> net/sctp/socket.c
>>>
>>> between
On Mon, Mar 5, 2018 at 2:03 AM, Xin Long wrote:
> On Mon, Mar 5, 2018 at 9:40 AM, Stephen Rothwell
> wrote:
>> Hi Paul,
>>
>> Today's linux-next merge of the selinux tree got a conflict in:
>>
>> net/sctp/socket.c
>>
>> between several refactoring commits from the net-next tree and commit:
>>
On Mon, Mar 5, 2018 at 9:40 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> net/sctp/socket.c
>
> between several refactoring commits from the net-next tree and commit:
>
> 2277c7cd75e3 ("sctp: Add LSM hooks")
>
> from the selinux
Hi Paul,
Today's linux-next merge of the selinux tree got a conflict in:
net/sctp/socket.c
between several refactoring commits from the net-next tree and commit:
2277c7cd75e3 ("sctp: Add LSM hooks")
from the selinux tree.
I fixed it up (I think - see below) and can carry the fix as
necess
15 matches
Mail list logo
