On 3/18/21 11:54 AM, Shakeel Butt wrote:
> On Wed, Mar 17, 2021 at 11:17 PM Stephen Rothwell
> wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>> mm/memcontrol.c
>>
>> between commit:
>>
>> 06d69d4c8669 ("mm: Charge active memcg when no mm is
On Wed, Mar 17, 2021 at 11:17 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/memcontrol.c
>
> between commit:
>
> 06d69d4c8669 ("mm: Charge active memcg when no mm is set")
>
> from the block tree and commit:
>
> 6747882
On Fri, May 3, 2019 at 5:10 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/sync.c
>
> between commit:
>
> 22f96b3808c1 ("fs: add sync_file_range() helper")
>
> from the block tree and commit:
>
> 9a8d18789a18 ("fs/sync.c
On 07/12/2016 11:14 PM, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/nvme/host/core.c
between commit:
f80ec966c19b ("nvme: Limit command retries")
from the block tree and commit:
8cc07e463b0c ("NVMe: don't allocate
Hi Andrew,
On Mon, 7 Dec 2015 11:44:31 -0800 Andrew Morton
wrote:
>
> On Mon, 7 Dec 2015 19:12:39 +1100 Stephen Rothwell
> wrote:
>
> > --- a/fs/block_dev.c
> > +++ b/fs/block_dev.c
> > @@@ -432,7 -432,7 +432,7 @@@ int bdev_write_page(struct block_devic
> >
> > if (!ops->rw_page || bde
On Mon, 7 Dec 2015 19:12:39 +1100 Stephen Rothwell
wrote:
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@@ -432,7 -432,7 +432,7 @@@ int bdev_write_page(struct block_devic
>
> if (!ops->rw_page || bdev_get_integrity(bdev))
> return -EOPNOTSUPP;
> - result = blk_queue
Hi Mel,
On Sun, 1 Nov 2015 18:38:53 + Mel Gorman
wrote:
>
> On Mon, Nov 02, 2015 at 02:51:25AM +1100, Stephen Rothwell wrote:
> >
> > @@ -2038,7 +2038,7 @@ void generic_make_request(struct bio *bio)
> > do {
> > struct request_queue *q = bdev_get_queue(bio->bi_bdev);
> >
>
On Mon, Nov 02, 2015 at 02:51:25AM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> block/blk-mq.c
>
> between commit:
>
> 3ef28e83ab15 ("block: generic request_queue reference counting")
>
> from the block tree and co
Hi Stephen,
[auto build test WARNING on block/for-next -- if it's inappropriate base,
please suggest rules for selecting the more suitable base]
url:
https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-manual-merge-of-the-akpm-current-tree-with-the-block-tree/20151101-235406
Hi Stephen,
[auto build test ERROR on block/for-next -- if it's inappropriate base, please
suggest rules for selecting the more suitable base]
url:
https://github.com/0day-ci/linux/commits/Stephen-Rothwell/linux-next-manual-merge-of-the-akpm-current-tree-with-the-block-tree/20151101-235406
c
10 matches
Mail list logo
