$ 0 0 Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/platform/goldfish/goldfish_pipe.c between commit: 1d427da1d7