On Mon, 9 Apr 2018, Stephen Rothwell wrote:
> Hi James,
>
> On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris
> wrote:
> >
> > That's odd, my next-general branch is merged to Linus.
>
> The security tree in linux-next is
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-secu
Hi James,
On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris wrote:
>
> That's odd, my next-general branch is merged to Linus.
The security tree in linux-next is
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
which has the efi-lock-down tree merged int
On Mon, 9 Apr 2018, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 6 Apr 2018 09:22:16 +1000 Stephen Rothwell
> wrote:
> >
> > On Thu, 15 Mar 2018 18:34:12 +1100 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the scsi-mkp tree got a conflict in:
> > >
> > > drivers/scsi
Hi all,
On Fri, 6 Apr 2018 09:22:16 +1000 Stephen Rothwell
wrote:
>
> On Thu, 15 Mar 2018 18:34:12 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the scsi-mkp tree got a conflict in:
> >
> > drivers/scsi/eata.c
> >
> > between commit:
> >
> > 5b76b160badb ("scsi: Lo
Hi all,
On Thu, 15 Mar 2018 18:34:12 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/eata.c
>
> between commit:
>
> 5b76b160badb ("scsi: Lock down the eata driver")
>
> from the efi-lock-down tree and commit:
>
> 6b17
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/eata.c
between commit:
5b76b160badb ("scsi: Lock down the eata driver")
from the efi-lock-down tree and commit:
6b1745caa14a ("scsi: eata: eata-pio: Deprecate legacy EATA drivers")
from the scsi-mkp t
6 matches
Mail list logo
